Merge pull request #2311 from dpaquette/feat/account_lockout

Enabling account lock out
HTBox · Mar 6, 2018 · 9fe8737 · 9fe8737
2 parents 1ddb59b + 5dda9c5
commit 9fe8737
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git a/AllReadyApp/Web-App/AllReady/Startup.cs b/AllReadyApp/Web-App/AllReady/Startup.cs
@@ -55,6 +55,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                     options.Password.RequireNonAlphanumeric = false;
                     options.Password.RequireDigit = true;
                     options.Password.RequireUppercase = false;
+                    options.Lockout.MaxFailedAccessAttempts = Convert.ToInt32(Configuration["Authentication:MaxFailedAccessAttempts"]);
                 })
                 .AddEntityFrameworkStores<AllReadyContext>()
                 .AddDefaultTokenProviders();

diff --git a/AllReadyApp/Web-App/AllReady/Views/Account/Lockout.cshtml b/AllReadyApp/Web-App/AllReady/Views/Account/Lockout.cshtml
@@ -1,8 +1,8 @@
-@{
-    ViewData["Title"] = "Locked out";
-}
-
-<hgroup>
-    <h1 class="text-danger">Locked out.</h1>
-    <h2 class="text-danger">This account has been locked out, please try again later.</h2>
-</hgroup>
+@{
+    ViewData["Title"] = "Locked out";
+}
+
+<hgroup>
+    <h1 class="text-danger">Locked out.</h1>
+    <p class="text-danger">This account has been locked out, please try again later or contact your organization administrator.</p>
+</hgroup>
diff --git a/AllReadyApp/Web-App/AllReady/appsettings.json b/AllReadyApp/Web-App/AllReady/appsettings.json
@@ -47,35 +47,36 @@
   "Email": {
     "EmailFolder": "..."
   },
-  "Authentication": {
-    "Facebook": {
-      "AppId": "[facebookappId]",
-      "AppSecret": "[facebookappsecret]"
+    "Authentication": {
+        "MaxFailedAccessAttempts":  5,
+        "Facebook": {
+            "AppId": "[facebookappId]",
+            "AppSecret": "[facebookappsecret]"
+        },
+        "Twitter": {
+            "ConsumerKey": "[twitterconsumerkey]",
+            "ConsumerSecret": "[twitterconsumersecret]"
+        },
+        "MicrosoftAccount": {
+            "ClientId": "[microsoftclientid]",
+            "ClientSecret": "[microsoftclientsecret]"
+        },
+        "Google": {
+            "ClientId": "[googleclientid]",
+            "ClientSecret": "[googleclientsecret]"
+        },
+        "SendGrid": {
+            "UserName": "[sendgriduser]",
+            "Password": "[sendgridpassword]",
+            "FromEmail": "[sendgridemailsender]"
+        },
+        "Twilio": {
+            "EnableTwilio": "false",
+            "Sid": "[twiliosid]",
+            "Token": "[twiliotoken]",
+            "PhoneNo": "[twilionumber]"
+        }
     },
-    "Twitter": {
-      "ConsumerKey": "[twitterconsumerkey]",
-      "ConsumerSecret": "[twitterconsumersecret]"
-    },
-    "MicrosoftAccount": {
-      "ClientId": "[microsoftclientid]",
-      "ClientSecret": "[microsoftclientsecret]"
-    },
-    "Google": {
-      "ClientId": "[googleclientid]",
-      "ClientSecret": "[googleclientsecret]"
-    },
-    "SendGrid": {
-      "UserName": "[sendgriduser]",
-      "Password": "[sendgridpassword]",
-      "FromEmail": "[sendgridemailsender]"
-    },
-    "Twilio": {
-      "EnableTwilio": "false",
-      "Sid": "[twiliosid]",
-      "Token": "[twiliotoken]",
-      "PhoneNo": "[twilionumber]"
-    }
-  },
     "ApprovedRegions": {
         "Enabled": true,
         "Regions": [