paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db access tracking

Browse Source
This commit is contained in:
Paul Schneider
2017-02-23 03:10:30 +01:00
parent 11f9714b65
commit 9c64224c20
63 changed files with 177 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Yavsc/ApiControllers/ActivityApiController.cs
View File

@ -1,6 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -47,7 +49,7 @@ namespace Yavsc.Controllers
}
// PUT: api/ActivityApi/5
[HttpPut("{id}")]
[HttpPut("{id}"),Authorize("AdministratorOnly")]
public async Task<IActionResult> PutActivity([FromRoute] string id, [FromBody] Activity activity)
{
if (!ModelState.IsValid)
@ -64,7 +66,7 @@ namespace Yavsc.Controllers
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -82,7 +84,7 @@ namespace Yavsc.Controllers
}
// POST: api/ActivityApi
[HttpPost]
[HttpPost,Authorize("AdministratorOnly")]
public async Task<IActionResult> PostActivity([FromBody] Activity activity)
{
if (!ModelState.IsValid)
@ -93,7 +95,7 @@ namespace Yavsc.Controllers
_context.Activities.Add(activity);
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateException)
{
@ -111,7 +113,7 @@ namespace Yavsc.Controllers
}
// DELETE: api/ActivityApi/5
[HttpDelete("{id}")]
[HttpDelete("{id}"),Authorize("AdministratorOnly")]
public async Task<IActionResult> DeleteActivity([FromRoute] string id)
{
if (!ModelState.IsValid)
@ -126,7 +128,7 @@ namespace Yavsc.Controllers
}
_context.Activities.Remove(activity);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return Ok(activity);
}

7
Yavsc/ApiControllers/ApplicationUserApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
@ -63,7 +64,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -92,7 +93,7 @@ namespace Yavsc.Controllers
_context.Users.Add(applicationUser);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -125,7 +126,7 @@ namespace Yavsc.Controllers
}
_context.Users.Remove(applicationUser);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(applicationUser);
}

6
Yavsc/ApiControllers/BlackListApiController.cs
View File

@ -75,7 +75,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -107,7 +107,7 @@ namespace Yavsc.Controllers
_context.BlackListed.Add(blackListed);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -143,7 +143,7 @@ namespace Yavsc.Controllers
return HttpBadRequest();
_context.BlackListed.Remove(blackListed);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(blackListed);
}

6
Yavsc/ApiControllers/BlogAclApiController.cs
View File

@ -70,7 +70,7 @@ namespace Yavsc.Controllers
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -109,7 +109,7 @@ namespace Yavsc.Controllers
_context.BlogACL.Add(circleAuthorizationToBlogPost);
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateException)
{
@ -145,7 +145,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
_context.BlogACL.Remove(circleAuthorizationToBlogPost);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return Ok(circleAuthorizationToBlogPost);
}

7
Yavsc/ApiControllers/BlogApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -62,7 +63,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -91,7 +92,7 @@ namespace Yavsc.Controllers
_context.Blogspot.Add(blog);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -124,7 +125,7 @@ namespace Yavsc.Controllers
}
_context.Blogspot.Remove(blog);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(blog);
}

6
Yavsc/ApiControllers/BookQueryApiController.cs
View File

@ -102,7 +102,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -136,7 +136,7 @@ namespace Yavsc.Controllers
_context.Commands.Add(bookQuery);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -171,7 +171,7 @@ namespace Yavsc.Controllers
if (bookQuery.ClientId != uid) return HttpNotFound();
_context.Commands.Remove(bookQuery);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(bookQuery);
}

7
Yavsc/ApiControllers/CircleApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
@ -64,7 +65,7 @@ namespace Yavsc.Controllers
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -93,7 +94,7 @@ namespace Yavsc.Controllers
_context.Circle.Add(circle);
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateException)
{
@ -126,7 +127,7 @@ namespace Yavsc.Controllers
}
_context.Circle.Remove(circle);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return Ok(circle);
}

7
Yavsc/ApiControllers/ContactsApiController.cs
View File

@ -1,4 +1,5 @@
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -43,7 +44,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -72,7 +73,7 @@ namespace Yavsc.Controllers
_context.ClientProviderInfo.Add(clientProviderInfo);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -105,7 +106,7 @@ namespace Yavsc.Controllers
}
_context.ClientProviderInfo.Remove(clientProviderInfo);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(clientProviderInfo);
}

6
Yavsc/ApiControllers/DimissClicksApiController.cs
View File

@ -86,7 +86,7 @@ namespace Yavsc.Controllers
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -118,7 +118,7 @@ namespace Yavsc.Controllers
_context.DimissClicked.Add(dimissClicked);
try
{
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
}
catch (DbUpdateException)
{
@ -155,7 +155,7 @@ namespace Yavsc.Controllers
}
_context.DimissClicked.Remove(dimissClicked);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return Ok(dimissClicked);
}

6
Yavsc/ApiControllers/EstimateApiController.cs
View File

@ -91,7 +91,7 @@ namespace Yavsc.Controllers
var entry = _context.Attach(estimate);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -143,7 +143,7 @@ namespace Yavsc.Controllers
*/
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -184,7 +184,7 @@ namespace Yavsc.Controllers
}
}
_context.Estimates.Remove(estimate);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(estimate);
}

6
Yavsc/ApiControllers/EstimateTemplatesApiController.cs
View File

@ -70,7 +70,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -100,7 +100,7 @@ namespace Yavsc.Controllers
_context.EstimateTemplates.Add(estimateTemplate);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -137,7 +137,7 @@ namespace Yavsc.Controllers
return new HttpStatusCodeResult(StatusCodes.Status403Forbidden);
_context.EstimateTemplates.Remove(estimateTemplate);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(estimateTemplate);
}

2
Yavsc/ApiControllers/FileSystemApiController.cs
View File

@ -57,7 +57,7 @@ namespace Yavsc.ApiControllers
foreach (var f in Request.Form.Files)
{
var item = user.ReceiveUserFile(root, f);
dbContext.SaveChanges();
dbContext.SaveChanges(User.GetUserId());
yield return item;
};
}

4
Yavsc/ApiControllers/GCMController.cs
View File

@ -48,7 +48,7 @@ public class GCMController : Controller
alreadyRegisteredDevice.Platform = declaration.Platform;
alreadyRegisteredDevice.Version = declaration.Version;
_context.Update(alreadyRegisteredDevice);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
else
{
@ -56,7 +56,7 @@ public class GCMController : Controller
declaration.DeclarationDate = DateTime.Now;
declaration.DeviceOwnerId = uid;
_context.GCMDevices.Add(declaration as GoogleCloudMobileDeclaration);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
var latestActivityUpdate = _context.Activities.Max(a=>a.DateModified);
return Json(new {

7
Yavsc/ApiControllers/MusicalPreferencesApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -62,7 +63,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -91,7 +92,7 @@ namespace Yavsc.Controllers
_context.MusicalPreferences.Add(musicalPreference);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -124,7 +125,7 @@ namespace Yavsc.Controllers
}
_context.MusicalPreferences.Remove(musicalPreference);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(musicalPreference);
}

7
Yavsc/ApiControllers/MusicalTendenciesApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -63,7 +64,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -92,7 +93,7 @@ namespace Yavsc.Controllers
_context.MusicalTendency.Add(musicalTendency);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -125,7 +126,7 @@ namespace Yavsc.Controllers
}
_context.MusicalTendency.Remove(musicalTendency);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(musicalTendency);
}

4
Yavsc/ApiControllers/PdfEstimateController.cs
View File

@ -104,7 +104,7 @@ namespace Yavsc.ApiControllers
return new BadRequestResult();
User.ReceiveProSignature(id,Request.Form.Files[0],"pro");
estimate.ProviderValidationDate = DateTime.Now;
dbContext.SaveChanges();
dbContext.SaveChanges(User.GetUserId());
// Notify the client
var locstr = _localizer["EstimationMessageToClient"];
@ -148,7 +148,7 @@ namespace Yavsc.ApiControllers
return new BadRequestResult();
User.ReceiveProSignature(id,Request.Form.Files[0],"cli");
estimate.ClientValidationDate = DateTime.Now;
dbContext.SaveChanges();
dbContext.SaveChanges(User.GetUserId());
return Ok (new { ClientValidationDate = estimate.ClientValidationDate });
}

4
Yavsc/ApiControllers/PerformersApiController.cs
View File

@ -1,15 +1,13 @@
using System.Collections.Generic;
using Microsoft.AspNet.Mvc;
using System.Linq;
using Yavsc.Models;
using Yavsc.Models.Workflow;
using System.Security.Claims;
using Microsoft.AspNet.Authorization;
using Microsoft.Data.Entity;
namespace Yavsc.Controllers
{
using Models;
[Produces("application/json")]
[Route("api/performers")]
public class PerformersApiController : Controller

2
Yavsc/ApiControllers/PostRateApiController.cs
View File

@ -39,7 +39,7 @@ namespace Yavsc.Controllers
return HttpBadRequest();
blogpost.Rate = rate;
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok();
}

9
Yavsc/ApiControllers/PostTagsApiController.cs
View File

@ -6,9 +6,10 @@ using Microsoft.Data.Entity;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models;
using Models.Relationship;
[Produces("application/json")]
[Route("~/api/PostTagsApi")]
public class PostTagsApiController : Controller
@ -64,7 +65,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -93,7 +94,7 @@ namespace Yavsc.Controllers
_context.TagsDomain.Add(postTag);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -126,7 +127,7 @@ namespace Yavsc.Controllers
}
_context.TagsDomain.Remove(postTag);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(postTag);
}

7
Yavsc/ApiControllers/ProductApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
@ -64,7 +65,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -93,7 +94,7 @@ namespace Yavsc.Controllers
_context.Products.Add(product);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -126,7 +127,7 @@ namespace Yavsc.Controllers
}
_context.Products.Remove(product);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(product);
}

7
Yavsc/ApiControllers/ServiceApiController.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
@ -64,7 +65,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -93,7 +94,7 @@ namespace Yavsc.Controllers
_context.Services.Add(service);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -126,7 +127,7 @@ namespace Yavsc.Controllers
}
_context.Services.Remove(service);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(service);
}

7
Yavsc/ApiControllers/TagsApiController.cs
View File

@ -7,6 +7,7 @@ using Yavsc.Models;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models.Relationship;
[Produces("application/json")]
[Route("api/TagsApi")]
@ -63,7 +64,7 @@ namespace Yavsc.Controllers
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateConcurrencyException)
{
@ -92,7 +93,7 @@ namespace Yavsc.Controllers
_context.Tags.Add(tag);
try
{
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
catch (DbUpdateException)
{
@ -125,7 +126,7 @@ namespace Yavsc.Controllers
}
_context.Tags.Remove(tag);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return Ok(tag);
}

2
Yavsc/Controllers/AccountController.cs
View File

@ -241,7 +241,7 @@ namespace Yavsc.Controllers
var ninfo = _dbContext.UserLogins.First(l=>l.ProviderKey == info.ProviderKey && l.LoginProvider == info.LoginProvider);
ninfo.ProviderDisplayName = info.ProviderDisplayName;
_dbContext.Entry(ninfo).State = EntityState.Modified;
_dbContext.SaveChanges();
_dbContext.SaveChanges(User.GetUserId());
return Redirect(returnUrl);
}

7
Yavsc/Controllers/ActivityController.cs
View File

@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models;
using Models.Workflow;
@ -137,7 +138,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Activities.Add(activity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
SetSettingClasseInfo();
@ -174,7 +175,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(activity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(activity);
@ -205,7 +206,7 @@ namespace Yavsc.Controllers
{
Activity activity = _context.Activities.Single(m => m.Code == id);
_context.Activities.Remove(activity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

6
Yavsc/Controllers/BlogspotController.cs
View File

@ -134,7 +134,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Blogspot.Add(blog);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
ModelState.AddModelError("Unknown","Invalid Blog posted ...");
@ -188,7 +188,7 @@ namespace Yavsc.Controllers
{
// saves the change
_context.Update(blog);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
ViewData["StatusMessage"] = "Post modified";
return RedirectToAction("Index");
}
@ -231,7 +231,7 @@ namespace Yavsc.Controllers
if (auth.Result)
{
_context.Blogspot.Remove(blog);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
}
return RedirectToAction("Index");
}

7
Yavsc/Controllers/CircleController.cs
View File

@ -1,4 +1,5 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -53,7 +54,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Circle.Add(circle);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(circle);
@ -83,7 +84,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(circle);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(circle);
@ -114,7 +115,7 @@ namespace Yavsc.Controllers
{
Circle circle = await _context.Circle.SingleAsync(m => m.Id == id);
_context.Circle.Remove(circle);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

6
Yavsc/Controllers/CircleMembersController.cs
View File

@ -68,7 +68,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.CircleMembers.Add(circleMember);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewData["CircleId"] = new SelectList(_context.Circle, "Id", "Name", circleMember.CircleId);
@ -102,7 +102,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(circleMember);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewData["CircleId"] = new SelectList(_context.Circle, "Id", "Circle", circleMember.CircleId);
@ -135,7 +135,7 @@ namespace Yavsc.Controllers
{
CircleMember circleMember = await _context.CircleMembers.SingleAsync(m => m.MemberId == id);
_context.CircleMembers.Remove(circleMember);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/ClientController.cs
View File

@ -6,6 +6,7 @@ using Microsoft.Data.Entity;
using System.Collections.Generic;
using Yavsc.Models;
using Yavsc.Models.Auth;
using System.Security.Claims;
namespace Yavsc.Controllers
{
@ -56,7 +57,7 @@ namespace Yavsc.Controllers
{
client.Id = Guid.NewGuid().ToString();
_context.Applications.Add(client);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
SetAppTypesInputValues();
@ -100,7 +101,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(client);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(client);
@ -131,7 +132,7 @@ namespace Yavsc.Controllers
{
Client client = await _context.Applications.SingleAsync(m => m.Id == id);
_context.Applications.Remove(client);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/CoWorkingController.cs
View File

@ -1,4 +1,5 @@
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Rendering;
@ -57,7 +58,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.WorkflowProviders.Add(coWorking);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewData["PerformerId"] = new SelectList(_context.Performers, "PerformerId", "Performer", coWorking.PerformerId);
@ -91,7 +92,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(coWorking);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewData["PerformerId"] = new SelectList(_context.Performers, "PerformerId", "Performer", coWorking.PerformerId);
@ -124,7 +125,7 @@ namespace Yavsc.Controllers
{
CoWorking coWorking = await _context.WorkflowProviders.SingleAsync(m => m.Id == id);
_context.WorkflowProviders.Remove(coWorking);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/ColorsController.cs
View File

@ -1,3 +1,4 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -52,7 +53,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Color.Add(color);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(color);
@ -82,7 +83,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(color);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(color);
@ -113,7 +114,7 @@ namespace Yavsc.Controllers
{
Color color = await _context.Color.SingleAsync(m => m.Id == id);
_context.Color.Remove(color);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

6
Yavsc/Controllers/CommandController.cs
View File

@ -162,7 +162,7 @@ namespace Yavsc.Controllers
}
else _context.Attach<Location>(command.Location);
_context.BookQueries.Add(command, GraphBehavior.IncludeDependents);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
var yaev = command.CreateEvent(_localizer);
MessageWithPayloadResponse grep = null;
@ -222,7 +222,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(command);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(command);
@ -253,7 +253,7 @@ namespace Yavsc.Controllers
{
BookQuery command = _context.BookQueries.Single(m => m.Id == id);
_context.BookQueries.Remove(command);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/CommandFormsController.cs
View File

@ -1,4 +1,5 @@
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Rendering;
@ -59,7 +60,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.CommandForm.Add(commandForm);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
SetViewBag(commandForm);
@ -91,7 +92,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(commandForm);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
SetViewBag(commandForm);
@ -123,7 +124,7 @@ namespace Yavsc.Controllers
{
CommandForm commandForm = await _context.CommandForm.SingleAsync(m => m.Id == id);
_context.CommandForm.Remove(commandForm);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

6
Yavsc/Controllers/DoController.cs
View File

@ -78,7 +78,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.UserActivities.Add(userActivity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
ViewBag.DoesCode = new SelectList(_context.Activities, "Code", "Name", userActivity.DoesCode);
@ -120,7 +120,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(userActivity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
ViewData["DoesCode"] = new SelectList(_context.Activities, "Code", "Does", userActivity.DoesCode);
@ -161,7 +161,7 @@ namespace Yavsc.Controllers
return RedirectToAction("Index");
}
_context.UserActivities.Remove(userActivity);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

6
Yavsc/Controllers/EstimateController.cs
View File

@ -102,7 +102,7 @@ namespace Yavsc.Controllers
{
_context.Estimates
.Add(estimate);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
var query = _context.BookQueries.FirstOrDefault(
q=>q.Id == estimate.CommandId
);
@ -178,7 +178,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(estimate);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(estimate);
@ -211,7 +211,7 @@ namespace Yavsc.Controllers
{
Estimate estimate = _context.Estimates.Single(m => m.Id == id);
_context.Estimates.Remove(estimate);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/FormsController.cs
View File

@ -1,3 +1,4 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
@ -52,7 +53,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Form.Add(form);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(form);
@ -82,7 +83,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(form);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(form);
@ -113,7 +114,7 @@ namespace Yavsc.Controllers
{
Form form = await _context.Form.SingleAsync(m => m.Id == id);
_context.Form.Remove(form);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

2
Yavsc/Controllers/FrontOfficeController.cs
View File

@ -79,7 +79,7 @@ namespace Yavsc.Controllers
{
_context.BookQueries.Update(bookQuery);
}
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
// TODO Send sys notifications &
// notify the user (make him a basket badge)
return View("Index");

7
Yavsc/Controllers/HairTaintsController.cs
View File

@ -1,3 +1,4 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Mvc;
@ -57,7 +58,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.HairTaint.Add(hairTaint);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name", hairTaint.ColorId);
@ -89,7 +90,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(hairTaint);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
ViewBag.ColorId = new SelectList(_context.Color, "Id", "Name", hairTaint.ColorId);
@ -121,7 +122,7 @@ namespace Yavsc.Controllers
{
HairTaint hairTaint = await _context.HairTaint.SingleAsync(m => m.Id == id);
_context.HairTaint.Remove(hairTaint);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

4
Yavsc/Controllers/HomeController.cs
View File

@ -4,17 +4,17 @@ using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Hosting;
using Yavsc.Models;
using Microsoft.AspNet.Identity;
using System.Linq;
using System.Security.Claims;
using Microsoft.Data.Entity;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
using System.Threading.Tasks;
namespace Yavsc.Controllers
{
using Models;
[ServiceFilter(typeof(LanguageActionFilter)),AllowAnonymous]
public class HomeController : Controller
{

6
Yavsc/Controllers/InstrumentationController.cs
View File

@ -68,7 +68,7 @@ namespace Yavsc.Controllers
return new ChallengeResult();
_context.Instrumentation.Add(model);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(model);
@ -103,7 +103,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(musicianSettings);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(musicianSettings);
@ -142,7 +142,7 @@ namespace Yavsc.Controllers
_context.Instrumentation.Remove(musicianSettings);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/InstrumentsController.cs
View File

@ -3,6 +3,7 @@ using Microsoft.AspNet.Mvc;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models;
using Models.Musical;
public class InstrumentsController : Controller
@ -51,7 +52,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Instrument.Add(instrument);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(instrument);
@ -81,7 +82,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(instrument);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(instrument);
@ -112,7 +113,7 @@ namespace Yavsc.Controllers
{
Instrument instrument = _context.Instrument.Single(m => m.Id == id);
_context.Instrument.Remove(instrument);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/LocationTypesController.cs
View File

@ -3,6 +3,7 @@ using Microsoft.AspNet.Mvc;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models;
using Models.Relationship;
public class LocationTypesController : Controller
@ -51,7 +52,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.LocationType.Add(locationType);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(locationType);
@ -81,7 +82,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(locationType);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(locationType);
@ -112,7 +113,7 @@ namespace Yavsc.Controllers
{
LocationType locationType = _context.LocationType.Single(m => m.Id == id);
_context.LocationType.Remove(locationType);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/ManageController.cs
View File

@ -25,7 +25,6 @@ namespace Yavsc.Controllers
using Models.Relationship;
using PayPal.PayPalAPIInterfaceService;
using PayPal.PayPalAPIInterfaceService.Model;
using PayPal.PayPalAPIInterfaceService.Model;
[Authorize, ServiceFilter(typeof(LanguageActionFilter))]
public class ManageController : Controller
@ -295,7 +294,7 @@ namespace Yavsc.Controllers
{
var user = _dbContext.Users.FirstOrDefault(u => u.Id == User.GetUserId());
user.DedicatedGoogleCalendar = model.GoogleCalendarId;
await _dbContext.SaveChangesAsync();
await _dbContext.SaveChangesAsync(User.GetUserId());
if (string.IsNullOrEmpty(model.ReturnUrl))
return RedirectToAction("Index");
else return Redirect(model.ReturnUrl);
@ -570,7 +569,7 @@ namespace Yavsc.Controllers
_dbContext.Update(model);
}
else _dbContext.Performers.Add(model);
_dbContext.SaveChanges();
_dbContext.SaveChanges(User.GetUserId());
// Give this user the Performer role
if (!User.IsInRole("Performer"))
await _userManager.AddToRoleAsync(user, "Performer");
@ -597,7 +596,7 @@ namespace Yavsc.Controllers
_dbContext.Performers.Remove(
_dbContext.Performers.First(x => x.PerformerId == uid)
);
_dbContext.SaveChanges();
_dbContext.SaveChanges(User.GetUserId());
await _userManager.RemoveFromRoleAsync(user, "Performer");
}
var message = ManageMessageId.UnsetActivitySuccess;

7
Yavsc/Controllers/MusicalTendenciesController.cs
View File

@ -3,6 +3,7 @@ using Microsoft.AspNet.Mvc;
namespace Yavsc.Controllers
{
using System.Security.Claims;
using Models;
using Models.Musical;
public class MusicalTendenciesController : Controller
@ -51,7 +52,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.MusicalTendency.Add(musicalTendency);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(musicalTendency);
@ -81,7 +82,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(musicalTendency);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(musicalTendency);
@ -112,7 +113,7 @@ namespace Yavsc.Controllers
{
MusicalTendency musicalTendency = _context.MusicalTendency.Single(m => m.Id == id);
_context.MusicalTendency.Remove(musicalTendency);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

9
Yavsc/Controllers/NotificationsController.cs
View File

@ -1,7 +1,6 @@
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.Data.Entity;
using Yavsc.Models;
using Yavsc.Models.Messaging;
@ -54,7 +53,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Notification.Add(notification);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(notification);
@ -84,7 +83,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(notification);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
return View(notification);
@ -115,7 +114,7 @@ namespace Yavsc.Controllers
{
Notification notification = await _context.Notification.SingleAsync(m => m.Id == id);
_context.Notification.Remove(notification);
await _context.SaveChangesAsync();
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
}

7
Yavsc/Controllers/SIRENExceptionsController.cs
View File

@ -1,4 +1,5 @@
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Mvc;
using Yavsc.Models;
@ -53,7 +54,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.ExceptionsSIREN.Add(exceptionSIREN);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(exceptionSIREN);
@ -83,7 +84,7 @@ namespace Yavsc.Controllers
if (ModelState.IsValid)
{
_context.Update(exceptionSIREN);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
return View(exceptionSIREN);
@ -114,7 +115,7 @@ namespace Yavsc.Controllers
{
ExceptionSIREN exceptionSIREN = _context.ExceptionsSIREN.Single(m => m.SIREN == id);
_context.ExceptionsSIREN.Remove(exceptionSIREN);
_context.SaveChanges();
_context.SaveChanges(User.GetUserId());
return RedirectToAction("Index");
}
}

13
Yavsc/Hubs/ChatHub.cs
View File

@ -38,7 +38,6 @@ namespace Yavsc
if (Context.User != null)
{
isAuth = Context.User.Identity.IsAuthenticated;
userName = Context.User.Identity.Name;
var group = isAuth ?
"authenticated" : "anonymous";
// Log ("Cx: " + group);
@ -55,9 +54,8 @@ namespace Yavsc
UserAgent = Context.Request.Headers["User-Agent"],
Connected = true
});
db.SaveChanges();
db.SaveChanges(user.Id);
}
}
}
else Groups.Add(Context.ConnectionId, "anonymous");
@ -78,16 +76,16 @@ namespace Yavsc
var cx = db.Connections.SingleOrDefault(c => c.ConnectionId == Context.ConnectionId);
if (cx != null)
{
var user = db.Users.Single(u => u.UserName == userName);
if (stopCalled)
{
var user = db.Users.Single(u => u.UserName == userName);
user.Connections.Remove(cx);
}
else
{
cx.Connected = false;
}
db.SaveChanges();
db.SaveChanges(user.Id);
}
}
}
@ -110,7 +108,7 @@ namespace Yavsc
if (cx != null)
{
cx.Connected = true;
db.SaveChanges();
db.SaveChanges(user.Id);
}
else cx = new Connection { ConnectionId = Context.ConnectionId,
UserAgent = Context.Request.Headers["User-Agent"],
@ -147,10 +145,9 @@ namespace Yavsc
var cx = db.Connections.SingleOrDefault(c=>c.ConnectionId == Context.ConnectionId);
if (cx!=null) {
db.Connections.Remove(cx);
db.SaveChanges();
db.SaveChanges(cx.ApplicationUserId);
}
}
}
}

1
Yavsc/Migrations/20170217221646_bookQueryStatus.Designer.cs generated
View File

@ -1,7 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;

2
Yavsc/Migrations/20170217221646_bookQueryStatus.cs
View File

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Interfaces.Workflow;

1
Yavsc/Migrations/20170220102125_notifications.Designer.cs generated
View File

@ -1,7 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;

2
Yavsc/Migrations/20170220102125_notifications.cs
View File

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations

1
Yavsc/Migrations/20170220125518_dimissclick.Designer.cs generated
View File

@ -1,7 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;

2
Yavsc/Migrations/20170220125518_dimissclick.cs
View File

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations

1
Yavsc/Migrations/20170220144141_hiddenActivity.Designer.cs generated
View File

@ -1,7 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;

2
Yavsc/Migrations/20170220144141_hiddenActivity.cs
View File

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations

2
Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -1,8 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;
namespace Yavsc.Migrations

27
Yavsc/Models/ApplicationDbContext.cs
View File

@ -5,10 +5,8 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Authentication.OAuth;
using Microsoft.AspNet.Identity.EntityFramework;
using Microsoft.Data.Entity;
using System.Web;
using System.Threading;
using Yavsc.Models.Haircut;
using Yavsc.Models.Messaging;
namespace Yavsc.Models
{
@ -28,6 +26,7 @@ namespace Yavsc.Models
using Musical.Profiles;
using Workflow.Profiles;
using Drawing;
public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
{
protected override void OnModelCreating(ModelBuilder builder)
@ -123,7 +122,7 @@ namespace Yavsc.Models
public Task ClearTokensAsync()
{
Tokens.RemoveRange(this.Tokens);
SaveChanges();
SaveChanges(null);
return Task.FromResult(0);
}
@ -138,7 +137,7 @@ namespace Yavsc.Models
if (item != null)
{
Tokens.Remove(item);
SaveChanges();
SaveChanges(email);
}
return Task.FromResult(0);
}
@ -184,7 +183,7 @@ namespace Yavsc.Models
item.RefreshToken = value.RefreshToken;
Tokens.Update(item);
}
SaveChanges();
SaveChanges(googleUserId);
return Task.FromResult(0);
}
@ -225,13 +224,11 @@ namespace Yavsc.Models
public DbSet<GeneralSettings> GeneralSettings { get; set; }
public DbSet<CoWorking> WorkflowProviders { get; set; }
private void AddTimestamps()
private void AddTimestamps(string currentUsername)
{
var entities = ChangeTracker.Entries().Where(x => x.Entity.GetType().GetInterface("IBaseTrackedEntity")!=null && (x.State == EntityState.Added || x.State == EntityState.Modified));
var currentUsername = !string.IsNullOrEmpty(System.Web.HttpContext.Current?.User?.Identity?.Name)
? HttpContext.Current.User.Identity.Name
: "Anonymous";
// Microsoft.AspNet.Identity;
foreach (var entity in entities)
{
@ -245,15 +242,13 @@ namespace Yavsc.Models
((IBaseTrackedEntity)entity.Entity).UserModified = currentUsername;
}
}
override public int SaveChanges() {
AddTimestamps();
public int SaveChanges(string userId) {
AddTimestamps(userId);
return base.SaveChanges();
}
public override async Task<int> SaveChangesAsync(CancellationToken ctoken = default(CancellationToken)) {
AddTimestamps();
public async Task<int> SaveChangesAsync(string userId, CancellationToken ctoken = default(CancellationToken)) {
AddTimestamps(userId);
return await base.SaveChangesAsync();
}

7
Yavsc/Models/Billing/NominativeServiceCommand.cs
View File

@ -2,13 +2,12 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Interfaces.Workflow;
using Yavsc.Models.Market;
using Yavsc.Models.Workflow;
using YavscLib;
namespace Yavsc.Models.Billing
{
using Interfaces.Workflow;
using Workflow;
using YavscLib;
public abstract class NominativeServiceCommand : IBaseTrackedEntity, IQuery
{

2
Yavsc/Models/Haircut/HairCutQuery.cs
View File

@ -1,4 +1,4 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Billing;

3
Yavsc/Models/Haircut/HairPrestation.cs
View File

@ -1,5 +1,4 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Market;
namespace Yavsc.Models.Haircut

1
Yavsc/Models/Messaging/EstimationEvent.cs
View File

@ -7,7 +7,6 @@ namespace Yavsc.Models.Messaging
using Interfaces.Workflow;
using Billing;
using Yavsc.Helpers;
using System;
public class EstimationEvent: IEvent
{

1
Yavsc/Models/Workflow/BookQuery.cs
View File

@ -5,7 +5,6 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Workflow
{
using YavscLib;
using Yavsc.Models.Billing;
using Yavsc.Models.Relationship;
/// <summary>

9
Yavsc/Models/Workflow/Query.cs
View File

@ -1,11 +1,8 @@
using System;
namespace Yavsc.Models.Workflow
{
using Interfaces.Workflow;
using Models.Market;
using YavscLib;
using Interfaces.Workflow;
using YavscLib;
public interface IQuery: IBaseTrackedEntity
{
QueryStatus Status { get; set; }

5
Yavsc/Startup/Startup.cs
View File

@ -16,7 +16,6 @@ using Microsoft.AspNet.Localization;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Filters;
using Microsoft.AspNet.Mvc.Razor;
using Microsoft.AspNet.Http.Extensions;
using Microsoft.Data.Entity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
@ -232,6 +231,7 @@ namespace Yavsc
IOptions<RequestLocalizationOptions> localizationOptions,
IOptions<OAuth2AppSettings> oauth2SettingsContainer,
RoleManager<IdentityRole> roleManager,
UserManager<ApplicationUser> userManager,
IAuthorizationService authorizationService,
ILoggerFactory loggerFactory)
{
@ -320,7 +320,7 @@ namespace Yavsc
{
foreach (var c in db.Connections)
db.Connections.Remove(c);
db.SaveChanges();
db.SaveChanges("Startup");
}
});
@ -339,7 +339,6 @@ namespace Yavsc
ConfigureWorkflow(app, SiteSetup);
app.UseRequestLocalization(localizationOptions.Value, (RequestCulture) new RequestCulture((string)"fr"));
app.UseSession();
app.UseMvc(routes =>
{
routes.MapRoute(