From b4fbe138433b05fc399430b3f0397a0ffb5ffe28 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 1 Jun 2020 01:20:04 +0100
Subject: [PATCH] Fixes the Google login

---
 TODO.md                                            |  1 +
 omnisharp.json                                     |  3 +++
 scripts/build.csx                                  | 14 --------------
 src/Yavsc.Server/project.json                      |  2 +-
 .../Controllers/Accounting/AccountController.cs    |  9 +++++++--
 src/Yavsc/Controllers/IT/ProjectController.cs      |  7 +++++--
 src/Yavsc/Views/Account/Authorize.cshtml           |  2 +-
 7 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 scripts/build.csx

diff --git a/TODO.md b/TODO.md
index 62046ca4..819a514b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,6 +6,7 @@ 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)
diff --git a/omnisharp.json b/omnisharp.json
index 6819b490..7df34792 100644
--- a/omnisharp.json
+++ b/omnisharp.json
@@ -10,6 +10,9 @@
 		"enablePackageRestore": false,
 		"projects": "src/*/project.json;*/project.json;project.json;test/*/project.json" 
 	},
+	"Script": {
+		"enabled": false
+	},
 	"fileOptions": {
     "systemExcludeSearchPatterns": [
       "**/bin/**/*",
diff --git a/scripts/build.csx b/scripts/build.csx
deleted file mode 100644
index c44a4749..00000000
--- a/scripts/build.csx
+++ /dev/null
@@ -1,14 +0,0 @@
-#! "dnx451"
-#r "nuget:Microsoft.Azure.WebJobs,*"
-
-
-using System;
-
-
-public static void Run(string myEventHubMessage)
-{
-    // log.Info($"C# Event Hub trigger function processed a message: {myEventHubMessage}");
-    Console.WriteLine("Test");
-}
-
-Run("test");
diff --git a/src/Yavsc.Server/project.json b/src/Yavsc.Server/project.json
index 49303195..d2e2b439 100644
--- a/src/Yavsc.Server/project.json
+++ b/src/Yavsc.Server/project.json
@@ -60,7 +60,7 @@
         "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": "6.0.1-beta1",
+        "Newtonsoft.Json": "7.0.1",
         "Gapi.net45": "1.0.1",
         "PayPalMerchant-net451": "2.7.109",
         "MailKit": "1.12.0",
diff --git a/src/Yavsc/Controllers/Accounting/AccountController.cs b/src/Yavsc/Controllers/Accounting/AccountController.cs
index e77c300a..159f4086 100644
--- a/src/Yavsc/Controllers/Accounting/AccountController.cs
+++ b/src/Yavsc/Controllers/Accounting/AccountController.cs
@@ -94,10 +94,11 @@ namespace Yavsc.Controllers
             // user.EmailConfirmed
             return View(toShow.ToArray());
         }
+
         string GeneratePageToken() {
             return System.Guid.NewGuid().ToString();
         }
-
+        
         [AllowAnonymous]
         [HttpGet(Constants.LoginPath)]
         public ActionResult SignIn(string returnUrl = null)
@@ -152,7 +153,11 @@ namespace Yavsc.Controllers
                                 return this.ViewOk(model);
                             }
                         }
-
+                        else {
+                                ModelState.AddModelError(string.Empty, 
+                                            "No such user.");
+                                return this.ViewOk(model);
+                        }
                         // This doesn't count login failures towards account lockout
                         // To enable password failures to trigger account lockout, set lockoutOnFailure: true
                         var result = await _signInManager.PasswordSignInAsync(model.UserName, model.Password, model.RememberMe, lockoutOnFailure: false);
diff --git a/src/Yavsc/Controllers/IT/ProjectController.cs b/src/Yavsc/Controllers/IT/ProjectController.cs
index 7457c04f..6ca12b11 100644
--- a/src/Yavsc/Controllers/IT/ProjectController.cs
+++ b/src/Yavsc/Controllers/IT/ProjectController.cs
@@ -22,13 +22,15 @@ namespace Yavsc.Controllers
         IStringLocalizer<Yavsc.YavscLocalisation> _localizer;
         IStringLocalizer<BugController> _bugLocalizer;
           
-        public ProjectController(ApplicationDbContext context, 
+        public ProjectController(ApplicationDbContext context,
         ILoggerFactory loggerFactory,
-        IStringLocalizer<Yavsc.YavscLocalisation> localizer
+        IStringLocalizer<Yavsc.YavscLocalisation> localizer,
+        IStringLocalizer<BugController> bugLocalizer
         )
         {
             _context = context;
             _localizer = localizer;
+            _bugLocalizer = bugLocalizer;
             _logger = loggerFactory.CreateLogger<ProjectController>();
 
         }
@@ -36,6 +38,7 @@ namespace Yavsc.Controllers
         // GET: Project
         public async Task<IActionResult> Index()
         {
+
             var applicationDbContext = _context.Project.Include(p => p.Client).Include(p => p.Context).Include(p => p.PerformerProfile).Include(p => p.Regularisation).Include(p => p.Repository);
             return View(await applicationDbContext.ToListAsync());
         }
diff --git a/src/Yavsc/Views/Account/Authorize.cshtml b/src/Yavsc/Views/Account/Authorize.cshtml
index 6ccafd77..ef806f86 100644
--- a/src/Yavsc/Views/Account/Authorize.cshtml
+++ b/src/Yavsc/Views/Account/Authorize.cshtml
@@ -27,4 +27,4 @@
         </p>
     </form>
 
-</div>
\ No newline at end of file
+</div>