WIP Accesses

.gitignore

@@ -7,7 +7,7 @@
 .paket/
 .vscode/
 .vs/
-.dnx/
+.sass-cache/
 
 bin
 obj
@@ -21,6 +21,8 @@ RSA-Params.json
 appsettings.*.json
 omnisharp.json
 
+DataProtection/
+
 /packages/
 /src/Yavsc/Avatars-*/
 /src/Yavsc/Blog-*/
@@ -29,7 +31,7 @@ omnisharp.json
 /src/Yavsc/Temp-*/
 /src/Yavsc/*-Avatars/
 /src/Yavsc/bower_components/
-/src/Yavsc/AppData*/
+/src/Yavsc/Data-Dev/
 /src/test/testingrepo/
 connectionsettings.Development.json
 appsettings.Development.json
@@ -40,3 +42,4 @@ builds/
 /test/yavscTests/test-results.html
 /binaries/Debug/yavscd
 yavsc-pre
+

INSTALL.md

@@ -8,7 +8,7 @@ In this doc, let's say, `FreeField`
 
 ### A domain name
 
-Wait ... `freefield.pschneider.fr`
+Wait ... `pschneider.fr`
 You'll have to see with your provider, in order to power it, and make it point to your host ip, at least concerning the ports 80 & 443.
 
 ### An Npgsql db

Makefile

@@ -2,7 +2,7 @@
 MONO_PREFIX=/home/paul/mono46
 DNX_USER_HOME=/home/paul/.dnx
 DNXLIBS=Microsoft.Dnx.Host.Mono.dll Microsoft.Dnx.Host.dll Microsoft.Dnx.ApplicationHost.dll Microsoft.Dnx.Loader.dll Microsoft.Dnx.Compilation.Abstractions.dll Microsoft.Dnx.Compilation.CSharp.Abstractions.dll Microsoft.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.Dnx.Compilation.CSharp.Common.dll Microsoft.Dnx.Compilation.CSharp.dll Microsoft.Dnx.Compilation.dll Microsoft.Dnx.Runtime.dll Microsoft.Dnx.Runtime.Internals.dll Microsoft.Extensions.PlatformAbstractions.dll System.Collections.Immutable.dll System.Reflection.Metadata.dll
-DNXLIBFP:=$(addprefix $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/, $(DNXLIBS))
+DNXLIBFP:=./packages/System.Diagnostics.DiagnosticSource/4.0.0-beta-23516/lib/portable-net45+win8+wp8+wpa81/System.Diagnostics.DiagnosticSource.dll $(addprefix $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/, $(DNXLIBS))
 CONFIG=Debug
 
 yavscd=yavscd
@@ -79,7 +79,7 @@ yavscassemblies: src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc.Server/bin/$
 
 yavscd: yavscassemblies updatedeps
 	mkdir -p binaries/$(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 $(shell ls private/lib/*.dll) -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)
+	mkbundle --deps $(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 $(shell ls private/lib/*.dll) -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: $(yavscd)
 	strip $(yavscd)

README.md

@@ -11,56 +11,21 @@ C'est une application mettant en oeuvre une prise de contact entre un demandeur
 
 ## Construction
 
-Le code est du c sharp, dont les librairies sont restorées et le tout compilé avec les librairies DNX de M$, téléchargeable en executant le script d'installation suivant (c.f. `/.travis.yml`):
-
-```bash
-    curl --insecure -sSL https://lua.pschneider.fr/files/Paul/dnx-install.sh | bash && DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh && cd Yavsc && dnu restore
-```
-
-Une fois l'environnement ainsi pollué, executer, depuis le sous dossier `Yavsc`:
-
 ```bash
-    dnu build
-```
-
-L'utilisation du serveur web, avec un runtime Mono, échoura dans ses version récentes (à peu près supérieure ou égale à 4.7).
-
-La version 4.6.2 de mono convient:
-
-```
-    [monoperso] ~/workspace/yavsc/Yavsc @ mono --version
-    Mono JIT compiler version 4.6.2 (Stable 4.6.2.7/08fd525 jeudi 18 janvier 2018, 13:10:54 (UTC+0100))
-        TLS:           __thread
-        SIGSEGV:       altstack
-        Notifications: epoll
-        Architecture:  amd64
-        Disabled:      none
-        Misc:          softdebug 
-        LLVM:          supported, not enabled.
-        GC:            sgen
+ dotnet build
 ```
 
 et, pour execution en environement de développement
 
 ```
-    [monoperso] ~/workspace/yavsc/Yavsc @ ASPNET_ENV=Development dnx web
-    warn: Yavsc.Startup[0]
-      AppData was not found in environment variables
-    warn: Yavsc.Startup[0]
-      It has been set to : /home/paul/workspace/yavsc/Yavsc/AppDataDevelopment
-    Hosting environment: Development
-    Now listening on: http://*:5000
-    Application started. Press Ctrl+C to shut down.
+   ~/workspace/yavsc/Yavsc @ ASPNETCORE_ENV=Development dotnet run
 ```
 
-Si vous êtes arrivé jusqu'ici, vous devriez pouvoir visiter la home page :
- <http://localhost:5000>.
-
 ## Tests
 
 Utilisez GNU/Makefile (et visitez le code, dans le dossier `test` ):
 
-Depuis le répertoire racine:
+[TOREDO] Depuis le répertoire racine:
 
 ```bash
 make test
@@ -72,21 +37,6 @@ make test
 
 [TODO]
 
-### la configuration Apache 2
-
-[TODO]
-
-### la mise en pré-production
-
-Pour déployer le tout en production, on peut d'abord déployer en "pré-production",
-Afin de pouvoir tester manuellement quelque dernier développement :
-
-```bash
-cd Yavsc
-make pushInPre # arrete kestrel-pre, pousse tout dans DESTDIR=/srv/www/yavscpre avec rsync,
-               # et redemarre kestrel-pre 
-```
-
 ### La Prod
 
 Une fois sûr de vous, et une fois que Git dit propre votre copie de travail, depuis le répertoire `Yavsc`, lancez `make pushInProd`.

SECURITY.md

@@ -7,4 +7,4 @@
 | ------- | ------------------ |
 | 1.0.6   | :x:                |
 
-(https://yavsc.pschneider.fr)
+(https://pschneider.fr:84)

TODO.md

@@ -6,7 +6,6 @@ Ceci est une grosse liste de fonctionnalités, existantes, ou à implémenter, o
 
 ## Jalon 1
 
-	☐ Redirection vers la Page d'accueil à la validation du second facteur (evitera l'erreur Anti-forgery token) 
 	☐ Des spécifications détaillées du coeur de l'application
 	✔ Acces (publique) aux Blogs. @done (August 13th 2016, 0:51)
 	✔ Accès aux profiles des intervenants. @done (August 13th 2016, 0:57)

contrib/kestrel

@@ -1,131 +0,0 @@
-#!/bin/bash 
-### BEGIN INIT INFO
-# Provides:          kestrel
-# Required-Start:    $local_fs $network $named $time $syslog $postgresql
-# Required-Stop:     $local_fs $network $named $time $syslog $postgresql
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Description:       Script to run asp.net 5 application in background
-### END INIT INFO
-
-# Author: Ivan Derevianko aka druss <drussilla7@gmail.com>
-# Modified by: Paul Schneider <redienhcs.luap@gmail.com>
-
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-CONFIGS="/etc/kestrel/*.webenv"
-
-TMP_SAVE_runlevel_VAR=$runlevel
-unset runlevel
-
-running() {
-  if [ -f $PIDFILE ]
-  then
-    PID=$(cat $PIDFILE)
-    if kill -0 $PID 2>/dev/null
-      then
-	    return 0
-    fi
-  fi
-  return 1
-}
-
-
-setdnxenv() {
-    env=$1
-    . $env
-    # reset all except the name to default values
-	export ASPNET_ENV=$NAME
-	export WWW_USER=www-data
-	YAVSCBIN=/usr/local/bin/yavscd
-	PROJECT=approot/Web
-	CONFIGURATION=Release
-	ROOT=/srv/www/yavsc
-    DESC="$NAME"
-    PIDFILE=/var/run/kestrel-${NAME}.pid
-    LOGDIR=/var/log
-    # reset to specified values
-    . $env
-}
-
-status() {
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
-	if running;
-	then
-		echo "Service running $DESC ($NAME; pid: $PID)"
-	else
-		echo "Service stopped $DESC ($NAME)"
-	fi
-  done
-}
-
-
-start() {
-    # wait a little for postgresql to be available
-    sleep 1
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
-	if running; then
-		echo "Service already running $DESC" "$NAME"
-		log_end_msg 0  
-	else
-		log_daemon_msg "Starting service $NAME for user $WWW_USER"
-		if ! start-stop-daemon -SbmCv -u $WWW_USER -p $PIDFILE -d $ROOT -g www-data -x $YAVSCBIN -- --project $PROJECT --configuration $CONFIGURATION $NAME > "${LOGDIR}/kestrel-${NAME}.log"
-        then 
-			log_daemon_msg "Could not start $NAME : $?, see ${LOGDIR}/kestrel-${NAME}.log"
-			log_end_msg 2
-		else
-			log_daemon_msg "Service $DESC started ($NAME), logs: ${LOGDIR}/kestrel-${NAME}.log"
-			log_end_msg 0  
-		fi
-	fi
-  done
-
-}
-
-stop() {
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
-	if running
-	then
-		log_daemon_msg "Stopping service $NAME"
-		start-stop-daemon -K -p "$PIDFILE"
-		log_daemon_msg "$DESC stopped"
-		log_end_msg 0  
-	else
-		log_daemon_msg "$DESC Service not running"
-	    log_end_msg 1  
-	fi
-  done
-}
-
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    stop
-	sleep 1
-    start
-    ;;
-  status)
-    status
-	;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-esac
-
-export runlevel=$TMP_SAVE_runlevel_VAR
-
-

contrib/yavsc

@@ -1,11 +1,11 @@
 #!/bin/bash 
 ### BEGIN INIT INFO
-# Provides:          kestrel-pre
+# Provides:          yavsc
 # Required-Start:    $local_fs $network $named $time $syslog $postgresql
 # Required-Stop:     $local_fs $network $named $time $syslog $postgresql
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Description:       Script to run asp.net 5 application in background
+# Description:       Script to run yavsc
 ### END INIT INFO
 
 # Author: Ivan Derevianko aka druss <drussilla7@gmail.com>
@@ -14,8 +14,9 @@
 . /lib/init/vars.sh
 . /lib/lsb/init-functions
 
+NAME=yavsc
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-CONFIGS="/etc/kestrel/*.prewebenv"
 
 TMP_SAVE_runlevel_VAR=$runlevel
 unset runlevel
@@ -33,47 +34,34 @@ running() {
 }
 
 
-setdnxenv() {
-    env=$1
-    . $env
-    # reset all except the name to default values
-	export ASPNET_ENV=$NAME
-	export WWW_USER=www-data
-	YAVSCBIN=/usr/local/bin/yavscd-pre
-	PROJECT=approot/Web
-	CONFIGURATION=Release
-	ROOT=/srv/www/yavscpre
-    DESC="$NAME"
-    PIDFILE=/var/run/kestrel-${NAME}.pid
-    LOGDIR=/var/log
-    # reset to specified values
-    . $env
-}
-
+export WWW_USER=www-data
+export ROOT=/srv/www/${NAME}
+export DESC="$NAME"
+export PIDFILE=/var/run/kestrel-${NAME}.pid
+export LOGDIR=/var/log
+export DOTNET_CLI_HOME=$ROOT
+export ASPDOTNETCORE_ENVIRONMENT=Production
+export ASPDOTNETCORE_LOGLEVEL=Information
 status() {
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
 	if running;
 	then
 		echo "Service running $DESC ($NAME; pid: $PID)"
 	else
 		echo "Service stopped $DESC ($NAME)"
 	fi
-  done
+    echo WWW_USER: $WWW_USER ROOT:$ROOT DESC: $DESC NAME: $NAME PIDFILE: $PIDFILE LOGDIR=$LOGDIR
 }
 
 
 start() {
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
 	if running; then
 		echo "Service already running $DESC" "$NAME"
 		log_end_msg 0  
 	else
+        cd $ROOT
+        sleep 4
 		log_daemon_msg "Starting service $NAME for user $WWW_USER"
-		if ! start-stop-daemon -SbmCv -u $WWW_USER -p $PIDFILE -d $ROOT -g www-data -x $YAVSCBIN -- --project $PROJECT --configuration $CONFIGURATION $NAME > "${LOGDIR}/kestrel-${NAME}.log"
+		if ! start-stop-daemon -SbmCv -u $WWW_USER -p $PIDFILE -d $ROOT -g www-data -x yavsc  > "${LOGDIR}/kestrel-${NAME}.log"
         then 
 			log_daemon_msg "Could not start $NAME : $?, see ${LOGDIR}/kestrel-${NAME}.log"
 			log_end_msg 2
@@ -82,14 +70,10 @@ start() {
 			log_end_msg 0  
 		fi
 	fi
-  done
 
 }
 
 stop() {
-  for env in $CONFIGS
-  do
-    setdnxenv "$env"
 	if running
 	then
 		log_daemon_msg "Stopping service $NAME"
@@ -100,7 +84,6 @@ stop() {
 		log_daemon_msg "$DESC Service not running"
 	    log_end_msg 1  
 	fi
-  done
 }
 
 
@@ -113,7 +96,6 @@ case "$1" in
     ;;
   restart)
     stop
-	sleep 1
     start
     ;;
   status)

global.json

@@ -4,5 +4,10 @@
         "scripts",
         "tests"
     ],
+    "sdk": {
+      "version": "8.0.200",  
+      "runtime": "dotnet",
+      "architecture": "x64"
+    },
     "packages": "packages"
 }

omnisharp.json

@@ -3,12 +3,10 @@
 		"enabled": false
 	},
 	"msbuild": {
-		"enabled": false
+		"enabled": true
 	},
 	"Dnx": {
-		"enabled": true,
-		"enablePackageRestore": false,
-		"projects": "src/*/project.json;*/project.json;project.json;test/*/project.json"
+		"enabled": false
 	},
 	"Script": {
 		"enabled": false
@@ -21,5 +19,4 @@
     ],
     "userExcludeSearchPatterns": []
   }
-
 }

scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Create.cshtml

@@ -9,20 +9,20 @@
     else if (Model.IsLayoutPageSelected)
     {
 @:@@{
-    @:ViewData["Title"] = @@SR["@Model.ViewName"];
+    @:ViewData["Title"] = @@Model.ViewName;
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
     @:Layout = "@Model.LayoutPageFile";
         }
 @:}
 @:
-@:<h2>@@SR["@Model.ViewName"]</h2>
+@:<h2>@@Model.ViewName</h2>
 @:
     }
     else
     {
 @:@@{
-    @:Layout = null;
+    @:Layout = "null";
 @:}
 @:
 @:<!DOCTYPE html>
@@ -38,9 +38,9 @@
     }
 @:<form asp-action="@Model.ViewName">
     @:<div class="form-horizontal">
-        @:<h4>@@SR["@Model.ViewDataTypeShortName"]</h4>
+        @:<h4>@@Model.ViewDataTypeShortName"]</h4>
         @:<hr />
-        @:<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
+        @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
     foreach (var property in Model.ModelMetadata.Properties)
     {
         if (property.Scaffold && !property.IsAutoGenerated && !property.IsReadOnly)
@@ -107,7 +107,7 @@
 </form>
 
 <div>
-    <a asp-action="Index">@@SR["Back to List"]</a>
+    <a asp-action="Index">@Back to List</a>
 </div>
 
 @{
@@ -142,4 +142,4 @@
     {
         return string.Equals("System.Guid", property.TypeName, StringComparison.OrdinalIgnoreCase);
     }
-}
+}

scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Delete.cshtml

@@ -9,20 +9,20 @@
     else if (Model.IsLayoutPageSelected)
     {
 @:@@{
-    @:ViewData["Title"] = @@SR["@Model.ViewName"];
+    @:ViewData["Title"] = @@Model.ViewName;
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
     @:Layout = "@Model.LayoutPageFile";
         }
 @:}
 @:
-@:<h2>@@SR["@Model.ViewName"]</h2>
+@:<h2>@@Model.ViewName</h2>
 @:
     }
     else
     {
 @:@@{
-    @:Layout = null;
+    @:Layout = "null";
 @:}
 @:
 @:<!DOCTYPE html>
@@ -30,16 +30,16 @@
 @:<html>
 @:<head>
     @:<meta name="viewport" content="width=device-width" />
-    @:<title>@@SR[@Model.ViewName]</title>
+    @:<title>@@@Model.ViewName</title>
 @:</head>
 @:<body>
 @:
         //    PushIndent("    ");
     }
 }
-<h3>@@SR["AreYourSureYouWantToDeleteThis"]</h3>
+<h3>@AreYourSureYouWantToDeleteThis</h3>
 <div>
-    <h4>@@SR[@Model.ViewDataTypeShortName]</h4>
+    <h4>@@@Model.ViewDataTypeShortName</h4>
     <hr />
     <dl class="dl-horizontal">
 @{
@@ -59,8 +59,8 @@
     @:
     @:<form asp-action="@Model.ViewName">
         @:<div class="form-actions no-color">
-            @:<input type="submit" value="@@SR["Delete"]" class="btn btn-default" /> |
-            @:<a asp-action="Index">@@SR["Back to List"]</a>
+            @:<input type="submit" value="@Delete" class="btn btn-default" /> |
+            @:<a asp-action="Index">Back to List</a>
         @:</div>
     @:</form>
 @:</div>
@@ -78,4 +78,4 @@
         //Todo: Get the association for the property and use that.
         return property.PropertyName;
     }
-}
+}

scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml

@@ -9,20 +9,20 @@
     else if (Model.IsLayoutPageSelected)
     {
 @:@@{
-    @:ViewData["Title"] = @@SR["@Model.ViewName"];
+    @:ViewData["Title"] = @@Model.ViewName;
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
     @:Layout = "@Model.LayoutPageFile";
         }
 @:}
 @:
-@:<h2>@@SR["@Model.ViewName"]</h2>
+@:<h2>@@Model.ViewName</h2>
 @:
     }
     else
     {
 @:@@{
-    @:Layout = null;
+    @:Layout = "null";
 @:}
 @:
 @:<!DOCTYPE html>
@@ -61,13 +61,13 @@
     string pkName = GetPrimaryKeyName();
     if (pkName != null)
     {
-    @:<a asp-action="Edit" asp-route-id="@@Model.@pkName">@@SR["Edit"]</a> |
-    @:<a asp-action="Index">@@SR["Back to List"]</a>
+    @:<a asp-action="Edit" asp-route-id="@@Model.@pkName">@Edit</a> |
+    @:<a asp-action="Index">Back to List</a>
     }
     else
     {
-    @:@@Html.ActionLink(@@SR["Edit"], "Edit", new { /* id = Model.PrimaryKey */ }) |
-    @:<a asp-action="Index">@@SR["Back to List"]</a>
+    @:@@Html.ActionLink(@Edit, "Edit", new { /* id = Model.PrimaryKey */ }) |
+    @:<a asp-action="Index">Back to List</a>
     }
 }</p>
 @{
@@ -92,4 +92,4 @@
         //Todo: Get the association for the property and use that.
         return property.PropertyName;
     }
-}
+}

scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Edit.cshtml

@@ -9,20 +9,20 @@
     else if (Model.IsLayoutPageSelected)
     {
 @:@@{
-    @:ViewData["Title"] = @@SR["@Model.ViewName"];
+    @:ViewData["Title"] = @@Model.ViewName;
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
     @:Layout = "@Model.LayoutPageFile";
         }
 @:}
 @:
-@:<h2>@@SR["@Model.ViewName"]</h2>
+@:<h2>@@Model.ViewName</h2>
 @:
     }
     else
     {
 @:@@{
-    @:Layout = null;
+    @:Layout = "null";
 @:}
 @:
 @:<!DOCTYPE html>
@@ -30,7 +30,7 @@
 @:<html>
 @:<head>
     @:<meta name="viewport" content="width=device-width" />
-    @:<title>@@SR["@Model.ViewName"]</title>
+    @:<title>@@Model.ViewName</title>
 @:</head>
 @:<body>
 @:
@@ -40,7 +40,7 @@
     @:<div class="form-horizontal">
         @:<h4>@Model.ViewDataTypeShortName</h4>
         @:<hr />
-        @:<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
+        @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
     foreach (PropertyMetadata property in Model.ModelMetadata.Properties)
     {
         if (property.Scaffold)
@@ -111,7 +111,7 @@
 </form>
 
 <div>
-    <a asp-action="Index">@@SR["Back to List"]</a>
+    <a asp-action="Index">Back to List</a>
 </div>
 
 @{

scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/List.cshtml

@@ -9,20 +9,20 @@
     else if (Model.IsLayoutPageSelected)
     {
 @:@@{
-    @:ViewData["Title"] = @@SR["@Model.ViewName"];
+    @:ViewData["Title"] = @@Model.ViewName;
         if (!string.IsNullOrEmpty(Model.LayoutPageFile))
         {
     @:Layout = "@Model.LayoutPageFile";
         }
 @:}
 @:
-@:<h2>@@SR["@Model.ViewName"]</h2>
+@:<h2>@@Model.ViewName</h2>
 @:
     }
     else
     {
 @:@@{
-    @:Layout = null;
+    @:Layout = "null";
 @:}
 @:
 @:<!DOCTYPE html>
@@ -30,13 +30,13 @@
 @:<html>
 @:<head>
     @:<meta name="viewport" content="width=device-width" />
-    @:<title>@@SR["@Model.ViewName"]</title>
+    @:<title>@@Model.ViewName</title>
 @:</head>
 @:<body>
         //    PushIndent("    ");
     }
 @:<p>
-    @:<a asp-action="Create">@@SR["Create New"]</a>
+    @:<a asp-action="Create">Create New</a>
 @:</p>
 @:<table class="table">
     @:<tr>
@@ -69,17 +69,17 @@
     if (pkName != null)
     {
         @:<td>
-            @:<a asp-action="Edit" asp-route-id="@@item.@pkName">@@SR["Edit"]</a> |
-            @:<a asp-action="Details" asp-route-id="@@item.@pkName">@@SR["Details"]</a> |
-            @:<a asp-action="Delete" asp-route-id="@@item.@pkName">@@SR["Delete"]</a>
+            @:<a asp-action="Edit" asp-route-id="@@item.@pkName">@Edit</a> |
+            @:<a asp-action="Details" asp-route-id="@@item.@pkName">@Details</a> |
+            @:<a asp-action="Delete" asp-route-id="@@item.@pkName">@Delete</a>
         @:</td>
     }
     else
     {
         <td>
-            @@Html.ActionLink(SR["Edit"], "Edit",new { /* id=item.PrimaryKey */ }) |
-            @@Html.ActionLink(SR["Details"], "Details", new { /* id=item.PrimaryKey */ }) |
-            @@Html.ActionLink(SR["Delete"], "Delete", new { /* id=item.PrimaryKey */ })
+            @@Html.ActionLink("Edit", "Edit",new { /* id=item.PrimaryKey */ }) |
+            @@Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) |
+            @@Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })
         </td>
     }
     @:</tr>
@@ -112,4 +112,4 @@
     {
         return "IEnumerable<" + typeName + ">";
     }
-}
+}

src/Yavsc.Abstract/Constants.cs

@@ -19,10 +19,10 @@ namespace Yavsc
         public const string CompanyClaimType = "https://schemas.pschneider.fr/identity/claims/Company";
         public const string UserNameRegExp = @"^[a-zA-Z][a-zA-Z0-9._-]*$";
         public const string UserFileNamePatternRegExp = @"^([a-zA-Z0-9._-]*/)*[a-zA-Z0-9._-]+$";
-        public const string AuthorizePath = "~/authorize";
-        public const string TokenPath = "~/token";
-        public const string LoginPath = "~/signin";
-        public const string LogoutPath = "~/signout";
+        public const string AuthorizePath = "/authorize";
+        public const string TokenPath = "/token";
+        public const string LoginPath = "/signin";
+        public const string LogoutPath = "/signout";
 
 
         public const string SignalRPath = "/api/signalr";

src/Yavsc.Abstract/Google/Calendar/CalendarList.cs

@@ -26,6 +26,7 @@ namespace Yavsc.Models.Google.Calendar
 	/// <summary>
 	/// Calendar list.
 	/// </summary>
+	[Obsolete("use Google.Apis")]
 	public class CalendarList {
 		/// <summary>
 		/// Gets or sets the kind.

src/Yavsc.Abstract/Google/Calendar/CalendarListEntry.cs

@@ -27,6 +27,7 @@ namespace Yavsc.Models.Google.Calendar
 	/// Calendar list entry.
 	/// </summary>
 	/// 
+	[Obsolete("use GoogleUse.Apis")]
 	public class CalendarListEntry {
 		/// <summary>
 		/// Gets or sets the kind.

src/Yavsc.Abstract/IT/CiBuildSettings.cs

@@ -10,7 +10,7 @@ public class CiBuildSettings
     /// The global process environment variables
     /// </summary>
     /// <value></value>
-    [JsonPropertyAttribute("env")]
+    [JsonProperty("env")]
     public string[] Environment { get; set; }
 
     /// <summary>

src/Yavsc.Abstract/Interfaces/IBillingService.cs

@@ -9,7 +9,7 @@ namespace Yavsc.Services
   {
     // TODO ensure a default value at using this:
     /// <summary>
-    /// maps a command type name to a bolling code, used to get bill assets
+    /// maps a command type name to a billing code, used to get bill assets
     /// </summary>
     /// <returns></returns>
     Dictionary<string,string> BillingMap { get; }
@@ -33,7 +33,7 @@ namespace Yavsc.Services
     /// </summary>
     /// <param name="activityCode"></param>
     /// <returns></returns>
-    Task<IQueryable<ISpecializationSettings>>  GetPerformersSettingsAsync(string activityCode);
+    Task<IEnumerable<ISpecializationSettings>>  GetPerformersSettingsAsync(string activityCode);
 
     /// <summary>
     /// Perfomer settings for the specified performer in the activity 

src/Yavsc.Abstract/Interfaces/IEmailSender.cs

@@ -1,19 +0,0 @@
-
-using System.Threading.Tasks;
-using Yavsc.Abstract.Manage;
-
-namespace Yavsc.Services
-{
-    public interface IEmailSender
-    {
-        /// <summary>
-        /// Sends en email.
-        /// </summary>
-        /// <param name="username">user name in database</param>
-        /// <param name="email">user's email</param>
-        /// <param name="subject">email subject</param>
-        /// <param name="message">message</param>
-        /// <returns>the message id</returns>
-        Task<EmailSentViewModel> SendEmailAsync(string username, string email, string subject, string message);
-    }
-}

src/Yavsc.Abstract/Messaging/Notification.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -15,35 +16,42 @@ namespace Yavsc.Models.Messaging
         /// The title.
         /// </summary>
         [Required, Display(Name = "Titre")]
+        [StringLength(1024)]
         public string title { get; set; }
         /// <summary>
         /// The body.
         /// </summary>
+        [StringLength(512)]
         [Required, Display(Name = "Corps")]
         public string body { get; set; }
         /// <summary>
         /// The icon.
         /// </summary>
+        [StringLength(512)]
         [Display(Name = "Icône")]
         public string icon { get; set; } 
         /// <summary>
         /// The sound.
         /// </summary>
+        [StringLength(512)]
         [Display(Name = "Son")]
         public string sound { get; set; }
         /// <summary>
         /// The tag.
         /// </summary>
+        [StringLength(512)]
         [Display(Name = "Tag")]
         public string tag { get; set; }
         /// <summary>
         /// The color.
         /// </summary>
+        [StringLength(512)]
         [Display(Name = "Couleur")]
-        public string color { get; set; }
+        public  string color { get; set; }
         /// <summary>
         /// The click action.
         /// </summary>
+        [StringLength(512)]
         [Required, Display(Name = "Label du click")]
         public string click_action { get; set; }
 
@@ -54,6 +62,7 @@ namespace Yavsc.Models.Messaging
         /// <c>administration</c> : for admins ...
         /// </summary>
         /// <returns></returns>
+        [StringLength(512)]
         public string Target { get; set; }
 
         public Notification()

src/Yavsc.Abstract/Workflow/INominativeQuery.cs

@@ -2,9 +2,10 @@ using System;
 
 namespace Yavsc.Abstract.Workflow
 {
-    public interface IDecidableQuery: IQuery
+    public interface IDecidableQuery: IBaseTrackedEntity, IQuery
     {
-         bool Rejected { get; set; }
-         DateTime RejectedAt { get; set; }
+         bool Decided { get; set; }
+         bool Accepted { get; set; }
+         
     }
-}
+}

src/Yavsc.Abstract/Yavsc.Abstract.csproj

@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
 
 </Project>

src/Yavsc.Abstract/Yavsc.Abstract.nuspec

@@ -19,6 +19,6 @@
 	</metadata>
 	<files>
 		<file src="bin/$config$/dnx451/Yavsc.Abstract.dll" target="lib/dnx451" />
-		<file src="bin/$config$/net451/Yavsc.Abstract.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+		<file src="bin/$config$/net451/Yavsc.Abstract.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10+monoandroid90" />
 	</files>
 </package>

src/Yavsc.Server/Interfaces/Event.cs

@@ -1,27 +0,0 @@
-//
-//  ICalendarManager.cs
-//
-//  Author:
-//       Paul Schneider <paul@pschneider.fr>
-//
-//  Copyright (c) 2015 GNU GPL
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU Lesser General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace Yavsc.Services
-{
-    public class Event
-    {
-    }
-}

src/Yavsc.Server/Interfaces/Events.cs

@@ -1,27 +0,0 @@
-//
-//  ICalendarManager.cs
-//
-//  Author:
-//       Paul Schneider <paul@pschneider.fr>
-//
-//  Copyright (c) 2015 GNU GPL
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU Lesser General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace Yavsc.Services
-{
-    public class Events
-    {
-    }
-}

src/Yavsc.Server/Interfaces/ICalendarManager.cs

@@ -20,11 +20,11 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using Google.Apis.Calendar.v3.Data;
 
 namespace Yavsc.Services
 {
     using System.Threading.Tasks;
-    using Yavsc.Models.Google.Calendar;
     using Yavsc.ViewModels.Calendar;
 
     /// <summary>

src/Yavsc.Server/Interfaces/IFreeDateSet.cs

@@ -19,6 +19,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
+using Yavsc.Server.Models.Calendar;
 
 namespace Yavsc.Models.Calendar
 {

src/Yavsc.Server/Interfaces/IScheduledEvent.cs

@@ -19,6 +19,8 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using Yavsc.Server.Models.Calendar;
+
 namespace Yavsc.Models.Calendar
 {
     public interface IScheduledEvent
@@ -31,4 +33,4 @@ namespace Yavsc.Models.Calendar
          Period Period { get; set; }
          
     }
-}
+}

src/Yavsc.Server/Models/ApplicationUser.cs

@@ -1,23 +1,19 @@
-
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-
+using Newtonsoft.Json;
+using Microsoft.AspNetCore.Identity;
+using Yavsc.Models.Relationship;
+using Yavsc.Models.Identity;
+using Yavsc.Models.Chat;
+using Yavsc.Models.Bank;
+using Yavsc.Models.Access;
 namespace Yavsc.Models
 {
-    using Models.Relationship;
-    using Models.Identity;
-    using Models.Chat;
-    using Models.Bank;
-    using Models.Access;
-    using Newtonsoft.Json;
-    using System;
-    using Microsoft.AspNetCore.Identity;
-
-    public class ApplicationUser : IdentityUser, IBaseTrackedEntity
+    [Table("AspNetUsers")]
+    public class ApplicationUser : IdentityUser
     {
-        /// <summary>
-        /// Another me, as a byte array.
+        /// <summary> 
+        /// Another me, as a byte array.TG7@Eu%80rufzkhbb
         /// This value points a picture that may be used
         /// to present the user
         /// </summary>
@@ -36,31 +32,31 @@ namespace Yavsc.Models
         /// WIP Paypal
         /// </summary>
         /// <returns></returns>
-        [Display(Name="Account balance")]
-        public virtual AccountBalance AccountBalance { get; set; }
+        [Display(Name = "Account balance")]
+        public virtual AccountBalance AccountBalance { get; set; }
 
         /// <summary>
         /// User's posts
         /// </summary>
         /// <returns></returns>
-        [InverseProperty("Author"),JsonIgnore]
-        public virtual List<Blog.BlogPost> Posts { get; set; }
+        [InverseProperty("Author"), JsonIgnore]
+        public virtual List<Blog.BlogPost> Posts { get; set; }
 
         /// <summary>
         /// User's contact list
         /// </summary>
         /// <returns></returns>
-        [InverseProperty("Owner"),JsonIgnore]
+        [InverseProperty("Owner"), JsonIgnore]
         public virtual List<Contact> Book { get; set; }
 
         /// <summary>
         /// External devices using the API
         /// </summary>
         /// <returns></returns>
-        [InverseProperty("DeviceOwner"),JsonIgnore]
+        [InverseProperty("DeviceOwner"), JsonIgnore]
         public virtual List<DeviceDeclaration> DeviceDeclaration { get; set; }
 
-        [InverseProperty("Owner"),JsonIgnore]
+        [InverseProperty("Owner"), JsonIgnore]
         public virtual List<ChatConnection> Connections { get; set; }
 
 
@@ -68,16 +64,16 @@ namespace Yavsc.Models
         /// User's circles
         /// </summary>
         /// <returns></returns>
-        [InverseProperty("Owner"),JsonIgnore]
+        [InverseProperty("Owner"), JsonIgnore]
 
-        public virtual List<Circle> Circles { get; set; }
+        public virtual List<Circle> Circles { get; set; }
 
         /// <summary>
         /// Billing postal address
         /// </summary>
         /// <returns></returns>
-        [ForeignKeyAttribute("PostalAddressId")]
-        public virtual Location PostalAddress { get; set; }
+        [ForeignKey("PostalAddressId")]
+        public virtual Location? PostalAddress { get; set; }
         public long? PostalAddressId { get; set; }
 
         /// <summary>
@@ -87,49 +83,35 @@ namespace Yavsc.Models
         [MaxLength(512)]
         public string DedicatedGoogleCalendar { get; set; }
 
-        public override string ToString() {
-            return this.Id+" "+this.AccountBalance?.Credits.ToString()+this.Email+" "+this.UserName+" $"+this.AccountBalance?.Credits.ToString();
+        public override string ToString()
+        {
+            return this.Id + " " + this.AccountBalance?.Credits.ToString() + this.Email + " " + this.UserName + " $" + this.AccountBalance?.Credits.ToString();
         }
 
-        public BankIdentity BankInfo { get; set; }
+        public virtual List<BankIdentity> BankInfo { get; set; }
 
-        public long DiskQuota { get; set; } = 512*1024*1024;
-        public long DiskUsage { get; set; } = 0;
+        public long DiskQuota { get; set; } = 512 * 1024 * 1024;
+        public long DiskUsage { get; set; } = 0;
 
-        public long MaxFileSize { get; set; } = 512*1024*1024;
+        public long MaxFileSize { get; set; } = 512 * 1024 * 1024;
 
-        [JsonIgnore][InverseProperty("Owner")]
+        [JsonIgnore]
+        [InverseProperty("Owner")]
         public virtual List<BlackListed> BlackList { get; set; }
 
         public bool AllowMonthlyEmail { get; set; } = false;
 
-        [JsonIgnore][InverseProperty("Owner")]
+        [JsonIgnore]
+        [InverseProperty("Owner")]
         public virtual List<ChatRoom> Rooms { get; set; }
 
-        [JsonIgnore][InverseProperty("User")]
+        [JsonIgnore]
+        [InverseProperty("User")]
         public virtual List<ChatRoomAccess> RoomAccess { get; set; }
 
-        [JsonIgnore][InverseProperty("Member")]
+        [JsonIgnore]
+        [InverseProperty("Member")]
         public virtual List<CircleMember> Membership { get; set; }
 
-        public DateTime DateCreated
-        {
-            get; set;
-        }
-
-        public string UserCreated
-        {
-            get; set;
-        }        
-        
-        public DateTime DateModified 
-        {
-            get; set;
-        }        
-        
-        public string UserModified
-        {
-            get; set;
-        }
     }
 }

src/Yavsc.Server/Models/Bank/BankIdentity.cs

@@ -58,7 +58,22 @@ namespace Yavsc.Models.Bank
         [DisplayName("Clé RIB")]
         public int BankedKey { get; set; }
 
+        public virtual ApplicationUser User { get; set; }
+
+        public string UserId {  get; set; }
+
+        public override bool Equals(object? obj)
+        {
+            if (obj==null) return false;
+            if (! typeof(BankIdentity).IsAssignableFrom(obj.GetType())) return false;
+            BankIdentity tobj = (BankIdentity)obj;
+            return tobj.IBAN == IBAN && 
+                tobj.BIC == BIC &&
+                tobj.AccountNumber == AccountNumber &&
+                tobj.BankedKey == BankedKey;
+        }
+
     }
 
 
-}
+}

src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs

@@ -13,7 +13,7 @@ namespace Yavsc.Models.Billing
     using Yavsc.Abstract.Workflow;
     using Yavsc.Services;
 
-    public abstract class NominativeServiceCommand : IBaseTrackedEntity, IDecidableQuery, IIdentified<long>
+    public abstract class NominativeServiceCommand : IDecidableQuery, IIdentified<long>
   {
         public string GetInvoiceId() { return GetType().Name +  "/" + Id;  }
 
@@ -78,9 +78,8 @@ namespace Yavsc.Models.Billing
         [ForeignKey("ActivityCode"),JsonIgnore,Display(Name="Domaine d'activité")]
         public virtual Activity Context  { get; set ; }
 
-        public bool Rejected { get; set; }
+        public bool Decided { get; set; }
 
-        public DateTime RejectedAt { get; set; }
 
         public abstract System.Collections.Generic.List<IBillItem> GetBillItems();
 
@@ -97,11 +96,12 @@ namespace Yavsc.Models.Billing
             return $"facture-{bcode}-{Id}{ack}";
         }
         
-        [Display(Name = "PaymentId")]
+        [ForeignKey("Regularisation")]
+     
         public string PaymentId { get; set; }
 
-        [ForeignKey("PaymentId"), Display(Name = "Acquittement de la facture")]
+        [Display(Name = "Acquittement de la facture")]
         public virtual PayPalPayment Regularisation { get; set; }
-
+        public bool Accepted { get; set; }
     }
 }

src/Yavsc.Server/Models/Blog/BlogPost.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using Yavsc.Abstract.Identity.Security;
 using Yavsc.Attributes.Validation;
@@ -34,11 +35,11 @@ namespace Yavsc.Models.Blog
         public string Title { get; set; }
 
         [Display(Name="Identifiant de l'auteur")]
+        [ForeignKey("Author")]
         public string AuthorId { get; set; }
 
         [Display(Name="Auteur")]
-        [ForeignKey("AuthorId"),JsonIgnore]
-        public ApplicationUser Author { set; get; }
+        public virtual ApplicationUser Author { set; get; }
 
         [Display(Name="Visible")]
         public bool Visible { get; set; }

src/Yavsc.Server/Models/Calendar/Availabliity.cs

@@ -0,0 +1,9 @@
+using Yavsc.Models.Calendar;
+
+namespace Yavsc.Server.Models.Calendar
+{
+    public class Availability : List<Period>
+    {
+        
+    }
+}

src/Yavsc.Server/Models/Calendar/Period.cs

@@ -22,7 +22,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.Models.Calendar
+namespace Yavsc.Server.Models.Calendar
 {
 	/// <summary>
 	/// Hollydays.

src/Yavsc.Server/Models/Calendar/Periodicity.cs

@@ -19,7 +19,7 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Yavsc.Models.Calendar
+namespace Yavsc.Server.Models.Calendar
 {
 	/// <summary>
 	/// Periodicity.

src/Yavsc.Server/Models/Calendar/PositionAndKeyphrase.cs

@@ -21,9 +21,10 @@
 
 
 
-namespace Yavsc.Models.Calendar
+using Yavsc.Models.Relationship;
+
+namespace Yavsc.Server.Models.Calendar
 {
-    using Models.Relationship;
 	/// <summary>
 	/// Position and keyphrase.
 	/// </summary>

src/Yavsc.Server/Models/Calendar/ScheduledEvent.cs

@@ -21,6 +21,7 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Server.Models.Calendar;
 
 namespace Yavsc.Models.Calendar
 {
@@ -42,4 +43,4 @@ namespace Yavsc.Models.Calendar
             set;
         }
     }
-}
+}

src/Yavsc.Server/Models/EMailing/MailingTemplate.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Attributes.Validation;
 using Yavsc.Models;
 using Yavsc.Models.Calendar;
+using Yavsc.Server.Models.Calendar;
 
 namespace Yavsc.Server.Models.EMailing
 {

src/Yavsc.Server/Models/Workflow/Activity.cs

@@ -27,10 +27,10 @@ namespace Yavsc.Models.Workflow
 
         [YaStringLength(512)]
         [Display(Name = "Code du parent")]
+        [ForeignKey("Parent")]
         public string ParentCode { get; set; }
 
-        [ForeignKey("ParentCode"), JsonIgnore]
-        [Display(Name = "Activité parent")]
+        [Display(Name = "Activité parent"), JsonIgnore]
         public virtual Activity Parent { get; set; }
 
         [InverseProperty("Parent"), JsonIgnore]

src/Yavsc.Server/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "SelfHost": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001"
+    }
+  }
+}

src/Yavsc.Server/Services/TranslationService.cs

@@ -1,7 +0,0 @@
-namespace Yavsc.Server.Services
-{
-    public class TranslationService
-    {
-        
-    }
-}

src/Yavsc.Server/Settings/SiteSettings.cs

@@ -7,21 +7,21 @@ namespace Yavsc
         public string Title { get; set; }
         public string Slogan { get; set; }
 
-        public string StyleSheet { get; set; }
-        public string FavIcon { get; set; }
-        public string Logo { get; set; }
+        public string StyleSheet { get; set; }
+        public string FavIcon { get; set; }
+        public string Logo { get; set; }
         /// <summary>
         /// Conceptually,
         /// This authorisation server only has this present site as unique audience.
         /// </summary>
         /// <returns></returns>
-        public string Audience { get; set; }
+        public string Audience { get; set; }
         /// <summary>
         /// it's a very small company, with one domaine name only,
         /// so let it be the same as in the Audience field.
         /// </summary>
         /// <returns></returns>
-        public string Authority { get; set; }
+        public string Authority { get; set; }
         /// <summary>
         /// Owner's email
         /// </summary>
@@ -34,16 +34,16 @@ namespace Yavsc
         public Contact Admin { get; set; }
 
         public string DataDir { get; set; }
-            public string Avatars { get; set; }
-            public long Quota { get; set; }
-            public string Blog { get; set; }
-            public string Bills { get; set; }
+        public string Avatars { get; set; } = "avatars";
+        public long Quota { get; set; }
+        public string Blog { get; set; } = "blogs";
+        public string Bills { get; set; } = "bills";
         public string GitRepository { get; set; } = "sources";
 
-        public string BusinessName { get; set; }
-        public string Street { get; set; }
-        public string PostalCode { get; set; }
-        public string CountryCode { get; set; }
+        public string BusinessName { get; set; }
+        public string Street { get; set; }
+        public string PostalCode { get; set; }
+        public string CountryCode { get; set; }
 
         public string HomeViewName { get; set; }
         /// <summary>
@@ -51,7 +51,7 @@ namespace Yavsc
         /// generated pdf files using pandoc
         ///  </summary>
         /// <returns>The temporary directory to use</returns>
-        public string TempDir { get; set; } = "Temp";
+        public string TempDir { get; set; } = "temp";
 
         /// <summary>
         /// Only one performer will capture payments

src/Yavsc.Server/Settings/ThirdPartyFiles.cs

@@ -1,7 +0,0 @@
-namespace  Yavsc
-{
-
-        public class ThirdPartyFiles {
-
-        }
-}

src/Yavsc.Server/Settings/UserPolicies.cs

@@ -10,8 +10,7 @@ namespace Yavsc.Server.Settings
             new Dictionary<string, Func<ApplicationUser, bool>>
             {
                 { "allow-monthly", u => u.AllowMonthlyEmail },
-                { "email-not-confirmed", u => !u.EmailConfirmed && u.DateCreated < DateTime.Now.AddDays(-7) },
-                { "user-to-remove", u => !u.EmailConfirmed && u.DateCreated < DateTime.Now.AddDays(-14) }
+                { "email-not-confirmed", u => !u.EmailConfirmed }
             };
     }
 }

src/Yavsc.Server/ViewModels/Account/ForgotPasswordViewModel.cs

@@ -8,6 +8,6 @@ namespace Yavsc.ViewModels.Account
     {
         [YaRequired]
         [YaStringLength(512)]
-        public string LoginOrEmail { get; set; }
+        public string? LoginOrEmail { get; set; }
     }
 }

src/Yavsc.Server/ViewModels/Account/LoginViewModel.cs

@@ -5,14 +5,16 @@ using Yavsc.Attributes.Validation;
 
 namespace Yavsc.ViewModels.Account
 {
-    public class SignInViewModel
+     // TODO external autentication providers
+
+    public class SignInModel
     {
-        /// <summary>
+           /// <summary>
         /// Local user's name.
         /// </summary>
         /// <returns></returns>
         [YaRequired]
-        public string UserName { get; set; }
+        public string EMail { get; set; }
 
         /// <summary>
         /// Local user's password .
@@ -45,11 +47,6 @@ namespace Yavsc.ViewModels.Account
         /// <returns></returns>
         public string ReturnUrl { get; set; }
 
-        /// <summary>
-        /// Lists external identity provider descriptions.
-        /// </summary>
-        /// <returns>an enumeration of the descriptions.</returns>
-        public IEnumerable<YaAuthenticationDescription> ExternalProviders { get; set; }
     }
 
     public class YaAuthenticationDescription {

src/Yavsc.Server/ViewModels/Account/ResetPasswordViewModel.cs

@@ -18,7 +18,5 @@ namespace Yavsc.ViewModels.Account
         [Display(Name = "Confirmer le mot de passe")]
         [Compare("Password", ErrorMessage = "Le mot de passe et sa confirmation ne sont pas les mêmes.")]
         public string ConfirmPassword { get; set; }
-
-        public string Code { get; set; }
     }
 }

src/Yavsc.Server/ViewModels/Calendar/DateTimeChooserViewModel.cs

@@ -1,6 +1,6 @@
 using System;
 using Yavsc.Models.Calendar;
-
+using Yavsc.Server.Models.Calendar;
 
 namespace Yavsc.ViewModels.Calendar
 {

src/Yavsc.Server/ViewModels/Calendar/SetGoogleCalendarViewModel.cs

@@ -1,5 +1,5 @@
 
-using Yavsc.Models.Google.Calendar;
+using Google.Apis.Calendar.v3.Data;
 
 namespace Yavsc.ViewModels.Calendar
 {

src/Yavsc.Server/Yavsc.Server.csproj

@@ -1,17 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
-
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.1" />
+    <PackageReference Include="Google.Apis.Calendar.v3" Version="1.60.0.2993" />
+    <PackageReference Include="PayPalMerchantSDK" Version="2.16.250" />
   </ItemGroup>
-
   <ItemGroup>
-  <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
-    <PackageReference Include="PayPalMerchantSDK" Version="2.16.250" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
   </ItemGroup>
-
 </Project>

src/Yavsc.Server/project.json

@@ -0,0 +1,129 @@
+{
+    "version": "1.0.5-*",
+    "description": "Yavsc server common library",
+    "authors": [
+        "Paul Schneider <paul@pschneider.fr>"
+    ],
+    "packOptions": {
+        "repository": {
+            "type": "git",
+            "url": "https://github.com/pazof/yavsc"
+        },
+        "licenseUrl": "https://github.com/pazof/yavsc/blob/vnext/LICENSE",
+        "requireLicenseAcceptance": true,
+        "owners": [
+            "Paul Schneider <paul@pschneider.fr>"
+        ],
+        "summary": "Yet another very small company",
+        "projectUrl": "http://yavsc.pschneider.fr",
+        "tags": [
+            "Blog",
+            "PoS",
+            "Chat"
+        ]
+    },
+    "userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f",
+    "buildOptions": {
+        "debugType": "full",
+        "emitEntryPoint": false,
+        "outputName": "Yavsc.Server",
+        "compile": {
+            "include": "*.cs",
+            "exclude": [
+                "wwwroot",
+                "node_modules",
+                "bower_components",
+                "contrib"
+            ]
+        },
+        "embed": [
+          "Resources/**/*.resx"
+        ],
+        "publicSign": false,
+        "keyFile": "../../../sgKey.snk",
+        "nowarn": ["IDE1006"]
+    },
+    "tooling": {
+        "defaultNamespace": "Yavsc"
+    },
+    "dependencies": {
+        "EntityFramework.Commands": "7.0.0-rc1-final",
+        "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
+        "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
+        "Microsoft.Extensions.Options": "0.0.1-alpha",
+        "Microsoft.Extensions.Localization": "1.0.0-rc1-final",
+        "Newtonsoft.Json": "7.0.1",
+        "Gapi.net45": "1.0.1",
+        "PayPalMerchant-net451": "2.7.109",
+        "MailKit": "1.12.0",
+        "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01",
+        "Yavsc.Abstract": {
+            "type": "build"
+        }
+    },
+    "frameworks": {
+        "dnx451": {
+            "frameworkAssemblies": {
+                "System.ComponentModel.DataAnnotations": "4.0.0",
+                "System.Linq": "4.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0"
+            }
+        },
+        "net451": {
+            "frameworkAssemblies": {
+                "System.ComponentModel.DataAnnotations": "4.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0",
+                "System": "4.0.0"
+            }
+        },
+        "net452": {
+            "frameworkAssemblies": {
+                "System.ComponentModel.DataAnnotations": "4.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0",
+                "System": "4.0.0"
+            }
+        },
+        "net46": {
+            "frameworkAssemblies": {
+                "System.ComponentModel.DataAnnotations": "4.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0",
+                "System": "4.0.0"
+            }
+        },
+        "net461": {
+            "frameworkAssemblies": {
+                "System.ComponentModel.DataAnnotations": "4.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Net.Http": "4.0.0",
+                "System.Xml": "4.0.0",
+                "System": "4.0.0"
+            }
+        }
+    },
+    "commands": {
+        "ef": "EntityFramework.Commands",
+        "gen": "Microsoft.Extensions.CodeGeneration"
+    },
+    "scripts": {
+      "postrestore": [
+          "grep -v '\\.\\.dll' project.lock.json > new.project.lock.json",
+          "mv new.project.lock.json project.lock.json"
+      ]
+    }
+}

src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
 
@@ -36,14 +37,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogPost blog = _context.Blogspot.Single(m => m.Id == id);
 
             if (blog == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(blog);
@@ -55,25 +56,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != blog.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(blog).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!BlogExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -81,7 +82,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/BlogApi
@@ -90,19 +91,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Blogspot.Add(blog);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (BlogExists(blog.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -119,17 +120,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogPost blog = _context.Blogspot.Single(m => m.Id == id);
             if (blog == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Blogspot.Remove(blog);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(blog);
         }

src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs

@@ -32,14 +32,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogTag blogTag = await _context.TagsDomain.SingleAsync(m => m.PostId == id);
 
             if (blogTag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(blogTag);
@@ -51,12 +51,12 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != blogTag.PostId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(blogTag).State = EntityState.Modified;
@@ -69,7 +69,7 @@ namespace Yavsc.Controllers
             {
                 if (!BlogTagExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -77,7 +77,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/BlogTagsApi
@@ -86,7 +86,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.TagsDomain.Add(blogTag);
@@ -98,7 +98,7 @@ namespace Yavsc.Controllers
             {
                 if (BlogTagExists(blogTag.PostId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -115,13 +115,13 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogTag blogTag = await _context.TagsDomain.SingleAsync(m => m.PostId == id);
             if (blogTag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.TagsDomain.Remove(blogTag);

src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
 
@@ -34,14 +31,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Comment comment = await _context.Comment.SingleAsync(m => m.Id == id);
 
             if (comment == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(comment);
@@ -53,25 +50,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != comment.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(comment).State = EntityState.Modified;
 
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!CommentExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -79,7 +76,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/CommentsApi
@@ -92,7 +89,7 @@ namespace Yavsc.Controllers
             }
             if (!User.IsInRole(Constants.AdminGroupName))
             {
-                if (_userManager.GetUserId(User)!=comment.AuthorId) {
+                if (User.GetUserId()!=comment.AuthorId) {
                     ModelState.AddModelError("Content","Vous ne pouvez pas poster au nom d'un autre.");
                     return new BadRequestObjectResult(ModelState);
                 }
@@ -100,13 +97,13 @@ namespace Yavsc.Controllers
             _context.Comment.Add(comment);
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (CommentExists(comment.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -122,17 +119,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Comment comment = await _context.Comment.SingleAsync(m => m.Id == id);
             if (comment == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             RemoveRecursive(comment);
-            await _context.SaveChangesAsync(_userManager.GetUserId(User));
+            await _context.SaveChangesAsync(User.GetUserId());
 
             return Ok(comment);
         }

src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -63,11 +61,11 @@ namespace Yavsc.ApiControllers
             }
             if (pathex!=null) {
                 _logger.LogError($"invalid sub path: '{subdir}'.");
-                return HttpBadRequest(pathex);
+                return BadRequest(pathex);
             }
             _logger.LogInformation($"Receiving files, saved in '{destDir}' (specified as '{subdir}').");
             
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
@@ -77,7 +75,7 @@ namespace Yavsc.ApiControllers
             foreach (var f in Request.Form.Files)
             {
                 var item = user.ReceiveUserFile(destDir, f);
-                dbContext.SaveChanges(_userManager.GetUserId(User));
+                dbContext.SaveChanges(User.GetUserId());
                 received.Add(item);
                 _logger.LogInformation($"Received  '{item.FileName}'.");
                 if (item.QuotaOffensed)
@@ -91,7 +89,7 @@ namespace Yavsc.ApiControllers
         [Authorize("AdministratorOnly")]
         public IActionResult AddQuota(string uname, int len)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.FirstOrDefault(
                 u => u.UserName == uname
             );
@@ -107,7 +105,7 @@ namespace Yavsc.ApiControllers
         public IActionResult MoveFile([FromBody] RenameFileQuery query)
         {
             if (!ModelState.IsValid) return new BadRequestObjectResult(ModelState);
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
@@ -124,15 +122,15 @@ namespace Yavsc.ApiControllers
             if (!ModelState.IsValid) {
                 var idvr = new ValidRemoteUserFilePathAttribute();
 
-                return this.HttpBadRequest(new { id = idvr.IsValid(query.id), to = idvr.IsValid(query.to), errors = ModelState });
+                return this.BadRequest(new { id = idvr.IsValid(query.id), to = idvr.IsValid(query.to), errors = ModelState });
             }
             _logger.LogInformation($"Valid move query: {query.id} => {query.to}");
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
             try {
-                if (Startup.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.id)).Exists)
+                if (Config.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.id)).Exists)
                 {
                     var result = user.MoveUserFile(query.id, query.to);
                     if (!result.Done) return new BadRequestObjectResult(result);
@@ -160,7 +158,7 @@ namespace Yavsc.ApiControllers
             if (!ModelState.IsValid) return new BadRequestObjectResult(ModelState);
 
             var user = dbContext.Users.Single(
-                u => u.Id == _userManager.GetUserId(User)
+                u => u.Id == User.GetUserId()
             );
 
             try {

src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs

@@ -1,16 +1,13 @@
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Yavsc.Attributes.Validation;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Messaging;
 using Yavsc.Services;
+using Microsoft.AspNetCore.SignalR;
 
 namespace Yavsc.ApiControllers
 {
@@ -19,13 +16,16 @@ namespace Yavsc.ApiControllers
     {
         private readonly ILogger logger;
         private readonly ILiveProcessor liveProcessor;
+        private readonly IHubContext<ChatHub> hubContext;
         readonly ApplicationDbContext dbContext;
 
-        public FileSystemStreamController(ApplicationDbContext context, ILiveProcessor liveProcessor, ILoggerFactory loggerFactory)
+        public FileSystemStreamController(ApplicationDbContext context, ILiveProcessor liveProcessor, ILoggerFactory loggerFactory,
+        IHubContext<ChatHub> hubContext)
         {
             this.dbContext = context;
             this.logger = loggerFactory.CreateLogger<FileSystemStreamController>();
             this.liveProcessor = liveProcessor;
+            this.hubContext = hubContext;
         }
 
         [Authorize, Route("put/{filename}")]
@@ -33,28 +33,28 @@ namespace Yavsc.ApiControllers
         {
             logger.LogInformation("Put : " + filename);
             if (!HttpContext.WebSockets.IsWebSocketRequest)
-                return HttpBadRequest("not a web socket");
+                return BadRequest("not a web socket");
             if (!HttpContext.User.Identity.IsAuthenticated)
-                return new HttpUnauthorizedResult();
+                return new UnauthorizedResult();
             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");
+                return BadRequest("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(),
+                Config.UserFilesOptions.RequestPath.ToUriComponent(),
                 userName,
                 filename
             );
 
-            hubContext.Clients.All.addPublicStream(new PublicStreamInfo
+            hubContext.Clients.All.SendAsync("addPublicStream", new PublicStreamInfo
             {
                 sender = userName,
                 url = url,
@@ -62,7 +62,7 @@ namespace Yavsc.ApiControllers
             
             string destDir = HttpContext.User.InitPostToFileSystem(filePath);
             logger.LogInformation($"Saving flow to {destDir}");
-            var userId = _userManager.GetUserId(User);
+            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);

src/Yavsc/ApiControllers/Blogspot/PostTagsApiController.cs

@@ -2,12 +2,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.Controllers
 {
     using System.Security.Claims;
-    using Models;    
+    using Microsoft.EntityFrameworkCore;
+    using Models;
+    using Yavsc.Helpers;
     using Yavsc.Models.Blog;
 
     [Produces("application/json")]
@@ -34,14 +35,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogTag postTag = _context.TagsDomain.Single(m => m.PostId == id);
 
             if (postTag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(postTag);
@@ -53,25 +54,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != postTag.PostId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(postTag).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!PostTagExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -79,7 +80,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/PostTagsApi
@@ -88,19 +89,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.TagsDomain.Add(postTag);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (PostTagExists(postTag.PostId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -117,17 +118,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlogTag postTag = _context.TagsDomain.Single(m => m.PostId == id);
             if (postTag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.TagsDomain.Remove(postTag);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(postTag);
         }

src/Yavsc/ApiControllers/Blogspot/TagsApiController.cs

@@ -1,15 +1,14 @@
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Http;
+
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 
 namespace Yavsc.Controllers
 {
     using System.Security.Claims;
+    using Microsoft.EntityFrameworkCore;
     using Models.Relationship;
+    using Yavsc.Helpers;
+
     [Produces("application/json")]
     [Route("api/TagsApi")]
     public class TagsApiController : Controller
@@ -37,14 +36,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Tag tag = _context.Tags.Single(m => m.Id == id);
 
             if (tag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(tag);
@@ -56,26 +55,26 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != tag.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(tag).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
                 _logger.LogInformation("Tag created");
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!TagExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -83,7 +82,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/TagsApi
@@ -92,19 +91,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Tags.Add(tag);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (TagExists(tag.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -121,17 +120,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Tag tag = _context.Tags.Single(m => m.Id == id);
             if (tag == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Tags.Remove(tag);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(tag);
         }

src/Yavsc/ApiControllers/Business/ActivityApiController.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Workflow;
 
@@ -37,14 +38,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Activity activity = await _context.Activities.SingleAsync(m => m.Code == id);
 
             if (activity == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
             // Also return hidden ones
             // hidden doesn't mean disabled
@@ -57,25 +58,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != activity.Code)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(activity).State = EntityState.Modified;
 
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!ActivityExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -83,7 +84,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ActivityApi
@@ -92,19 +93,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Activities.Add(activity);
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (ActivityExists(activity.Code))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -121,17 +122,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Activity activity = await _context.Activities.SingleAsync(m => m.Code == id);
             if (activity == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Activities.Remove(activity);
-            await _context.SaveChangesAsync(_userManager.GetUserId(User));
+            await _context.SaveChangesAsync(User.GetUserId());
 
             return Ok(activity);
         }

src/Yavsc/ApiControllers/Business/BillingController.cs

@@ -1,15 +1,7 @@
-using System.IO;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Web.Routing;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System;
 using System.Security.Claims;
 using Yavsc.Helpers;
 using Yavsc.ViewModels;
@@ -21,6 +13,8 @@ namespace Yavsc.ApiControllers
 
     using Models.Messaging;
     using ViewModels.Auth;
+    using Microsoft.Extensions.Options;
+    using Microsoft.EntityFrameworkCore;
 
     [Route("api/bill"), Authorize]
     public class BillingController : Controller
@@ -38,7 +32,7 @@ namespace Yavsc.ApiControllers
         public BillingController(
             IAuthorizationService authorizationService,
             ILoggerFactory loggerFactory,
-            IStringLocalizer<Yavsc.YavscLocalisation> SR,
+            IStringLocalizer<Yavsc.YavscLocalization> SR,
             ApplicationDbContext context,
             IOptions<GoogleAuthSettings> googleSettings,
             IYavscMessageSender GCMSender,
@@ -59,7 +53,7 @@ namespace Yavsc.ApiControllers
         {     
             var bill = await billingService.GetBillAsync(billingCode, id);
 
-            if (!await authorizationService.AuthorizeAsync(User, bill, new ViewRequirement()))
+            if ( authorizationService.AuthorizeAsync(User, bill, new ViewRequirement()).IsFaulted)
             {
                 return new ChallengeResult();
             }
@@ -77,11 +71,11 @@ namespace Yavsc.ApiControllers
 
             if (bill==null) {
                logger.LogCritical ( $"# not found !! {id} in {billingCode}");
-               return this.StatusCode(404);
+               return this.NotFound();
             }
-            logger.LogVerbose(JsonConvert.SerializeObject(bill));
+            logger.LogTrace(JsonConvert.SerializeObject(bill));
 
-            if (!await authorizationService.AuthorizeAsync(User, bill, new ViewRequirement()))
+            if (!(await authorizationService.AuthorizeAsync(User, bill, new ViewRequirement())).Succeeded)
             {
                 return new ChallengeResult();
             }
@@ -96,7 +90,7 @@ namespace Yavsc.ApiControllers
            
             if (bill==null) {
                logger.LogCritical ( $"# not found !! {id} in {billingCode}");
-               return this.StatusCode(404);
+               return this.NotFound();
             }
              logger.LogWarning("Got bill ack:"+bill.GetIsAcquitted().ToString());
             return ViewComponent("Bill",new object[] { billingCode, bill, OutputFormat.Pdf, true } );
@@ -112,7 +106,9 @@ namespace Yavsc.ApiControllers
             .FirstOrDefault(e=>e.Id == id);
             if (estimate == null)
                 return new BadRequestResult();
-            if (!await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement()))
+            if (!(await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement())).Succeeded)
+
+          
             {
                 return new ChallengeResult();
             }
@@ -120,7 +116,7 @@ namespace Yavsc.ApiControllers
                 return new BadRequestResult();
             User.ReceiveProSignature(billingCode,id,Request.Form.Files[0],"pro");
             estimate.ProviderValidationDate = DateTime.Now;
-            dbContext.SaveChanges(_userManager.GetUserId(User));
+            dbContext.SaveChanges(User.GetUserId());
             // Notify the client
             var locstr = _localizer["EstimationMessageToClient"];
 
@@ -138,25 +134,26 @@ namespace Yavsc.ApiControllers
         {
             // For authorization purpose
             var estimate = dbContext.Estimates.FirstOrDefault(e=>e.Id == id);
-            if (!await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement()))
+            if (!(await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement())).Succeeded)
+            
             {
                 return new ChallengeResult();
             }
 
             var filename = AbstractFileSystemHelpers.SignFileNameFormat("pro", billingCode, id);
             FileInfo fi = new FileInfo(Path.Combine(AbstractFileSystemHelpers.UserBillsDirName, filename));
-            if (!fi.Exists) return HttpNotFound(new { Error = "Professional signature not found" });
+            if (!fi.Exists) return NotFound(new { Error = "Professional signature not found" });
             return File(fi.OpenRead(), "application/x-pdf", filename); ;
         }
 
         [HttpPost("clisign/{billingCode}/{id}")]
         public async Task<IActionResult> CliSign(string billingCode, long id)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var estimate = dbContext.Estimates.Include( e=>e.Query
             ).Include(e=>e.Owner).Include(e=>e.Owner.Performer).Include(e=>e.Client)
             .FirstOrDefault( e=> e.Id == id && e.Query.ClientId == uid );
-            if (!await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement()))
+            if (!(await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement())).Succeeded)
             {
                 return new ChallengeResult();
             }
@@ -164,7 +161,7 @@ namespace Yavsc.ApiControllers
                 return new BadRequestResult();
             User.ReceiveProSignature(billingCode,id,Request.Form.Files[0],"cli");
             estimate.ClientValidationDate = DateTime.Now;
-            dbContext.SaveChanges(_userManager.GetUserId(User));
+            dbContext.SaveChanges(User.GetUserId());
             return Ok (new { ClientValidationDate = estimate.ClientValidationDate });
         }
 
@@ -173,14 +170,14 @@ namespace Yavsc.ApiControllers
         {
             // For authorization purpose
             var estimate = dbContext.Estimates.FirstOrDefault(e=>e.Id == id);
-            if (!await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement()))
+            if (!(await authorizationService.AuthorizeAsync(User, estimate, new ViewRequirement())).Succeeded)
             {
                 return new ChallengeResult();
             }
             
             var filename = AbstractFileSystemHelpers.SignFileNameFormat("pro", billingCode, id);
             FileInfo fi = new FileInfo(Path.Combine(AbstractFileSystemHelpers.UserBillsDirName, filename));
-            if (!fi.Exists) return HttpNotFound(new { Error = "Professional signature not found" });
+            if (!fi.Exists) return NotFound(new { Error = "Professional signature not found" });
             return File(fi.OpenRead(), "application/x-pdf", filename); ;
         }
     }

src/Yavsc/ApiControllers/Business/BookQueryApiController.cs

@@ -4,7 +4,6 @@ using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 namespace Yavsc.Controllers
@@ -14,6 +13,8 @@ namespace Yavsc.Controllers
     using Yavsc.Models.Workflow;
     using Yavsc.Models.Billing;
     using Yavsc.Abstract.Identity;
+    using Microsoft.EntityFrameworkCore;
+    using Yavsc.Helpers;
 
     [Produces("application/json")]
     [Route("api/bookquery"), Authorize(Roles = "Performer,Administrator")]
@@ -37,7 +38,7 @@ namespace Yavsc.Controllers
         [HttpGet]
         public IEnumerable<RdvQueryProviderInfo> GetCommands(long maxId=long.MaxValue)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var now = DateTime.Now;
             
             var result = _context.RdvQueries.Include(c => c.Location).
@@ -69,15 +70,15 @@ namespace Yavsc.Controllers
 
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
             RdvQuery bookQuery = _context.RdvQueries.Where(c => c.ClientId == uid || c.PerformerId == uid).Single(m => m.Id == id);
 
             if (bookQuery == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(bookQuery);
@@ -89,28 +90,28 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != bookQuery.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (bookQuery.ClientId != uid)
-                return StatusCode(404);
+                return NotFound();
 
             _context.Entry(bookQuery).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!BookQueryExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -118,7 +119,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/BookQueryApi
@@ -127,9 +128,9 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (bookQuery.ClientId != uid)
             {
                 ModelState.AddModelError("ClientId", "You must be the client at creating a book query");
@@ -138,13 +139,13 @@ namespace Yavsc.Controllers
             _context.RdvQueries.Add(bookQuery);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (BookQueryExists(bookQuery.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -161,19 +162,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             RdvQuery bookQuery = _context.RdvQueries.Single(m => m.Id == id);
 
             if (bookQuery == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
-            if (bookQuery.ClientId != uid) return StatusCode(404);
+            if (bookQuery.ClientId != uid) return NotFound();
 
             _context.RdvQueries.Remove(bookQuery);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(bookQuery);
         }

src/Yavsc/ApiControllers/Business/EstimateApiController.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Billing;
 
@@ -26,22 +27,22 @@ namespace Yavsc.Controllers
         bool UserIsAdminOrThis(string uid)
         {
             if (User.IsInRole(Constants.AdminGroupName)) return true;
-            return uid == _userManager.GetUserId(User);
+            return uid == User.GetUserId();
         }
         bool UserIsAdminOrInThese(string oid, string uid)
         {
             if (User.IsInRole(Constants.AdminGroupName)) return true;
-            var cuid = _userManager.GetUserId(User);
+            var cuid = User.GetUserId();
             return cuid == uid || cuid == oid;
         }
-        // GET: api/Estimate{?ownerId=_userManager.GetUserId(User)}
+        // GET: api/Estimate{?ownerId=User.GetUserId()}
         [HttpGet]
         public IActionResult GetEstimates(string ownerId = null)
         {
-            if (ownerId == null) ownerId = _userManager.GetUserId(User);
+            if (ownerId == null) ownerId = User.GetUserId();
             else if (!UserIsAdminOrThis(ownerId)) // throw new Exception("Not authorized") ;
                                                   // or just do nothing
-                return new HttpStatusCodeResult(StatusCodes.Status403Forbidden);
+                return new StatusCodeResult(StatusCodes.Status403Forbidden);
             return Ok(_context.Estimates.Include(e => e.Bill).Where(e => e.OwnerId == ownerId));
         }
         // GET: api/Estimate/5
@@ -50,19 +51,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Estimate estimate = _context.Estimates.Include(e => e.Bill).Single(m => m.Id == id);
 
             if (estimate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             if (UserIsAdminOrInThese(estimate.ClientId, estimate.OwnerId))
                 return Ok(estimate);
-            return new HttpStatusCodeResult(StatusCodes.Status403Forbidden);
+            return new StatusCodeResult(StatusCodes.Status403Forbidden);
         }
 
         // PUT: api/Estimate/5
@@ -77,28 +78,28 @@ namespace Yavsc.Controllers
 
             if (id != estimate.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (!User.IsInRole(Constants.AdminGroupName))
             {
                 if (uid != estimate.OwnerId)
                 {
                     ModelState.AddModelError("OwnerId", "You can only modify your own estimates");
-                    return HttpBadRequest(ModelState);
+                    return BadRequest(ModelState);
                 }
             }
 
             var entry = _context.Attach(estimate);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!EstimateExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -113,7 +114,7 @@ namespace Yavsc.Controllers
         [HttpPost, Produces("application/json")]
         public IActionResult PostEstimate([FromBody] Estimate estimate)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (estimate.OwnerId == null) estimate.OwnerId = uid;
 
             if (!User.IsInRole(Constants.AdminGroupName))
@@ -121,7 +122,7 @@ namespace Yavsc.Controllers
                 if (uid != estimate.OwnerId)
                 {
                     ModelState.AddModelError("OwnerId", "You can only create your own estimates");
-                    return HttpBadRequest(ModelState);
+                    return BadRequest(ModelState);
                 }
             }
 
@@ -130,10 +131,10 @@ namespace Yavsc.Controllers
                 var query = _context.RdvQueries.FirstOrDefault(q => q.Id == estimate.CommandId);
                 if (query == null)
                 {
-                    return HttpBadRequest(ModelState);
+                    return BadRequest(ModelState);
                 }
                 query.ValidationDate = DateTime.Now;
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
                 _context.Entry(query).State = EntityState.Detached;
             }
             if (!ModelState.IsValid)
@@ -153,13 +154,13 @@ namespace Yavsc.Controllers
             */
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (EstimateExists(estimate.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -175,26 +176,26 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Estimate estimate = _context.Estimates.Include(e => e.Bill).Single(m => m.Id == id);
 
             if (estimate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (!User.IsInRole(Constants.AdminGroupName))
             {
                 if (uid != estimate.OwnerId)
                 {
                     ModelState.AddModelError("OwnerId", "You can only create your own estimates");
-                    return HttpBadRequest(ModelState);
+                    return BadRequest(ModelState);
                 }
             }
             _context.Estimates.Remove(estimate);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(estimate);
         }

src/Yavsc/ApiControllers/Business/EstimateTemplatesApiController.cs

@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Billing;
 
@@ -24,7 +22,7 @@ namespace Yavsc.Controllers
         [HttpGet]
         public IEnumerable<EstimateTemplate> GetEstimateTemplate()
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             return _context.EstimateTemplates.Where(x=>x.OwnerId==uid);
         }
 
@@ -34,15 +32,15 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
             EstimateTemplate estimateTemplate = _context.EstimateTemplates.Where(x=>x.OwnerId==uid).Single(m => m.Id == id);
 
             if (estimateTemplate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(estimateTemplate);
@@ -54,29 +52,29 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != estimateTemplate.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (estimateTemplate.OwnerId!=uid)
             if (!User.IsInRole(Constants.AdminGroupName))
-            return new HttpStatusCodeResult(StatusCodes.Status403Forbidden);
+            return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             _context.Entry(estimateTemplate).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!EstimateTemplateExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -84,7 +82,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/EstimateTemplatesApi
@@ -93,20 +91,20 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            estimateTemplate.OwnerId=_userManager.GetUserId(User);
+            estimateTemplate.OwnerId=User.GetUserId();
 
             _context.EstimateTemplates.Add(estimateTemplate);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (EstimateTemplateExists(estimateTemplate.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -123,21 +121,21 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             EstimateTemplate estimateTemplate = _context.EstimateTemplates.Single(m => m.Id == id);
             if (estimateTemplate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (estimateTemplate.OwnerId!=uid)
             if (!User.IsInRole(Constants.AdminGroupName))
-            return new HttpStatusCodeResult(StatusCodes.Status403Forbidden);
+            return new StatusCodeResult(StatusCodes.Status403Forbidden);
 
             _context.EstimateTemplates.Remove(estimateTemplate);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(estimateTemplate);
         }

src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs

@@ -30,14 +30,27 @@ namespace Yavsc.ApiControllers
         [HttpPost("query/reject")]
         public IActionResult RejectQuery(string billingCode, long queryId)
         {
-            if (billingCode == null) return HttpBadRequest("billingCode");
-            if (queryId == 0) return HttpBadRequest("queryId");
+            if (billingCode == null) return BadRequest("billingCode");
+            if (queryId == 0) return BadRequest("queryId");
             var billing = BillingService.GetBillable(dbContext, billingCode, queryId);
-            if (billing == null) return HttpBadRequest();
-            billing.Rejected = true;
-            billing.RejectedAt = DateTime.Now;
+            if (billing == null) return BadRequest();
+            billing.Decided = true;
+            billing.Accepted = false;
             dbContext.SaveChanges();
             return Ok();
         }
+         [HttpPost("query/reject")]
+        public IActionResult AcceptQuery(string billingCode, long queryId)
+        {
+            if (billingCode == null) return BadRequest("billingCode");
+            if (queryId == 0) return BadRequest("queryId");
+            var billing = BillingService.GetBillable(dbContext, billingCode, queryId);
+            if (billing == null) return BadRequest();
+            billing.Accepted = true;
+            billing.Decided = true;
+            dbContext.SaveChanges();
+            return Ok();
+
+        }
     }
 }

src/Yavsc/ApiControllers/Business/PaymentApiController.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Yavsc.Helpers;

src/Yavsc/ApiControllers/Business/PerformersApiController.cs

@@ -1,12 +1,11 @@
 
 using Microsoft.AspNetCore.Mvc;
-using System.Linq;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.Controllers
 {
+    using Microsoft.EntityFrameworkCore;
     using Models;
     using Yavsc.Helpers;
     using Yavsc.Services;
@@ -44,7 +43,7 @@ namespace Yavsc.Controllers
                 ModelState.AddModelError("id","Specifier un identifiant de prestataire valide");
             }
             else {
-                var uid = _userManager.GetUserId(User);
+                var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
                 if (!User.IsInRole("Administrator"))
                 if (uid != id) return new ChallengeResult();
 

src/Yavsc/ApiControllers/Business/ProductApiController.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Market;
 
@@ -34,14 +31,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Product product = _context.Products.Single(m => m.Id == id);
 
             if (product == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(product);
@@ -53,25 +50,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != product.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(product).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!ProductExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -79,7 +76,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ProductApi
@@ -88,19 +85,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Products.Add(product);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (ProductExists(product.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -117,17 +114,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Product product = _context.Products.Single(m => m.Id == id);
             if (product == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Products.Remove(product);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(product);
         }

src/Yavsc/ApiControllers/DimissClicksApiController.cs

@@ -1,11 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Messaging;
 
@@ -26,7 +23,7 @@ namespace Yavsc.Controllers
         [HttpGet]
         public IEnumerable<DimissClicked> GetDimissClicked()
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             return _context.DimissClicked.Where(d=>d.UserId == uid);
         }
 
@@ -34,7 +31,7 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> Click(long noteid )
         {
             if (User.IsSignedIn())
-            return await PostDimissClicked(new DimissClicked { NotificationId= noteid, UserId = _userManager.GetUserId(User)});
+            return await PostDimissClicked(new DimissClicked { NotificationId= noteid, UserId = User.GetUserId()});
             await HttpContext.Session.LoadAsync();
             var clicked = HttpContext.Session.GetString("clicked");
             if (clicked == null) {
@@ -47,19 +44,19 @@ namespace Yavsc.Controllers
         [HttpGet("{id}", Name = "GetDimissClicked")]
         public async Task<IActionResult> GetDimissClicked([FromRoute] string id)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != id) return new ChallengeResult();
 
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             DimissClicked dimissClicked = await _context.DimissClicked.SingleAsync(m => m.UserId == id);
 
             if (dimissClicked == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(dimissClicked);
@@ -69,30 +66,30 @@ namespace Yavsc.Controllers
         [HttpPut("{id}")]
         public async Task<IActionResult> PutDimissClicked([FromRoute] string id, [FromBody] DimissClicked dimissClicked)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != id || uid != dimissClicked.UserId) return new ChallengeResult();
 
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != dimissClicked.UserId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(dimissClicked).State = EntityState.Modified;
 
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!DimissClickedExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -100,31 +97,31 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/DimissClicksApi
         [HttpPost]
         public async Task<IActionResult> PostDimissClicked([FromBody] DimissClicked dimissClicked)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != dimissClicked.UserId) return new ChallengeResult();
 
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.DimissClicked.Add(dimissClicked);
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (DimissClickedExists(dimissClicked.UserId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -139,23 +136,23 @@ namespace Yavsc.Controllers
         [HttpDelete("{id}")]
         public async Task<IActionResult> DeleteDimissClicked([FromRoute] string id)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (!User.IsInRole("Administrator"))
             if (uid != id) return new ChallengeResult();
             
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             DimissClicked dimissClicked = await _context.DimissClicked.SingleAsync(m => m.UserId == id);
             if (dimissClicked == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.DimissClicked.Remove(dimissClicked);
-            await _context.SaveChangesAsync(_userManager.GetUserId(User));
+            await _context.SaveChangesAsync(User.GetUserId());
 
             return Ok(dimissClicked);
         }

src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Haircut;
 
@@ -34,14 +30,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BrusherProfile brusherProfile = await _context.BrusherProfile.SingleAsync(m => m.UserId == id);
 
             if (brusherProfile == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(brusherProfile);
@@ -53,17 +49,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != brusherProfile.UserId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
             
-            if (id != _userManager.GetUserId(User))
+            if (id != User.GetUserId())
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
             _context.Entry(brusherProfile).State = EntityState.Modified;
 
@@ -75,7 +71,7 @@ namespace Yavsc.Controllers
             {
                 if (!BrusherProfileExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -83,7 +79,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/BursherProfilesApi
@@ -92,7 +88,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.BrusherProfile.Add(brusherProfile);
@@ -104,7 +100,7 @@ namespace Yavsc.Controllers
             {
                 if (BrusherProfileExists(brusherProfile.UserId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -121,13 +117,13 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BrusherProfile brusherProfile = await _context.BrusherProfile.SingleAsync(m => m.UserId == id);
             if (brusherProfile == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.BrusherProfile.Remove(brusherProfile);

src/Yavsc/ApiControllers/HairCut/HairCutController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Localization;
 
 
@@ -16,14 +15,15 @@ namespace Yavsc.ApiControllers
     using Models.Haircut;
     using System.Threading.Tasks;
     using Helpers;
-    using Microsoft.EntityFrameworkCore;
     using Models.Payment;
     using Newtonsoft.Json;
     using PayPal.PayPalAPIInterfaceService.Model;
     using Yavsc.Models.Haircut.Views;
     using Microsoft.AspNetCore.Http;
+    using Microsoft.EntityFrameworkCore;
+    using Microsoft.AspNetCore.Authorization;
 
-    [Route("api/haircut")]
+    [Route("api/haircut")][Authorize]
     public class HairCutController : Controller
     {
         private readonly ApplicationDbContext _context;
@@ -40,7 +40,9 @@ namespace Yavsc.ApiControllers
         // user, as a client
         public IActionResult Index()
         {
-            var uid = _userManager.GetUserId(User);
+            
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
+
             var now = DateTime.Now;
             var result = _context.HairCutQueries
                          .Include(q => q.Prestation)
@@ -61,14 +63,14 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             HairCutQuery hairCutQuery = await _context.HairCutQueries.SingleAsync(m => m.Id == id);
 
             if (hairCutQuery == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(hairCutQuery);
@@ -80,12 +82,12 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != hairCutQuery.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(hairCutQuery).State = EntityState.Modified;
@@ -98,7 +100,7 @@ namespace Yavsc.ApiControllers
             {
                 if (!HairCutQueryExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -106,20 +108,20 @@ namespace Yavsc.ApiControllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         [HttpPost]
         public async Task<IActionResult> PostQuery(HairCutQuery hairCutQuery)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (!ModelState.IsValid)
             {
                 return new BadRequestObjectResult(ModelState);
             }
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.HairCutQueries.Add(hairCutQuery);
@@ -131,7 +133,7 @@ namespace Yavsc.ApiControllers
             {
                 if (HairCutQueryExists(hairCutQuery.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -159,13 +161,13 @@ namespace Yavsc.ApiControllers
             }
             catch (Exception ex) {
                 _logger.LogError(ex.Message);
-                return new HttpStatusCodeResult(500);
+                return new StatusCodeResult(500);
             }
 
             if (payment==null) {
                 _logger.LogError("Error doing SetExpressCheckout, aborting.");
-                _logger.LogError(JsonConvert.SerializeObject(Startup.PayPalSettings));
-                return new HttpStatusCodeResult(500);
+                _logger.LogError(JsonConvert.SerializeObject(Config.PayPalSettings));
+                return new StatusCodeResult(500);
             }
             switch (payment.Ack)
             {
@@ -174,11 +176,11 @@ namespace Yavsc.ApiControllers
                     {
                         var dbinfo = new PayPalPayment
                         {
-                            ExecutorId = _userManager.GetUserId(User),
+                            ExecutorId = User.GetUserId(),
                             CreationToken = payment.Token,
                             State = payment.Ack.ToString()
                         };
-                        await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                        await _context.SaveChangesAsync(User.GetUserId());
                     }
                     break;
 
@@ -195,13 +197,13 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return  BadRequest(ModelState);
             }
 
             HairCutQuery hairCutQuery = await _context.HairCutQueries.SingleAsync(m => m.Id == id);
             if (hairCutQuery == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.HairCutQueries.Remove(hairCutQuery);

src/Yavsc/ApiControllers/HyperLinkApiController.cs

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
@@ -33,14 +29,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
 
             if (hyperLink == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(hyperLink);
@@ -52,12 +48,12 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != hyperLink.HRef)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(hyperLink).State = EntityState.Modified;
@@ -70,7 +66,7 @@ namespace Yavsc.Controllers
             {
                 if (!HyperLinkExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -78,7 +74,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/HyperLinkApi
@@ -87,7 +83,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.HyperLink.Add(hyperLink);
@@ -99,7 +95,7 @@ namespace Yavsc.Controllers
             {
                 if (HyperLinkExists(hyperLink.HRef))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -116,13 +112,13 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
             if (hyperLink == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.HyperLink.Remove(hyperLink);

src/Yavsc/ApiControllers/IT/GitRefsApiController.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
@@ -35,14 +31,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             GitRepositoryReference gitRepositoryReference = await _context.GitRepositoryReference.SingleAsync(m => m.Id == id);
 
             if (gitRepositoryReference == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(gitRepositoryReference);
@@ -54,7 +50,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Entry(gitRepositoryReference).State = EntityState.Modified;
@@ -67,7 +63,7 @@ namespace Yavsc.Controllers
             {
                 if (!GitRepositoryReferenceExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -75,7 +71,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/GitRefsApi
@@ -84,7 +80,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.GitRepositoryReference.Add(gitRepositoryReference);
@@ -96,7 +92,7 @@ namespace Yavsc.Controllers
             {
                 if (GitRepositoryReferenceExists(gitRepositoryReference.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -113,13 +109,13 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             GitRepositoryReference gitRepositoryReference = await _context.GitRepositoryReference.SingleAsync(m => m.Id == id);
             if (gitRepositoryReference == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.GitRepositoryReference.Remove(gitRepositoryReference);

src/Yavsc/ApiControllers/MailingTemplateApiController.cs

@@ -1,13 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 using Yavsc.Server.Models.EMailing;
 using Microsoft.AspNetCore.Authorization;
-using System.Security.Claims;
+using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.Controllers
 {
@@ -36,14 +31,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MailingTemplate mailingTemplate = await _context.MailingTemplate.SingleAsync(m => m.Id == id);
 
             if (mailingTemplate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(mailingTemplate);
@@ -55,12 +50,12 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != mailingTemplate.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(mailingTemplate).State = EntityState.Modified;
@@ -73,7 +68,7 @@ namespace Yavsc.Controllers
             {
                 if (!MailingTemplateExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -81,7 +76,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/MailingTemplateApi
@@ -90,7 +85,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.MailingTemplate.Add(mailingTemplate);
@@ -102,7 +97,7 @@ namespace Yavsc.Controllers
             {
                 if (MailingTemplateExists(mailingTemplate.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -119,13 +114,13 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MailingTemplate mailingTemplate = await _context.MailingTemplate.SingleAsync(m => m.Id == id);
             if (mailingTemplate == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.MailingTemplate.Remove(mailingTemplate);

src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs

@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Musical;
 
@@ -33,14 +30,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MusicalPreference musicalPreference = _context.MusicalPreference.Single(m => m.OwnerProfileId == id);
 
             if (musicalPreference == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(musicalPreference);
@@ -51,25 +48,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != musicalPreference.OwnerProfileId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(musicalPreference).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!MusicalPreferenceExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -77,7 +74,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/MusicalPreferencesApi
@@ -86,19 +83,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.MusicalPreference.Add(musicalPreference);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (MusicalPreferenceExists(musicalPreference.OwnerProfileId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -115,17 +112,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MusicalPreference musicalPreference = _context.MusicalPreference.Single(m => m.OwnerProfileId == id);
             if (musicalPreference == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.MusicalPreference.Remove(musicalPreference);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(musicalPreference);
         }

src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs

@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Musical;
 
@@ -33,14 +30,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MusicalTendency musicalTendency = _context.MusicalTendency.Single(m => m.Id == id);
 
             if (musicalTendency == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(musicalTendency);
@@ -52,25 +49,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != musicalTendency.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(musicalTendency).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!MusicalTendencyExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -78,7 +75,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/MusicalTendenciesApi
@@ -87,19 +84,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.MusicalTendency.Add(musicalTendency);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (MusicalTendencyExists(musicalTendency.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -116,17 +113,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             MusicalTendency musicalTendency = _context.MusicalTendency.Single(m => m.Id == id);
             if (musicalTendency == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.MusicalTendency.Remove(musicalTendency);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(musicalTendency);
         }

src/Yavsc/ApiControllers/NativeConfidentialController.cs

@@ -5,6 +5,7 @@ using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Identity;
 
@@ -30,7 +31,7 @@ public class NativeConfidentialController : Controller
     public IActionResult Register(
         [FromBody] DeviceDeclaration declaration)
     {
-      var uid = _userManager.GetUserId(User);
+      var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
       if (!ModelState.IsValid)
       {
@@ -40,31 +41,29 @@ public class NativeConfidentialController : Controller
       declaration.LatestActivityUpdate = DateTime.Now;
 
       _logger.LogInformation($"Registering device with id:{declaration.DeviceId} for {uid}");
-      var alreadyRegisteredDevice = _context.DeviceDeclaration.FirstOrDefault(d => d.DeviceId == declaration.DeviceId);
+        DeviceDeclaration? alreadyRegisteredDevice = _context.DeviceDeclaration.FirstOrDefault(d => d.DeviceId == declaration.DeviceId);
       var deviceAlreadyRegistered = (alreadyRegisteredDevice!=null);
-      if (deviceAlreadyRegistered)
+      if (alreadyRegisteredDevice==null)
       {
-        _logger.LogInformation($"deviceAlreadyRegistered");
-        // Override an exiting owner
+        declaration.DeclarationDate = DateTime.Now;
+        declaration.DeviceOwnerId = uid;
+        _context.DeviceDeclaration.Add(declaration);
+      }
+      else {
         alreadyRegisteredDevice.DeviceOwnerId = uid;
         alreadyRegisteredDevice.Model = declaration.Model;
         alreadyRegisteredDevice.Platform = declaration.Platform;
         alreadyRegisteredDevice.Version = declaration.Version;
         _context.Update(alreadyRegisteredDevice);
-        _context.SaveChanges(_userManager.GetUserId(User));
-      }
-      else
-      {
-        _logger.LogInformation($"new device");
-        declaration.DeclarationDate = DateTime.Now;
-        declaration.DeviceOwnerId = uid;
-        _context.DeviceDeclaration.Add(declaration as DeviceDeclaration);
-        _context.SaveChanges(_userManager.GetUserId(User));
+        _context.SaveChanges(User.GetUserId());
       }
+        
+        _context.SaveChanges(User.GetUserId());
+    
       var latestActivityUpdate = _context.Activities.Max(a=>a.DateModified);
       return Json(new { 
           IsAnUpdate = deviceAlreadyRegistered, 
-          UpdateActivities = (latestActivityUpdate != declaration.LatestActivityUpdate)
+          UpdateActivities = latestActivityUpdate != declaration.LatestActivityUpdate
           });
     }
 

src/Yavsc/ApiControllers/PostRateApiController.cs

@@ -2,6 +2,7 @@ using System.Linq;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Yavsc.Helpers;
 using Yavsc.Models;
 
 namespace Yavsc.Controllers
@@ -23,23 +24,23 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Models.Blog.BlogPost blogpost = _context.Blogspot.Single(x=>x.Id == id);
 
             if (blogpost == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (blogpost.AuthorId!=uid)
                 if (!User.IsInRole(Constants.AdminGroupName))
-                    return HttpBadRequest();
+                    return BadRequest();
 
             blogpost.Rate = rate;
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok();
         }

src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Access;
 
@@ -34,22 +32,22 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
             BlackListed blackListed = _context.BlackListed.Single(m => m.Id == id);
             if (blackListed == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
             if (!CheckPermission(blackListed))
-                return HttpBadRequest();
+                return BadRequest();
 
             return Ok(blackListed);
         }
 
         private bool CheckPermission(BlackListed blackListed)
         {
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != blackListed.OwnerId)
                 if (!User.IsInRole(Constants.AdminGroupName))
                     if (!User.IsInRole(Constants.FrontOfficeGroupName))
@@ -62,26 +60,26 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != blackListed.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
             if (!CheckPermission(blackListed))
-                return HttpBadRequest();
+                return BadRequest();
             _context.Entry(blackListed).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!BlackListedExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -89,7 +87,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/BlackListApi
@@ -98,22 +96,22 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (!CheckPermission(blackListed))
-                return HttpBadRequest();
+                return BadRequest();
 
             _context.BlackListed.Add(blackListed);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (BlackListedExists(blackListed.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -130,20 +128,20 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             BlackListed blackListed = _context.BlackListed.Single(m => m.Id == id);
             if (blackListed == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             if (!CheckPermission(blackListed))
-                return HttpBadRequest();
+                return BadRequest();
                 
             _context.BlackListed.Remove(blackListed);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(blackListed);
         }

src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Access;
 
@@ -34,15 +31,15 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.CircleAuthorizationToBlogPost.SingleAsync(
                 m => m.CircleId == id && m.Allowed.OwnerId == uid );
 
             if (circleAuthorizationToBlogPost == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(circleAuthorizationToBlogPost);
@@ -54,12 +51,12 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != circleAuthorizationToBlogPost.CircleId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             if (!CheckOwner(circleAuthorizationToBlogPost.CircleId))
@@ -70,13 +67,13 @@ namespace Yavsc.Controllers
 
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!CircleAuthorizationToBlogPostExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -84,12 +81,12 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
         private bool CheckOwner (long circleId)
         {
             
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var circle = _context.Circle.First(c=>c.Id==circleId);
             _context.Entry(circle).State = EntityState.Detached;
             return (circle.OwnerId == uid);
@@ -100,7 +97,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
             if (!CheckOwner(circleAuthorizationToBlogPost.CircleId))
             {
@@ -109,13 +106,13 @@ namespace Yavsc.Controllers
             _context.CircleAuthorizationToBlogPost.Add(circleAuthorizationToBlogPost);
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (CircleAuthorizationToBlogPostExists(circleAuthorizationToBlogPost.CircleId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -132,9 +129,9 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
             CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.CircleAuthorizationToBlogPost.Include(
                 a=>a.Allowed
@@ -142,10 +139,10 @@ namespace Yavsc.Controllers
             && m.Allowed.OwnerId == uid);
             if (circleAuthorizationToBlogPost == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
             _context.CircleAuthorizationToBlogPost.Remove(circleAuthorizationToBlogPost);
-            await _context.SaveChangesAsync(_userManager.GetUserId(User));
+            await _context.SaveChangesAsync(User.GetUserId());
 
             return Ok(circleAuthorizationToBlogPost);
         }

src/Yavsc/ApiControllers/Relationship/ChatApiController.cs

@@ -1,13 +1,10 @@
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Identity;
 using Yavsc.Models;
 using Yavsc.ViewModels.Chat;
 using Yavsc.Services;
+using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.Controllers
 {
@@ -72,12 +69,12 @@ namespace Yavsc.Controllers
             if (!ModelState.IsValid)
             // Miguel mech profiler
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.ApplicationUser.Include(u => u.Connections).FirstOrDefault(u => u.UserName == userName);
 
-            if (user == null) return StatusCode(404);
+            if (user == null) return NotFound();
 
             return Ok(new ChatUserInfo
             {

src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs

@@ -1,9 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
@@ -35,7 +31,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             ChatRoomAccess chatRoomAccess = await _context.ChatRoomAccess.SingleAsync(m => m.ChannelName == id);
@@ -44,16 +40,16 @@ namespace Yavsc.Controllers
 
             if (chatRoomAccess == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             if (uid != chatRoomAccess.UserId && uid != chatRoomAccess.Room.OwnerId
              && ! User.IsInRole(Constants.AdminGroupName))
            
             {
                 ModelState.AddModelError("UserId","get refused");
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
             
             return Ok(chatRoomAccess);
@@ -65,20 +61,20 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
             if (id != chatRoomAccess.ChannelName)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
 
             if (uid != room.OwnerId && ! User.IsInRole(Constants.AdminGroupName))
             {
                 ModelState.AddModelError("ChannelName", "access put refused");
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Entry(chatRoomAccess).State = EntityState.Modified;
@@ -91,7 +87,7 @@ namespace Yavsc.Controllers
             {
                 if (!ChatRoomAccessExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -99,7 +95,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ChatRoomAccessApi
@@ -108,15 +104,15 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
             if (room == null || (uid != room.OwnerId && ! User.IsInRole(Constants.AdminGroupName)))
             {
                 ModelState.AddModelError("ChannelName", "access post refused");
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.ChatRoomAccess.Add(chatRoomAccess);
@@ -129,7 +125,7 @@ namespace Yavsc.Controllers
             {
                 if (ChatRoomAccessExists(chatRoomAccess.ChannelName))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -146,21 +142,21 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             ChatRoomAccess chatRoomAccess = await _context.ChatRoomAccess.Include(acc => acc.Room).SingleAsync(m => m.ChannelName == id);
             if (chatRoomAccess == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
             if (room == null || (uid != room.OwnerId  && chatRoomAccess.UserId != uid && ! User.IsInRole(Constants.AdminGroupName)))
             {
                 ModelState.AddModelError("UserId", "access drop refused");
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.ChatRoomAccess.Remove(chatRoomAccess);

src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Chat;
 
@@ -34,14 +30,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             ChatRoom chatRoom = await _context.ChatRoom.SingleAsync(m => m.Name == id);
 
             if (chatRoom == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(chatRoom);
@@ -53,17 +49,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != chatRoom.Name)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
-            if (_userManager.GetUserId(User) != chatRoom.OwnerId )
+            if (User.GetUserId() != chatRoom.OwnerId )
             {
-                return HttpBadRequest(new {error = "OwnerId"});
+                return BadRequest(new {error = "OwnerId"});
             }
 
             _context.Entry(chatRoom).State = EntityState.Modified;
@@ -76,7 +72,7 @@ namespace Yavsc.Controllers
             {
                 if (!ChatRoomExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -84,7 +80,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ChatRoomApi
@@ -93,12 +89,12 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
-            if (_userManager.GetUserId(User) != chatRoom.OwnerId )
+            if (User.GetUserId() != chatRoom.OwnerId )
             {
-                return HttpBadRequest(new {error = "OwnerId"});
+                return BadRequest(new {error = "OwnerId"});
             }
 
             _context.ChatRoom.Add(chatRoom);
@@ -110,7 +106,7 @@ namespace Yavsc.Controllers
             {
                 if (ChatRoomExists(chatRoom.Name))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -127,7 +123,7 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
             ChatRoom chatRoom = await _context.ChatRoom.SingleAsync(m => m.Name == id);
 
@@ -135,13 +131,13 @@ namespace Yavsc.Controllers
 
             if (chatRoom == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
-            if (_userManager.GetUserId(User) != chatRoom.OwnerId )
+            if (User.GetUserId() != chatRoom.OwnerId )
             {
                 if (!User.IsInRole(Constants.AdminGroupName))
-                    return HttpBadRequest(new {error = "OwnerId"});
+                    return BadRequest(new {error = "OwnerId"});
             }
 
             _context.ChatRoom.Remove(chatRoom);

src/Yavsc/ApiControllers/Relationship/CircleApiController.cs

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Relationship;
 
@@ -34,14 +30,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Circle circle = await _context.Circle.SingleAsync(m => m.Id == id);
 
             if (circle == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(circle);
@@ -53,25 +49,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != circle.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(circle).State = EntityState.Modified;
 
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!CircleExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -79,7 +75,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/CircleApi
@@ -88,19 +84,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Circle.Add(circle);
             try
             {
-                await _context.SaveChangesAsync(_userManager.GetUserId(User));
+                await _context.SaveChangesAsync(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (CircleExists(circle.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -117,17 +113,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Circle circle = await _context.Circle.SingleAsync(m => m.Id == id);
             if (circle == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Circle.Remove(circle);
-            await _context.SaveChangesAsync(_userManager.GetUserId(User));
+            await _context.SaveChangesAsync(User.GetUserId());
 
             return Ok(circle);
         }

src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs

@@ -1,9 +1,7 @@
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Abstract.Identity;
+using Yavsc.Helpers;
 using Yavsc.Models;
 
 namespace Yavsc.Controllers
@@ -32,25 +30,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != clientProviderInfo.UserId)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(clientProviderInfo).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!ClientProviderInfoExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -58,7 +56,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ContactsApi
@@ -67,19 +65,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.ClientProviderInfo.Add(clientProviderInfo);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (ClientProviderInfoExists(clientProviderInfo.UserId))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -96,17 +94,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             ClientProviderInfo clientProviderInfo = _context.ClientProviderInfo.Single(m => m.UserId == id);
             if (clientProviderInfo == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.ClientProviderInfo.Remove(clientProviderInfo);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(clientProviderInfo);
         }

src/Yavsc/ApiControllers/ServiceApiController.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Market;
 
@@ -34,14 +31,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Service service = _context.Services.Single(m => m.Id == id);
 
             if (service == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(service);
@@ -53,25 +50,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != service.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(service).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!ServiceExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -79,7 +76,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ServiceApi
@@ -88,19 +85,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Services.Add(service);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (ServiceExists(service.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -117,17 +114,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Service service = _context.Services.Single(m => m.Id == id);
             if (service == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Services.Remove(service);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(service);
         }

src/Yavsc/ApiControllers/Survey/BugApiController.cs

@@ -1,14 +1,9 @@
 using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Yavsc.Models;
 using Yavsc.Models.IT.Fixing;
+using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.ApiControllers
 {
@@ -73,14 +68,14 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Bug bug = await _context.Bug.SingleAsync(m => m.Id == id);
 
             if (bug == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(bug);
@@ -92,12 +87,12 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != bug.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(bug).State = EntityState.Modified;
@@ -110,7 +105,7 @@ namespace Yavsc.ApiControllers
             {
                 if (!BugExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -118,7 +113,7 @@ namespace Yavsc.ApiControllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/bug
@@ -127,7 +122,7 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Bug.Add(bug);
@@ -139,7 +134,7 @@ namespace Yavsc.ApiControllers
             {
                 if (BugExists(bug.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -156,13 +151,13 @@ namespace Yavsc.ApiControllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             Bug bug = await _context.Bug.SingleAsync(m => m.Id == id);
             if (bug == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Bug.Remove(bug);

src/Yavsc/ApiControllers/accounting/AccountController.cs

@@ -1,25 +1,21 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using System.Security.Claims;
-using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+using Yavsc.Models;
+using Yavsc.Models.Account;
+using Yavsc.ViewModels.Account;
+using Yavsc.Helpers;
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc.WebApi.Controllers
 {
-    using Models;
-    using Models.Account;
-    using ViewModels.Account;
-    using Yavsc.Helpers;
-    using System.Linq;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.AspNetCore.Identity.EntityFramework;
-    using Yavsc.Abstract.Identity;
 
     [Authorize(),Route("~/api/account")]
     public class ApiAccountController : Controller
     {
-        
         private UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
         readonly ApplicationDbContext _dbContext;
@@ -54,7 +50,7 @@ namespace Yavsc.WebApi.Controllers
             {
                 return new BadRequestObjectResult(ModelState);
             }
-            var user = await _userManager.FindByIdAsync(_userManager.GetUserId(User));
+            var user = await _userManager.FindByIdAsync(User.GetUserId());
             if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) {
                 IdentityResult result = await UserManager.ChangePasswordAsync(user, model.OldPassword,
                     model.NewPassword);
@@ -76,7 +72,7 @@ namespace Yavsc.WebApi.Controllers
             {
                 return new BadRequestObjectResult(ModelState);
             }
-            var user = await _userManager.FindByIdAsync(_userManager.GetUserId(User));
+            var user = await _userManager.FindByIdAsync(User.GetUserId());
             if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) {
                 IdentityResult result = await UserManager.AddPasswordAsync(user, model.NewPassword);
                 if (!result.Succeeded)
@@ -132,12 +128,11 @@ namespace Yavsc.WebApi.Controllers
             if (User==null) 
             return new BadRequestObjectResult(
                     new { error = "user not found" });
-            var uid = _userManager.GetUserId(User);
+            var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
             var userData = await _dbContext.Users
                 .Include(u=>u.PostalAddress)
                 .Include(u=>u.AccountBalance)
-                .Include(u=>u.Roles)
                 .FirstAsync(u=>u.Id == uid);
 
             var user = new Yavsc.Models.Auth.Me(userData.Id, userData.UserName, userData.Email, 
@@ -169,7 +164,7 @@ namespace Yavsc.WebApi.Controllers
         {
             if (!ModelState.IsValid) return new BadRequestObjectResult(
                     new { error = "Specify some valid user update request." });
-            var user = await _userManager.FindByIdAsync(_userManager.GetUserId(User));
+            var user = await _userManager.FindByIdAsync(User.GetUserId());
             var result = await _userManager.SetUserNameAsync(user, me.UserName);
             if (result.Succeeded)
                 return Ok();
@@ -183,7 +178,7 @@ namespace Yavsc.WebApi.Controllers
         public async Task<IActionResult> SetAvatar()
         {
             var root = User.InitPostToFileSystem(null);
-            var user = await _userManager.FindByIdAsync(_userManager.GetUserId(User));
+            var user = await _userManager.FindByIdAsync(User.GetUserId());
             if (Request.Form.Files.Count!=1)
                 return new BadRequestResult();
             var info = user.ReceiveAvatar(Request.Form.Files[0]);

src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Abstract.Identity;
+using Yavsc.Helpers;
 using Yavsc.Models;
 
 namespace Yavsc.Controllers
@@ -23,20 +24,20 @@ namespace Yavsc.Controllers
 
         // GET: api/ApplicationUserApi
         [HttpGet]
-        public IEnumerable<UserInfo> GetApplicationUser()
+        public IEnumerable<UserInfo> GetApplicationUser(int skip=0, int take = 25)
         {
-            return _context.Users.OrderByDescending(u => u.DateModified).Take(25)
-            .Select(u=> new UserInfo { 
+            return _context.Users.Skip(skip).Take(take)
+            .Select(u=> new UserInfo{ 
             UserId = u.Id,
             UserName = u.UserName,
-            Avatar = u.Avatar   });
+            Avatar = u.Avatar});
         }
 
         [HttpGet("search/{pattern}")]
-        public IEnumerable<UserInfo> SearchApplicationUser(string pattern)
+        public IEnumerable<UserInfo> SearchApplicationUser(string pattern, int skip=0, int take = 25)
         {
             return _context.Users.Where(u => u.UserName.Contains(pattern))
-            .OrderByDescending(u => u.DateModified).Take(25)
+            .Skip(skip).Take(take)
             .Select(u=> new UserInfo { 
             UserId = u.Id,
             UserName = u.UserName,
@@ -49,14 +50,14 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
-            ApplicationUser applicationUser = _context.Users.Include(u=>u.Roles).Include(u=>u.Logins).Include(u=>u.Claims).Single(m => m.Id == id);
+            ApplicationUser applicationUser = _context.Users.Single(m => m.Id == id);
 
             if (applicationUser == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             return Ok(applicationUser);
@@ -68,25 +69,25 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             if (id != applicationUser.Id)
             {
-                return HttpBadRequest();
+                return BadRequest();
             }
 
             _context.Entry(applicationUser).State = EntityState.Modified;
 
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateConcurrencyException)
             {
                 if (!ApplicationUserExists(id))
                 {
-                    return StatusCode(404);
+                    return NotFound();
                 }
                 else
                 {
@@ -94,7 +95,7 @@ namespace Yavsc.Controllers
                 }
             }
 
-            return new HttpStatusCodeResult(StatusCodes.Status204NoContent);
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
         }
 
         // POST: api/ApplicationUserApi
@@ -103,19 +104,19 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             _context.Users.Add(applicationUser);
             try
             {
-                _context.SaveChanges(_userManager.GetUserId(User));
+                _context.SaveChanges(User.GetUserId());
             }
             catch (DbUpdateException)
             {
                 if (ApplicationUserExists(applicationUser.Id))
                 {
-                    return new HttpStatusCodeResult(StatusCodes.Status409Conflict);
+                    return new StatusCodeResult(StatusCodes.Status409Conflict);
                 }
                 else
                 {
@@ -132,17 +133,17 @@ namespace Yavsc.Controllers
         {
             if (!ModelState.IsValid)
             {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             }
 
             ApplicationUser applicationUser = _context.Users.Single(m => m.Id == id);
             if (applicationUser == null)
             {
-                return StatusCode(404);
+                return NotFound();
             }
 
             _context.Users.Remove(applicationUser);
-            _context.SaveChanges(_userManager.GetUserId(User));
+            _context.SaveChanges(User.GetUserId());
 
             return Ok(applicationUser);
         }

src/Yavsc/ApiControllers/accounting/ProfileApiController.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Yavsc.Models;
 using Yavsc.Abstract.Identity;
+using Yavsc.Helpers;
 
 namespace Yavsc.ApiControllers.accounting
 {
@@ -22,9 +23,9 @@ namespace Yavsc.ApiControllers.accounting
         [HttpGet("{allow}",Name ="setmonthlyemail")]
         public async Task<object> SetMonthlyEmail(bool allow)
         {
-            var user = await _userManager.FindByIdAsync(_userManager.GetUserId(User));
+            var user = await _userManager.FindByIdAsync(User.GetUserId());
             user.AllowMonthlyEmail = allow;
-            _dbContext.SaveChanges(_userManager.GetUserId(User));
+            _dbContext.SaveChanges(User.GetUserId());
             return Ok(new { monthlyEmailPrefSaved = allow });
         }
 

src/Yavsc/AuthorizationHandlers/AnnouceEditHandler.cs

@@ -1,23 +0,0 @@
-
-
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.Interfaces;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class AnnouceEditHandler : AuthorizationHandler<EditRequirement, IOwned>
-    {
-        protected override void Handle(AuthorizationContext context, EditRequirement requirement, 
-        IOwned resource)
-        {
-            if (context.User.IsInRole(Constants.BlogModeratorGroupName)
-            || context.User.IsInRole(Constants.AdminGroupName))
-                context.Succeed(requirement);
-            if (resource.OwnerId == context._userManager.GetUserId(User))
-                context.Succeed(requirement);
-        }
-
-    }
-}

src/Yavsc/AuthorizationHandlers/BillEditHandler.cs

@@ -1,21 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    using Billing;
-    public class BillEditHandler : AuthorizationHandler<EditRequirement, IBillable>
-    {
-        protected override void Handle(AuthorizationContext context, EditRequirement requirement, IBillable resource)
-        {
-
-            if (context.User.IsInRole("FrontOffice"))
-                context.Succeed(requirement);
-            else if (context.User.Identity.IsAuthenticated)
-            if (resource.ClientId == context._userManager.GetUserId(User))
-                context.Succeed(requirement);
-        }
-
-    }
-}

src/Yavsc/AuthorizationHandlers/BillViewHandlers.cs

@@ -1,23 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    using Billing;
-
-    public class BillViewHandler : AuthorizationHandler<ViewRequirement, IBillable>
-    {
-        protected override void Handle(AuthorizationContext context, ViewRequirement requirement, IBillable resource)
-        {
-            if (context.User.IsInRole("FrontOffice"))
-                context.Succeed(requirement);
-            else if (context.User.Identity.IsAuthenticated)
-            if (resource.ClientId == context._userManager.GetUserId(User))
-                context.Succeed(requirement);
-            else if (resource.PerformerId == context._userManager.GetUserId(User))
-                context.Succeed(requirement);
-        }
-
-    }
-}

src/Yavsc/AuthorizationHandlers/BlogEditHandler.cs

@@ -1,20 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System.Security.Claims;
-using Yavsc.Models.Blog;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class BlogEditHandler : AuthorizationHandler<EditRequirement, BlogPost>
-    {
-        protected override void Handle(AuthorizationContext context, EditRequirement requirement, BlogPost resource)
-        {
-            if (context.User.IsInRole(Constants.BlogModeratorGroupName))
-                context.Succeed(requirement);
-            else if (context.User.Identity.IsAuthenticated)
-            if (resource.AuthorId == context._userManager.GetUserId(User))
-                context.Succeed(requirement);
-        }
-
-    }
-}

src/Yavsc/AuthorizationHandlers/BlogViewHandler.cs

@@ -1,35 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.Models.Blog;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class BlogViewHandler : AuthorizationHandler<ViewRequirement, BlogPost>
-    {
-        protected override void Handle(AuthorizationContext context, ViewRequirement requirement, BlogPost resource)
-        {
-            bool ok=false;
-             if (resource.Visible) {
-                if (resource.ACL==null)
-                    ok=true;
-                else if (resource.ACL.Count==0) ok=true; 
-                 else   {
-                        if (context.User.IsSignedIn()) {
-                            var uid = context._userManager.GetUserId(User);
-                            if (resource.ACL.Any(a=>a.Allowed!=null && a.Allowed.Members.Any(m=>m.MemberId == uid )))
-                                ok=true; 
-                        } 
-                    }
-            } 
-            if (ok) context.Succeed(requirement);
-            else {
-                if (context.User.IsInRole(Constants.AdminGroupName) || 
-                context.User.IsInRole(Constants.BlogModeratorGroupName))
-                 context.Succeed(requirement);
-                 else context.Fail();
-             }
-        }
-    }
-}

src/Yavsc/AuthorizationHandlers/HasBadgeHandler.cs

@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class HasBadgeHandler : AuthorizationHandler<PrivateChatEntryRequirement>
-    {
-        protected override void Handle(AuthorizationContext context, PrivateChatEntryRequirement requirement)
-        {
-            if (!context.User.HasClaim(c => c.Type == "BadgeNumber" &&
-                                            c.Issuer == Startup.Authority))
-            {
-                return;
-            }
-            context.Succeed(requirement);
-        }
-    }
-}

src/Yavsc/AuthorizationHandlers/HasTemporaryPassHandler.cs

@@ -1,28 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class HasTemporaryPassHandler : AuthorizationHandler<PrivateChatEntryRequirement>
-    {
-        protected override void Handle(AuthorizationContext context, PrivateChatEntryRequirement requirement)
-        {
-            if (!context.User.HasClaim(c => c.Type == "TemporaryBadgeExpiry" &&
-                                            c.Issuer == Startup.Authority))
-            {
-                return;
-            }
-
-            var temporaryBadgeExpiry =
-                Convert.ToDateTime(context.User.FindFirst(
-                                       c => c.Type == "TemporaryBadgeExpiry" &&
-                                       c.Issuer == Startup.Authority).Value);
-
-            if (temporaryBadgeExpiry > DateTime.Now)
-            {
-                context.Succeed(requirement);
-            }
-        }
-    }
-}

src/Yavsc/AuthorizationHandlers/ManageGitHookHandler.cs

@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Yavsc.Server.Models.IT.SourceCode;
-using Yavsc.ViewModels.Auth;
-
-namespace Yavsc.AuthorizationHandlers
-{
-    public class ManageGitHookHandler: AuthorizationHandler<EditRequirement, GitRepositoryReference>
-    {
-        protected override void Handle(AuthorizationContext context, EditRequirement requirement, GitRepositoryReference resource)
-        {
-            if (context.User.IsInRole("FrontOffice"))
-                context.Succeed(requirement);
-            else if (context.User.Identity.IsAuthenticated)
-                context.Succeed(requirement);
-        }
-
-    }
-}