implements user fs alimentation from web sockets

.editorconfig

@@ -35,3 +35,10 @@ indent_style = space
 indent_size = 2
 
 
+dotnet_naming_rule.locals_should_be_camel_case.severity = none
+dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
+dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style
+
+dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local
+
+dotnet_naming_style.camel_case_style.capitalization = camel_case

.travis.yml

@@ -6,11 +6,11 @@ sudo: false
 install:
 - curl --insecure -sSL https://lua.pschneider.fr/files/Paul/pub/dnx-install.sh  | bash
 - DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh
-- cd src/OAuth.AspNet.Token && dnu restore
+- cd src/OAuth.AspNet.Token && dnu restore --ignore-failed-sources
-- cd ../OAuth.AspNet.AuthServer && dnu restore
+- cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Abstract && dnu restore
+- cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Server && dnu restore
+- cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-- cd ../Yavsc && dnu restore
+- cd ../Yavsc && dnu restore --ignore-failed-sources
 script:
 - "dnu build"
 

Makefile

@@ -7,12 +7,18 @@ CONFIG=Debug
 
 git_status := $(shell git status -s --porcelain |wc -l)
 
+all: yavscd
+
 clean: 
 	rm -f src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll 
 
 checklibs:
 	ls $(DNXLIBFP)
 
+updatedeps:
+	cp src/Yavsc/bin/output/approot/packages/*/*/lib/*net451*/*.dll private/lib/
+	cp src/Yavsc/bin/output/approot/packages/*/*/lib/*dnx451*/*.dll private/lib/
+
 test:
 	make -C src/test
 
@@ -55,4 +61,8 @@ yavscd: src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc.Server/bin/$(CONFIG)/
 	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll  $(LIBS) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o yavscd
 	strip yavscd
 
+version-increment-patch:
+	scripts/version.sh $$(cat version.txt) patch > version.txt
+
+
 .PHONY: packages

scripts/version.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+version="$1"
+major=0
+minor=0
+build=0
+
+# break down the version number into it's components
+regex="([0-9]+).([0-9]+).([0-9]+)((-[A-Za-z]+)([0-9]+))?"
+if [[ $version =~ $regex ]]; then
+  major="${BASH_REMATCH[1]}"
+  minor="${BASH_REMATCH[2]}"
+  build="${BASH_REMATCH[3]}"
+  patchtype="${BASH_REMATCH[5]}"
+  patchnum="${BASH_REMATCH[6]}"
+fi
+
+# check paramater to see which number to increment
+if [[ "$2" == "feature" ]]; then
+  minor=$(echo $minor + 1 | bc)
+  build=0
+  patchtype=
+  patchnum=
+elif [[ "$2" == "build" ]]; then
+  build=$(echo $build + 1 | bc)
+  patchtype=
+  patchnum=
+elif [[ "$2" == "major" ]]; then
+  major=$(echo $major+1 | bc)
+  minor=0
+  build=0
+  patchtype=
+  patchnum=
+elif [[ "$2" == "patch" ]]; then
+  patchnum=$(echo $patchnum + 1 | bc)
+else
+  echo "usage: ./version.sh version_number [major/feature/build/patch]" >&2
+
+  exit -1
+fi
+
+# echo the new version number
+echo "${major}.${minor}.${build}${patchtype}${patchnum}"
+

src/OAuth.AspNet.AuthServer/OAuthAuthorizationServerHandler.cs

@@ -33,7 +33,7 @@ namespace OAuth.AspNet.AuthServer
 
             MemoryStream stream, memoryStream = null;
 
-            StreamWriter streamWriter = null;
+            StreamWriter streamWriter;
 
             try
             {

src/OAuth.AspNet.AuthServer/project.json

@@ -26,7 +26,7 @@
         "defaultNamespace": "Yavsc"
     },
     "dependencies": {
-        "Newtonsoft.Json": "6.0.1-beta1",
+        "Newtonsoft.Json": "7.0.1",
         "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
         "OAuth.AspNet.Token": {
             "type": "build",

src/OAuth.AspNet.Token/TicketDataFormatTokenValidator.cs

@@ -27,7 +27,7 @@ namespace OAuth.AspNet.Tokens
 
         #region non-Public Members
 
-        private TicketDataFormat _ticketDataFormat;
+        private readonly TicketDataFormat _ticketDataFormat;
 
         private const string _serializationRegex = @"^[A-Za-z0-9-_]*$";
 

src/OAuth.AspNet.Token/project.json

@@ -26,7 +26,7 @@
         "defaultNamespace": "Yavsc"
     },
     "dependencies": {
-        "Newtonsoft.Json": "6.0.1-beta1",
+        "Newtonsoft.Json": "7.0.1",
         "Microsoft.AspNet.Authentication.JwtBearer": "1.0.0-rc1-final",
         "Microsoft.AspNet.DataProtection": "1.0.0-rc1-final"
     },

src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs

@@ -5,7 +5,7 @@ namespace Yavsc.Attributes.Validation
     public partial class YaStringLength: YaValidationAttribute
     {
         public long MinimumLength { get; set; } = 0;
-        private long maxLen;
+        private readonly long maxLen;
         public YaStringLength(long maxLen) : base( ()=> "BadStringLength")
         {
             this.maxLen = maxLen;

src/Yavsc.Abstract/Authentication/OAuthenticator.cs

@@ -16,15 +16,15 @@ namespace Yavsc.Authentication
         {
            
         }
-        string clientId;
-        string clientSecret;
-        string scope;
-        Uri authorizeUrl;
-        Uri accessTokenUrl;
-        Uri redirectUrl;
-        GetUsernameAsyncFunc getUsernameAsync;
 
-        string requestState;
+        readonly string clientId;
+        readonly string clientSecret;
+        readonly string scope;
+        readonly Uri authorizeUrl;
+        readonly Uri accessTokenUrl;
+        readonly Uri redirectUrl;
+        readonly GetUsernameAsyncFunc getUsernameAsync;
+        readonly string requestState;
         bool reportedForgery = false;
 
         /// <summary>

src/Yavsc.Abstract/Constants.cs

@@ -48,7 +48,7 @@ namespace Yavsc
         public const string YavscConnectionStringEnvName = "YAVSC_DB_CONNECTION";
 
         // at the end, let 4*4 bytes in peace
-        public const int WebSocketsMaxBufLen = 4 * 1020;
+        public const int WebSocketsMaxBufLen = 4096;
 
         public static readonly long DefaultFSQ = 1024 * 1024 * 500;
 
@@ -60,5 +60,7 @@ namespace Yavsc
         public const int MaxUserNameLength = 26;
 
         public const string LivePath = "/live/cast";
+        
+        public const string StreamingPath = "/api/stream/put";
     }
 }

src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs

@@ -38,6 +38,17 @@ namespace Yavsc.Helpers
             return !name.Any(c => !ValidFileNameChars.Contains(c));
         }
 
+        public static bool IsValidShortFileName(this string name)
+        {
+            if (name.Any(c => !ValidFileNameChars.Contains(c)))
+                return false;
+            
+            if (!name.Any(c => !AlfaNum.Contains(c)))
+                return false;
+                
+            return true;
+        }
+
         // Ensure this path is canonical,
         // No "dirto/./this", neither "dirt/to/that/"
         // no .. and each char must be listed as valid in constants
@@ -69,6 +80,7 @@ namespace Yavsc.Helpers
         // Server side only supports POSIX file systems
         public const char RemoteDirectorySeparator = '/';
 
+        public static char[] AlfaNum = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray();
         // Only accept descent remote file names
         public static char[] ValidFileNameChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-=_~. %#".ToCharArray();
 

src/Yavsc.Abstract/FileSystem/IFileRecieved.Info.cs

@@ -2,7 +2,6 @@ namespace Yavsc.Abstract.FileSystem
 {
     public interface IFileRecievedInfo
     {
-        string MimeType { get; set; }
         
         string DestDir { get; set; }
 

src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs

@@ -16,7 +16,7 @@ namespace Yavsc.ViewModels.UserFiles
         public DirectoryShortInfo [] SubDirectories { 
             get; set;
         }
-        private DirectoryInfo dInfo;
+        private readonly DirectoryInfo dInfo;
 
         // for deserialization
         public UserDirectoryInfo()

src/Yavsc.Abstract/Workflow/Process/Negation.cs

@@ -3,7 +3,7 @@ namespace Yavsc.Models.Process
 {
     public class Negation<Exp> : IRequisition where Exp : IRequisition
     {
-        Exp _expression;
+        readonly Exp _expression;
         public Negation(Exp expression)
         {
             _expression = expression;

src/Yavsc.Abstract/project.json

@@ -24,11 +24,14 @@
       "Chat"
     ]
   },
+  "buildOptions": {
+    "nowarn": ["IDE1006"]
+  },
   "tooling": {
     "defaultNamespace": "Yavsc"
   },
   "dependencies": {
-    "Newtonsoft.Json": "6.0.1-beta1"
+    "Newtonsoft.Json": "7.0.1"
   },
   "frameworks": {
     "dnx451": {

src/Yavsc.Server/Helpers/SimpleJsonPostMethod.cs

@@ -31,7 +31,7 @@ namespace Yavsc.Server.Helpers
     /// </summary>
     public class SimpleJsonPostMethod : IDisposable
 	{
-    private HttpWebRequest request=null;
+    private readonly HttpWebRequest request=null;
 
 		/// <summary>
 		/// Initializes a new instance of the Yavsc.Helpers.SimpleJsonPostMethod class.

src/Yavsc.Server/Interfaces/ICalendarManager.cs

@@ -31,7 +31,7 @@ namespace Yavsc.Services
     /// I calendar manager.
     /// </summary>
     public interface ICalendarManager {
-		Task<CalendarList> GetCalendarsAsync (string userId, string pageToken);
+		Task<CalendarList> GetCalendarsAsync (string pageToken);
 		Task<Events> GetCalendarAsync  (string calid, DateTime minDate, DateTime maxDate, string pageToken);
     Task<DateTimeChooserViewModel> CreateViewModelAsync(
 			string inputId,

src/Yavsc.Server/Models/Access/CircleAuthorizationToFile.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
@@ -8,6 +9,7 @@ using Yavsc.Models.Relationship;
 
 namespace Yavsc.Server.Models.Access
 {
+    [Obsolete]
     public class CircleAuthorizationToFile : ICircleAuthorization
     {
 

src/Yavsc.Server/Models/FileSystem/FileRecievedInfo.cs

@@ -30,10 +30,9 @@ namespace Yavsc.Models.FileSystem
         public FileRecievedInfo()
         {
             QuotaOffensed = Overriden = false;
-            MimeType = DestDir = FileName = null;
+            DestDir = FileName = null;
         }
 
-        public string MimeType { get; set; }
         public string DestDir { get; set; }
         public string FileName { get; set; }
         public bool Overriden { get; set; }

src/Yavsc.Server/Models/HairCut/HairCutPaymentEvent.cs

@@ -34,19 +34,19 @@ namespace Yavsc.Models.HairCut
 
         public string Sender { get; set; }
 
-        HairCutQuery query;
+        readonly HairCutQuery query;
 
-        private string invoiceId;
+        private readonly string invoiceId;
-        private string payerName;
+        private readonly string payerName;
-        private string phone;
+        private readonly string phone;
-        private string payerEmail;
+        private readonly string payerEmail;
-        private string amount;
+        private readonly string amount;
-        private HairCutGenders gender;
+        private readonly HairCutGenders gender;
-        private string date;
+        private readonly string date;
-        private string lieu;
+        private readonly string lieu;
-        private string clientFinal;
+        private readonly string clientFinal;
-        private string token;
+        private readonly string token;
-        private string payerId;
+        private readonly string payerId;
 
         public string CreateBody()
         {

src/Yavsc.Server/Models/HairCut/HairCutQuery.cs

@@ -140,7 +140,7 @@ Prestation.Gender == HairCutGenders.Women ?
                                 bill.Add(new CommandLine
                                 {
                                     Name = name,
-                                    Description = name = name + shorthairsuffix,
+                                    Description = name + shorthairsuffix,
                                     UnitaryCost = multicolor ? SelectedProfile.ShortMultiColorPrice : SelectedProfile.ShortColorPrice
                                 });
 

src/Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs

@@ -36,6 +36,5 @@ namespace Yavsc.Models.Haircut
             private set;
         }
 
-        HairCutQuery Data { get; set; }
     }
 }

src/Yavsc.Server/Models/IT/Project.cs

@@ -39,7 +39,7 @@ namespace Yavsc.Server.Models.IT
         [ForeignKey("GitId")]
         public virtual GitRepositoryReference Repository { get; set; }
 
-        List<IBillItem> bill = new List<IBillItem>();
+        readonly List<IBillItem> bill = new List<IBillItem>();
         public void AddBillItem(IBillItem item)
         {
             bill.Add(item);

src/Yavsc.Server/Models/IT/SourceCode/GitClone.cs

@@ -47,7 +47,7 @@ namespace Yavsc.Server.Models.IT.SourceCode
                         writer.WriteLine(process.StandardOutput.ReadLine());
                 }
             }
-            if (ResultHandler!=null) ResultHandler(true);
+            ResultHandler?.Invoke(true);
         }
     }
 }

src/Yavsc.Server/Models/IT/SourceCode/ProjectBuild.cs

@@ -36,7 +36,7 @@ namespace Yavsc.Server.Models.IT.SourceCode
                         writer.WriteLine(process.StandardOutput.ReadLine());
                 }
             }
-            if (ResultHandler!=null) ResultHandler(true);
+            ResultHandler?.Invoke(true);
         }
         
     }

src/Yavsc.Server/Models/Messaging/Announce.cs

@@ -21,7 +21,7 @@ public class Announce : BaseEvent, IAnnounce, IOwned
         public string Message { get; set; }
         public override string CreateBody()
         {
-            return $"Annonce de {Owner.UserName}: {For.ToString()}\n\n{Message}";
+            return $"Annonce de {Owner.UserName}: {For}\n\n{Message}";
         }
     }
 }

src/Yavsc.Server/Models/Messaging/EstimationEvent.cs

@@ -24,13 +24,14 @@ namespace Yavsc.Models.Messaging
            Sender = perfer.Performer.UserName;
             _localizer = SR;
         }
+
         // TODO via e-mail only: Message = string.Format(
         // SR["EstimationMessageToClient"],perfer.Performer.UserName, estimate.Title,estimate.Bill.Addition());
-              //
+
         ProviderClientInfo ProviderInfo { get; set; }
         Estimate Estimation { get; set; }
 
-        private PerformerProfile perfer;
+        private readonly PerformerProfile perfer;
 
         public string Topic
         {

src/Yavsc.Server/Settings/SiteSettings.cs

@@ -65,5 +65,17 @@ namespace Yavsc
         /// <returns>the supported activity code</returns>
         public string OnlyOneActivityCode { get; set; }
 
+        /// <summary>
+        /// Disk usage user list maximum length in memory
+        /// </summary>
+        /// <value></value>
+        public int DUUserListLen { get; set; } = 256;
+
+        /// <summary>
+        /// Default acl file name
+        /// </summary>
+        /// <value></value>
+        public string AccessListFileName { get; set; } = ".access";
+
     }
 }

src/Yavsc.Server/project.json

@@ -41,7 +41,8 @@
           "Resources/**/*.resx"
         ],
         "publicSign": false,
-        "keyFile": "../../../sgKey.snk"
+        "keyFile": "../../../sgKey.snk",
+        "nowarn": ["IDE1006"]
     },
     "tooling": {
         "defaultNamespace": "Yavsc"

src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Controllers
 
     public class BlogApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public BlogApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
     [Route("api/blogtags")]
     public class BlogTagsApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public BlogTagsApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/blogcomments")]
     public class CommentsApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CommentsApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs

@@ -20,9 +20,9 @@ namespace Yavsc.ApiControllers
     [Authorize,Route("api/fs")]
     public partial class FileSystemApiController : Controller
     {
-        ApplicationDbContext dbContext;
+        readonly ApplicationDbContext dbContext;
-        private IAuthorizationService AuthorizationService;
+        private readonly IAuthorizationService AuthorizationService;
-        private ILogger _logger;
+        private readonly ILogger _logger;
 
         public FileSystemApiController(ApplicationDbContext context,
         IAuthorizationService authorizationService, 
@@ -180,6 +180,8 @@ namespace Yavsc.ApiControllers
             }
             return Ok(new { deleted=id });
         }
+
+        
     }
 
 }

src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs

@@ -0,0 +1,72 @@
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Authorization;
+using Microsoft.AspNet.Mvc;
+using Microsoft.Data.Entity;
+using Microsoft.Extensions.Logging;
+using Yavsc.Attributes.Validation;
+using Yavsc.Helpers;
+using Yavsc.Models;
+using Yavsc.Models.Messaging;
+using Yavsc.Services;
+
+namespace Yavsc.ApiControllers
+{
+    [Authorize, Route("api/stream")]
+    public partial class FileSystemStreamController : Controller
+    {
+        private readonly ILogger logger;
+        private readonly ILiveProcessor liveProcessor;
+        readonly ApplicationDbContext dbContext;
+
+        public FileSystemStreamController(ApplicationDbContext context, ILiveProcessor liveProcessor, ILoggerFactory loggerFactory)
+        {
+            this.dbContext = context;
+            this.logger = loggerFactory.CreateLogger<FileSystemStreamController>();
+            this.liveProcessor = liveProcessor;
+        }
+
+        [Authorize, Route("put/{filename}")]
+        public async Task<IActionResult> Put([ValidRemoteUserFilePath] string filename)
+        {
+            logger.LogInformation("Put : " + filename);
+            if (!HttpContext.WebSockets.IsWebSocketRequest)
+                return HttpBadRequest("not a web socket");
+            if (!HttpContext.User.Identity.IsAuthenticated)
+                return new HttpUnauthorizedResult();
+            var subdirs = filename.Split('/');
+            var filePath = subdirs.Length > 1 ? string.Join("/", subdirs.Take(subdirs.Length-1)) : null;
+            var shortFileName = subdirs[subdirs.Length-1];
+            if (!shortFileName.IsValidShortFileName())
+            {
+                logger.LogInformation("invalid file name : " + filename);
+                return HttpBadRequest("invalid file name");
+            }
+            logger.LogInformation("validated: api/stream/Put: "+filename);
+            var userName = User.GetUserName();
+            var hubContext = Microsoft.AspNet.SignalR.GlobalHost.ConnectionManager.GetHubContext<ChatHub>();
+            string url = string.Format(
+                "{0}/{1}/{2}",
+                Startup.UserFilesOptions.RequestPath.ToUriComponent(),
+                userName,
+                filename
+            );
+
+            hubContext.Clients.All.addPublicStream(new PublicStreamInfo
+            {
+                sender = userName,
+                url = url,
+            }, $"{userName} is starting a stream!");
+            
+            string destDir = HttpContext.User.InitPostToFileSystem(filePath);
+            logger.LogInformation($"Saving flow to {destDir}");
+            var userId = User.GetUserId();
+            var user = await dbContext.Users.FirstAsync(u => u.Id == userId);
+            logger.LogInformation("Accepting stream ...");
+            await liveProcessor.AcceptStream(HttpContext, user, destDir, shortFileName);
+            return Ok();
+        }
+    }
+}

src/Yavsc/ApiControllers/Business/BillingController.cs

@@ -25,15 +25,15 @@ namespace Yavsc.ApiControllers
     [Route("api/bill"), Authorize]
     public class BillingController : Controller
     {
-        ApplicationDbContext dbContext;
+        readonly ApplicationDbContext dbContext;
-        private IStringLocalizer _localizer;
+        private readonly IStringLocalizer _localizer;
-        private GoogleAuthSettings _googleSettings;
+        private readonly GoogleAuthSettings _googleSettings;
-        private IYavscMessageSender _GCMSender;
+        private readonly IYavscMessageSender _GCMSender;
-        private IAuthorizationService authorizationService;
+        private readonly IAuthorizationService authorizationService;
 
 
-        private ILogger logger;
+        private readonly ILogger logger;
-        private IBillingService billingService;
+        private readonly IBillingService billingService;
 
         public BillingController(
             IAuthorizationService authorizationService,

src/Yavsc/ApiControllers/Business/EstimateApiController.cs

@@ -16,8 +16,8 @@ namespace Yavsc.Controllers
     [Route("api/estimate"), Authorize()]
     public class EstimateApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        private ILogger _logger;
+        private readonly ILogger _logger;
         public EstimateApiController(ApplicationDbContext context, ILoggerFactory loggerFactory)
         {
             _context = context;
@@ -32,7 +32,7 @@ namespace Yavsc.Controllers
         {
             if (User.IsInRole(Constants.AdminGroupName)) return true;
             var cuid = User.GetUserId();
-            return cuid == uid || cuid == oid;
+            return cuid == uid || cuid == oid;
         }
         // GET: api/Estimate{?ownerId=User.GetUserId()}
         [HttpGet]
@@ -106,7 +106,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return Ok( new { Id = estimate.Id });
+            return Ok(new { estimate.Id });
         }
 
         // POST: api/Estimate
@@ -116,7 +116,8 @@ namespace Yavsc.Controllers
             var uid = User.GetUserId();
             if (estimate.OwnerId == null) estimate.OwnerId = uid;
 
-            if (!User.IsInRole(Constants.AdminGroupName)) {
+            if (!User.IsInRole(Constants.AdminGroupName))
+            {
                 if (uid != estimate.OwnerId)
                 {
                     ModelState.AddModelError("OwnerId", "You can only create your own estimates");
@@ -124,9 +125,11 @@ namespace Yavsc.Controllers
                 }
             }
 
-            if (estimate.CommandId!=null) {
+            if (estimate.CommandId != null)
+            {
                 var query = _context.RdvQueries.FirstOrDefault(q => q.Id == estimate.CommandId);
-                if (query == null) {
+                if (query == null)
+                {
                     return HttpBadRequest(ModelState);
                 }
                 query.ValidationDate = DateTime.Now;
@@ -163,7 +166,7 @@ namespace Yavsc.Controllers
                     throw;
                 }
             }
-            return Ok( new { Id = estimate.Id, Bill = estimate.Bill  });
+            return Ok(new { estimate.Id, estimate.Bill });
         }
 
         // DELETE: api/Estimate/5

src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs

@@ -12,6 +12,7 @@ namespace Yavsc.ApiControllers
     public class FrontOfficeApiController : Controller
     {
         ApplicationDbContext dbContext;
+
         private IBillingService billing;
 
         public FrontOfficeApiController(ApplicationDbContext context, IBillingService billing)

src/Yavsc/ApiControllers/Business/PaymentApiController.cs

@@ -11,8 +11,8 @@ namespace Yavsc.ApiControllers
     [Route("api/payment")]
     public class PaymentApiController : Controller
     {
-        private ApplicationDbContext dbContext;
+        private readonly ApplicationDbContext dbContext;
-        private SiteSettings siteSettings;
+        private readonly SiteSettings siteSettings;
         private readonly ILogger _logger;
         public PaymentApiController(
             ApplicationDbContext dbContext,

src/Yavsc/ApiControllers/Business/PerformersApiController.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Controllers
     public class PerformersApiController : Controller
     {
         ApplicationDbContext dbContext;
-        private IBillingService billing;
+        private readonly IBillingService billing;
 
         public PerformersApiController(ApplicationDbContext context, IBillingService billing)
         {

src/Yavsc/ApiControllers/Business/ProductApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/ProductApi")]
     public class ProductApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ProductApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/DimissClicksApiController.cs

@@ -15,7 +15,7 @@ namespace Yavsc.Controllers
     [Route("api/dimiss")]
     public class DimissClicksApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public DimissClicksApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/FileCircleApiController.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Controllers
     [Authorize]
     public class FileCircleApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public FileCircleApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/bursherprofiles")]
     public class BursherProfilesApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public BursherProfilesApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/HairCut/HairCutController.cs

@@ -26,37 +26,12 @@ namespace Yavsc.ApiControllers
     [Route("api/haircut")]
     public class HairCutController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        private IEmailSender _emailSender;
+        private readonly ILogger _logger;
-        private IYavscMessageSender _GCMSender;
-        private GoogleAuthSettings _googleSettings;
-        private IStringLocalizer<YavscLocalisation> _localizer;
-        private ILogger _logger;
-        private SiteSettings _siteSettings;
-        private SmtpSettings _smtpSettings;
-        private UserManager<ApplicationUser> _userManager;
-
-        PayPalSettings _paymentSettings;
         public HairCutController(ApplicationDbContext context,
-        IOptions<GoogleAuthSettings> googleSettings,
-        IYavscMessageSender GCMSender,
-          UserManager<ApplicationUser> userManager,
-          IStringLocalizer<Yavsc.YavscLocalisation> localizer,
-          IEmailSender emailSender,
-          IOptions<SmtpSettings> smtpSettings,
-          IOptions<SiteSettings> siteSettings,
-          IOptions<PayPalSettings> payPalSettings,
           ILoggerFactory loggerFactory)
         {
             _context = context;
-            _GCMSender = GCMSender;
-            _emailSender = emailSender;
-            _googleSettings = googleSettings.Value;
-            _userManager = userManager;
-            _smtpSettings = smtpSettings.Value;
-            _siteSettings = siteSettings.Value;
-            _paymentSettings = payPalSettings.Value;
-            _localizer = localizer;
             _logger = loggerFactory.CreateLogger<HairCutController>();
         }
 

src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs

@@ -1,11 +1,11 @@
 namespace Yavsc.ApiControllers
 {
     using Models;
-    using Models.Musical.Profiles;
+    using Yavsc.Models.Musical.Profiles;
 
     public class DjProfileApiController : ProfileApiController<DjSettings>
     {
-        public DjProfileApiController(ApplicationDbContext context) : base(context)
+        public DjProfileApiController() : base()
         {
         }
     }

src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs

@@ -13,7 +13,7 @@ namespace Yavsc.Controllers
     [Route("api/museprefs")]
     public class MusicalPreferencesApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public MusicalPreferencesApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs

@@ -13,7 +13,7 @@ namespace Yavsc.Controllers
     [Route("api/MusicalTendenciesApi")]
     public class MusicalTendenciesApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public MusicalTendenciesApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/NativeConfidentialController.cs

@@ -11,8 +11,8 @@ using Yavsc.Models.Identity;
 [Authorize, Route("~/api/gcm")]
 public class NativeConfidentialController : Controller
 {
-    ILogger _logger;
+    readonly ILogger _logger;
-    ApplicationDbContext _context;
+    readonly ApplicationDbContext _context;
 
     public NativeConfidentialController(ApplicationDbContext context,
      ILoggerFactory loggerFactory)

src/Yavsc/ApiControllers/PostRateApiController.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Controllers
     [Route("~/api/PostRateApi")]
     public class PostRateApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public PostRateApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/ProfileApiController.cs

@@ -9,11 +9,8 @@ namespace Yavsc.ApiControllers
     /// </summary>
     [Produces("application/json"),Route("api/profile")]
     public abstract class ProfileApiController<T> : Controller  
+    {        public ProfileApiController()
         {
-        ApplicationDbContext dbContext;
-        public ProfileApiController(ApplicationDbContext context)
-        {
-            dbContext = context;
         }
 
     }

src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/blacklist"), Authorize]
     public class BlackListApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public BlackListApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/blogacl")]
     public class BlogAclApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public BlogAclApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Relationship/ChatApiController.cs

@@ -15,9 +15,9 @@ namespace Yavsc.Controllers
     [Route("api/chat")]
     public class ChatApiController : Controller
     {
-        ApplicationDbContext dbContext;
+        readonly ApplicationDbContext dbContext;
-        UserManager<ApplicationUser> userManager;
+        readonly UserManager<ApplicationUser> userManager;
-        private IConnexionManager _cxManager;
+        private readonly IConnexionManager _cxManager;
         public ChatApiController(ApplicationDbContext dbContext,
         UserManager<ApplicationUser> userManager, 
         IConnexionManager cxManager)

src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs

@@ -15,7 +15,7 @@ namespace Yavsc.Controllers
     [Route("api/ChatRoomAccessApi")]
     public class ChatRoomAccessApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ChatRoomAccessApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/ChatRoomApi")]
     public class ChatRoomApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ChatRoomApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Relationship/CircleApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/cirle")]
     public class CircleApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CircleApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
     [Route("api/ContactsApi")]
     public class ContactsApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ContactsApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/ServiceApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/ServiceApi")]
     public class ServiceApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ServiceApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/Streaming/LiveApiController.cs

@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+
 using System.Linq;
 using System.Net.WebSockets;
 using System.Security.Claims;
@@ -7,21 +7,17 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Data.Entity;
-using Microsoft.Extensions.Logging;
 using Yavsc.Models;
 using Yavsc.Models.Streaming;
 using Yavsc.Services;
-using Yavsc.ViewModels.Streaming;
 
 namespace Yavsc.Controllers
 {
     [Route("api/live")]
     public class LiveApiController : Controller
     {
-        
+        readonly ILiveProcessor _liveProcessor;
-        ILiveProcessor _liveProcessor;
+        private readonly ApplicationDbContext _dbContext;
-        private ApplicationDbContext _dbContext;
-        ILogger _logger;
 
         /// <summary>
         /// Live Api Controller
@@ -30,13 +26,11 @@ namespace Yavsc.Controllers
         /// <param name="context"></param>
 
         public LiveApiController(
-            ILoggerFactory loggerFactory,
             ApplicationDbContext context,
             ILiveProcessor liveProcessor)
         {
             _liveProcessor = liveProcessor;
             _dbContext = context;
-            _logger = loggerFactory.CreateLogger<LiveApiController>();
         }
 
         [HttpGet("filenamehint/{id}")]

src/Yavsc/ApiControllers/Survey/BugApiController.cs

@@ -16,8 +16,8 @@ namespace Yavsc.ApiControllers
     [Route("~/api/bug")]
     public class BugApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        ILogger _logger;
+        readonly ILogger _logger;
 
         public BugApiController(ApplicationDbContext context, ILoggerFactory factory)
         {

src/Yavsc/ApiControllers/accounting/AccountController.cs

@@ -22,9 +22,8 @@ namespace Yavsc.WebApi.Controllers
         
         private UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-
+        readonly ApplicationDbContext _dbContext;
-        ApplicationDbContext _dbContext;
+        private readonly ILogger _logger;
-        private ILogger _logger;
 
         public ApiAccountController(UserManager<ApplicationUser> userManager,
         SignInManager<ApplicationUser> signInManager, ILoggerFactory loggerFactory, ApplicationDbContext dbContext)

src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs

@@ -14,7 +14,7 @@ namespace Yavsc.Controllers
     [Route("api/users")]
     public class ApplicationUserApiController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ApplicationUserApiController(ApplicationDbContext context)
         {

src/Yavsc/ApiControllers/accounting/ProfileApiController.cs

@@ -11,8 +11,8 @@ namespace Yavsc.ApiControllers.accounting
     [Route("~/api/profile")]
     public class ProfileApiController: Controller
     {
-        UserManager<ApplicationUser> _userManager;
+        readonly UserManager<ApplicationUser> _userManager;
-        ApplicationDbContext _dbContext;
+        readonly ApplicationDbContext _dbContext;
         public ProfileApiController(ApplicationDbContext dbContext, UserManager<ApplicationUser> userManager)
         {
             _dbContext = dbContext;

src/Yavsc/AuthorizationHandlers/SendMessageHandler.cs

@@ -8,7 +8,7 @@ namespace Yavsc.AuthorizationHandlers
 {
     public class SendMessageHandler : AuthorizationHandler<PrivateChatEntryRequirement, string>
     {
-        ApplicationDbContext _dbContext ;
+        readonly ApplicationDbContext _dbContext ;
 
         public SendMessageHandler(ApplicationDbContext dbContext)
         {

src/Yavsc/AuthorizationHandlers/ViewFileHandler.cs

@@ -1,30 +1,37 @@
 using Microsoft.AspNet.Authorization;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Yavsc.Services;
 using Yavsc.ViewModels.Auth;
 
-namespace Yavsc.AuthorizationHandlers {
+namespace Yavsc.AuthorizationHandlers
+{
 
-    public class ViewFileHandler : AuthorizationHandler<ViewRequirement, ViewFileContext> {
+    public class ViewFileHandler : AuthorizationHandler<ViewRequirement, ViewFileContext>
+    {
+        readonly IFileSystemAuthManager _authManager;
+        private readonly ILogger _logger;
 
-        IFileSystemAuthManager _authManager;
+        public ViewFileHandler(IFileSystemAuthManager authManager, ILoggerFactory logFactory)
-
+        {
-        public ViewFileHandler (IFileSystemAuthManager authManager) {
             _authManager = authManager;
+            _logger = logFactory.CreateLogger<ViewFileHandler>();
         }
 
-        protected override void Handle (AuthorizationContext context, ViewRequirement requirement, ViewFileContext fileContext) {
+        protected override void Handle(AuthorizationContext context, ViewRequirement requirement, ViewFileContext fileContext)
-            // TODO file access rules
+        {
-            if (fileContext.Path.StartsWith ("/pub/"))
+
-                context.Succeed (requirement);
+            var rights = _authManager.GetFilePathAccess(context.User, fileContext.File);
-            else {
+            _logger.LogInformation("Got access value : " + rights);
-                if (!fileContext.Path.StartsWith ("/"))
-                    context.Fail ();
-                else {
-                    var rights = _authManager.GetFilePathAccess (context.User, fileContext.Path);
             if ((rights & FileAccessRight.Read) > 0)
+            {
+                _logger.LogInformation("Allowing access");
                 context.Succeed(requirement);
-                    else context.Fail ();
+            }
-                }
+            else
+            {
+                _logger.LogInformation("Denying access");
+                context.Fail();
             }
         }
     }

src/Yavsc/AuthorizationServer/GoogleHandler.cs

@@ -15,7 +15,7 @@ namespace Yavsc.Auth
 {
     internal class GoogleHandler : OAuthHandler<YavscGoogleOptions>
     {
-        private ILogger _logger;
+        private readonly ILogger _logger;
         public GoogleHandler(HttpClient httpClient,ILogger logger)
             : base(httpClient)
         {
@@ -92,9 +92,11 @@ namespace Yavsc.Auth
         {
             
             var scope = FormatScope();
-            var queryStrings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var queryStrings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-            queryStrings.Add("response_type", "code");
+            {
-            queryStrings.Add("client_id", Options.ClientId);
+                { "response_type", "code" },
+                { "client_id", Options.ClientId }
+            };
             // this runtime may not known this value, 
             // it should be get from config,
             // And always be using a secure sheme ... since Google won't support anymore insecure ones.

src/Yavsc/AuthorizationServer/GoogleMiddleWare.cs

@@ -16,8 +16,7 @@ namespace Yavsc.Auth
     /// </summary>
     public class GoogleMiddleware : OAuthMiddleware<YavscGoogleOptions>
     {
-        private RequestDelegate _next;
+        private readonly ILogger _logger;
-        private ILogger _logger;
 
         /// <summary>
         /// Initializes a new <see cref="GoogleMiddleware"/>.
@@ -37,11 +36,6 @@ namespace Yavsc.Auth
             YavscGoogleOptions options)
             : base(next, dataProtectionProvider, loggerFactory, encoder, sharedOptions, options)
         {
-            if (next == null)
-            {
-                throw new ArgumentNullException(nameof(next));
-            }
-            _next = next;
 
             if (dataProtectionProvider == null)
             {

src/Yavsc/AuthorizationServer/GoogleOAuthCreatingTicket.cs

@@ -15,8 +15,9 @@ namespace Yavsc.Auth {
             _googleUserId = googleUserId;
             Principal = ticket.Principal;
         }
-        AuthenticationTicket _ticket;
+
-        string _googleUserId;
+        readonly AuthenticationTicket _ticket;
+        readonly string _googleUserId;
 
         public AuthenticationTicket Ticket { get { return _ticket; } }
 

src/Yavsc/AuthorizationServer/MonoJwtSecurityTokenHandler.cs

@@ -12,10 +12,8 @@ namespace Yavsc.Auth
     public class MonoJwtSecurityTokenHandler : JwtSecurityTokenHandler
     {
 
-        MonoDataProtectionProvider protectionProvider;
+        public MonoJwtSecurityTokenHandler()
-        public MonoJwtSecurityTokenHandler(MonoDataProtectionProvider prpro)
         {
-            protectionProvider = prpro;
         }
         public override JwtSecurityToken CreateToken(
    string issuer,

src/Yavsc/AuthorizationServer/UserTokenProvider.cs

@@ -10,11 +10,6 @@ namespace Yavsc.Auth  {
 
     public class UserTokenProvider : Microsoft.AspNet.Identity.IUserTokenProvider<ApplicationUser>
     {
-        private MonoDataProtector protector=null;
-        public MonoDataProtector Protector {
-            get { return protector; } 
-        }
-
         public Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<ApplicationUser> manager, ApplicationUser user)
         {
             return Task.FromResult(true);

src/Yavsc/AuthorizationServer/XmlEncryptor.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Auth {
 
     public class MonoXmlEncryptor : IXmlEncryptor
     {
-        public MonoXmlEncryptor (IServiceProvider serviceProvider)
+        public MonoXmlEncryptor ()
         {
         }
         public EncryptedXmlInfo Encrypt(XElement plaintextElement)

src/Yavsc/Controllers/Accounting/AccountController.cs

@@ -69,9 +69,8 @@ namespace Yavsc.Controllers
 
 
         [Authorize(Roles = Constants.AdminGroupName)]
-        public IActionResult Index(string page, string len)
+        public IActionResult Index()
         {
-            
             return View();
         }
 
@@ -262,7 +261,7 @@ namespace Yavsc.Controllers
                     // For more information on how to enable account confirmation and password reset please visit http://go.microsoft.com/fwlink/?LinkID=532713
                     // Send an email with this link
                     var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-                    var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol:  "https", host: Startup.Authority);
+                    var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code }, protocol:  "https", host: Startup.Authority);
                     var emailSent = await _emailSender.SendEmailAsync(model.UserName, model.Email, _localizer["ConfirmYourAccountTitle"],
                       string.Format(_localizer["ConfirmYourAccountBody"], _siteSettings.Title, callbackUrl, _siteSettings.Slogan, _siteSettings.Audience));
                    // No, wait for more than a login pass submission:
@@ -317,7 +316,7 @@ namespace Yavsc.Controllers
         {
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
             var callbackUrl = Url.Action("ConfirmEmail", "Account",
-            new { userId = user.Id, code = code }, protocol: "https", host: Startup.Authority);
+            new { userId = user.Id, code }, protocol: "https", host: Startup.Authority);
             var res = await _emailSender.SendEmailAsync(user.UserName, user.Email, 
             this._localizer["ConfirmYourAccountTitle"],
             string.Format(this._localizer["ConfirmYourAccountBody"],
@@ -592,7 +591,7 @@ namespace Yavsc.Controllers
         // GET: /Account/ResetPassword
         [HttpGet]
         [AllowAnonymous]
-        public async Task<IActionResult> ResetPassword(string UserId, string code = null)
+        public async Task<IActionResult> ResetPassword(string UserId)
         {
             var user = await _userManager.FindByIdAsync(UserId);
             if (user==null) return new BadRequestResult();

src/Yavsc/Controllers/Accounting/ManageController.cs

@@ -29,18 +29,18 @@ namespace Yavsc.Controllers
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly IEmailSender _emailSender;
         private readonly ILogger _logger;
-        private SiteSettings _siteSettings;
+        private readonly SiteSettings _siteSettings;
 
-        private ApplicationDbContext _dbContext;
+        private readonly ApplicationDbContext _dbContext;
 
-        private GoogleAuthSettings _googleSettings;
+        private readonly GoogleAuthSettings _googleSettings;
 
-        private PayPalSettings _payPalSettings;
+        private readonly PayPalSettings _payPalSettings;
-        private IYavscMessageSender _GCMSender;
+        private readonly IYavscMessageSender _GCMSender;
-        private SIRENChecker _cchecker;
+        private readonly SIRENChecker _cchecker;
-        private IStringLocalizer _SR;
+        private readonly IStringLocalizer _SR;
-        private CompanyInfoSettings _cinfoSettings;
+        private readonly CompanyInfoSettings _cinfoSettings;
-        ICalendarManager _calendarManager;
+        readonly ICalendarManager _calendarManager;
 
 
         public ManageController(
@@ -195,9 +195,9 @@ namespace Yavsc.Controllers
             // Generate the token and send it
             var user = await GetCurrentUserAsync();
             var code = await _userManager.GenerateChangePhoneNumberTokenAsync(user, model.PhoneNumber);
-            // TODO         await _smsSender.SendSmsAsync(_twilioSettings, model.PhoneNumber, "Your security code is: " + code);
+            // TODO ? await _smsSender.SendSmsAsync(_twilioSettings, model.PhoneNumber, "Your security code is: " + code);
 
-            return RedirectToAction(nameof(VerifyPhoneNumber), new { PhoneNumber = model.PhoneNumber });
+            return RedirectToAction(nameof(VerifyPhoneNumber), new { model.PhoneNumber });
         }
 
         //
@@ -300,7 +300,7 @@ namespace Yavsc.Controllers
         {
           var uid = User.GetUserId();
 
-          var calendars = await _calendarManager.GetCalendarsAsync(uid, pageToken);
+          var calendars = await _calendarManager.GetCalendarsAsync(pageToken);
           return View(new SetGoogleCalendarViewModel { 
               ReturnUrl = returnUrl, 
               Calendars = calendars

src/Yavsc/Controllers/Accounting/OAuthController.cs

@@ -20,29 +20,14 @@ namespace Yavsc.Controllers
     [AllowAnonymous]
     public class OAuthController : Controller
     {
-        ApplicationDbContext _context;
+        readonly ILogger _logger;
-        UserManager<ApplicationUser> _userManager;
 
-        SiteSettings _siteSettings;
+        public OAuthController(ILoggerFactory loggerFactory)
-
-        ILogger _logger;
-        private readonly SignInManager<ApplicationUser> _signInManager;
-
-        public OAuthController(ApplicationDbContext context, SignInManager<ApplicationUser> signInManager, IKeyManager keyManager,
-        UserManager<ApplicationUser> userManager,
-        IOptions<SiteSettings> siteSettings,
-        ILoggerFactory loggerFactory
-        )
         {
-            _siteSettings = siteSettings.Value;
-            _context = context;
-            _signInManager = signInManager;
-            _userManager = userManager;
             _logger = loggerFactory.CreateLogger<OAuthController>();
         }
        
 
-
         [HttpGet("~/api/getclaims"), Produces("application/json")]
 
         public IActionResult GetClaims()

src/Yavsc/Controllers/Accounting/UsersController.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Controllers
     [Authorize("AdministratorOnly")]
     public class UsersController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public UsersController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Administration/MailingTemplateController.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Controllers
     [Authorize("AdministratorOnly")]
     public class MailingTemplateController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public MailingTemplateController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/AnnouncesController.cs

@@ -13,10 +13,9 @@ namespace Yavsc.Controllers
 {
     public class AnnouncesController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        IStringLocalizer<AnnouncesController> _localizer;
+        readonly IStringLocalizer<AnnouncesController> _localizer;
-
+        readonly IAuthorizationService _authorizationService;
-        IAuthorizationService _authorizationService;
 
         public AnnouncesController(ApplicationDbContext context, 
         IAuthorizationService authorizationService,
@@ -61,9 +60,7 @@ namespace Yavsc.Controllers
         {
             ViewBag.IsAdmin = User.IsInRole(Constants.AdminGroupName);
             ViewBag.IsPerformer = User.IsInRole(Constants.PerformerGroupName);
-            ViewBag.AllowEdit = (announce!=null && announce.Id>0) ?
+            ViewBag.AllowEdit = announce==null || announce.Id<=0 || await _authorizationService.AuthorizeAsync(User,announce,new EditRequirement());
-                await _authorizationService.AuthorizeAsync(User,announce,new EditRequirement()) :
-                true;
             List<SelectListItem> dl = new List<SelectListItem>();
             var rnames = System.Enum.GetNames(typeof(Reason));
             var rvalues = System.Enum.GetValues(typeof(Reason));

src/Yavsc/Controllers/Communicating/BlogspotController.cs

@@ -21,11 +21,10 @@ namespace Yavsc.Controllers
 {
     public class BlogspotController : Controller
     {
-        ILogger _logger;
+        readonly ILogger _logger;
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        private IAuthorizationService _authorizationService;
+        private readonly IAuthorizationService _authorizationService;
-
+        readonly RequestLocalizationOptions _localisationOptions;
-        RequestLocalizationOptions _localisationOptions;
 
         public BlogspotController(
             ApplicationDbContext context,
@@ -41,7 +40,7 @@ namespace Yavsc.Controllers
 
         // GET: Blog
         [AllowAnonymous]
-        public async Task<IActionResult> Index(string id, int skip=0, int maxLen=25)
+        public async Task<IActionResult> Index(string id)
         {
             if (!string.IsNullOrEmpty(id)) {
                 return await UserPosts(id);

src/Yavsc/Controllers/Communicating/CircleController.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Controllers
 {
     public class CircleController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CircleController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/CircleMembersController.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Controllers
 {
     public class CircleMembersController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CircleMembersController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/CommentsController.cs

@@ -13,7 +13,7 @@ namespace Yavsc.Controllers
     /// </summary>
     public class CommentsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CommentsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/DevicesController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
     using Models.Identity;
     public class DevicesController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public DevicesController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/HyperLinkController.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Controllers
     [Authorize("AdministratorOnly")]
     public class HyperLinkController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public HyperLinkController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/LiveFlowController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
 {
     public class LiveFlowController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public LiveFlowController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Communicating/MyFSRulesController.cs

@@ -14,8 +14,8 @@ namespace Yavsc.Controllers
     [Authorize()]
     public class MyFSRulesController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        private ILogger _logger;
+        private readonly ILogger _logger;
 
         public MyFSRulesController(ApplicationDbContext context,
          ILoggerFactory loggerFactory)

src/Yavsc/Controllers/Communicating/NotificationsController.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Controllers
 {
     public class NotificationsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public NotificationsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/ActivityController.cs

@@ -16,9 +16,9 @@ namespace Yavsc.Controllers
     [Authorize("AdministratorOnly")]
     public class ActivityController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        IStringLocalizer<Yavsc.YavscLocalisation> SR;
+        readonly IStringLocalizer<Yavsc.YavscLocalisation> SR;
-        ILogger logger;
+        readonly ILogger logger;
 
         public ActivityController(ApplicationDbContext context, 
         IStringLocalizer<Yavsc.YavscLocalisation> SR,

src/Yavsc/Controllers/Contracting/ClientController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
 {
     public class ClientController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public ClientController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/CoWorkingController.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Controllers
 {
     public class CoWorkingController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CoWorkingController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/CommandController.cs

@@ -90,7 +90,7 @@ namespace Yavsc.Controllers
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult Create(string proId, string activityCode, string billingCode)
+        public IActionResult Create(string proId, string activityCode)
         {
             if (string.IsNullOrWhiteSpace(proId))
                 throw new InvalidOperationException(
@@ -159,7 +159,7 @@ namespace Yavsc.Controllers
                 _context.RdvQueries.Add(command, GraphBehavior.IncludeDependents);
                 _context.SaveChanges(User.GetUserId());
 
-                var yaev = command.CreateEvent(_localizer, "NewCommand");
+                var yaev = command.CreateEvent("NewCommand");
 
                 MessageWithPayloadResponse nrep = null;
 

src/Yavsc/Controllers/Contracting/CommandFormsController.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Controllers
 {
     public class CommandFormsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public CommandFormsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/DjSettingsController.cs

@@ -8,7 +8,7 @@ namespace Yavsc.Controllers
 {
     public class DjSettingsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public DjSettingsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/DoController.cs

@@ -17,9 +17,9 @@ namespace Yavsc.Controllers
     [Authorize]
     public class DoController : Controller
     {
-        private ApplicationDbContext dbContext;
+        private readonly ApplicationDbContext dbContext;
-        ILogger logger;
+        readonly ILogger logger;
-        IBillingService billing;
+        readonly IBillingService billing;
         public DoController(
             ApplicationDbContext context,
             IBillingService billing,

src/Yavsc/Controllers/Contracting/EstimateController.cs

@@ -21,10 +21,9 @@ namespace Yavsc.Controllers
     [Authorize]
     public class EstimateController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
-        private SiteSettings _site;
+        private readonly SiteSettings _site;
-
+        readonly IAuthorizationService authorizationService;
-        IAuthorizationService authorizationService;
 
         public EstimateController(ApplicationDbContext context, IAuthorizationService authorizationService, IOptions<SiteSettings> siteSettings)
         {
@@ -143,10 +142,6 @@ namespace Yavsc.Controllers
         }
 
 
-        private void Save(ICollection<IFormFile> newGraphics,
-         ICollection<IFormFile> newFiles) {
-
-         }
         // GET: Estimate/Edit/5
         public IActionResult Edit(long? id)
         {

src/Yavsc/Controllers/Contracting/FormsController.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Controllers
 {
     public class FormsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public FormsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/FrontOfficeController.cs

@@ -18,13 +18,11 @@ namespace Yavsc.Controllers
 
     public class FrontOfficeController : Controller
     {
-        ApplicationDbContext _context;
+        readonly ApplicationDbContext _context;
-        UserManager<ApplicationUser> _userManager;
+        readonly UserManager<ApplicationUser> _userManager;
-
+        readonly ILogger _logger;
-        ILogger _logger;
+        readonly IStringLocalizer _SR;
-
+        private readonly IBillingService _billing;
-        IStringLocalizer _SR;
-        private IBillingService _billing;
 
         public FrontOfficeController(ApplicationDbContext context,
             UserManager<ApplicationUser> userManager,

src/Yavsc/Controllers/Contracting/GeneralSettingsController.cs

@@ -8,7 +8,7 @@ namespace Yavsc.Controllers
 {
     public class GeneralSettingsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public GeneralSettingsController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/MusicalTendenciesController.cs

@@ -8,7 +8,7 @@ namespace Yavsc.Controllers
     using Models.Musical;
     public class MusicalTendenciesController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public MusicalTendenciesController(ApplicationDbContext context)
         {

src/Yavsc/Controllers/Contracting/SIRENExceptionsController.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Controllers
     [Authorize(Roles="Administrator")]
     public class SIRENExceptionsController : Controller
     {
-        private ApplicationDbContext _context;
+        private readonly ApplicationDbContext _context;
 
         public SIRENExceptionsController(ApplicationDbContext context)
         {