Prepare the release 6.0.3

Author: habarthierry-hue

docker-compose.yml

@@ -28,7 +28,7 @@ services:
     networks:
       proxy_net: null
   scim:
-    image: simpleidserver/scim:6.0.2
+    image: simpleidserver/scim:6.0.3
     environment:
       VIRTUAL_HOST: "scim.localhost.com"
       ASPNETCORE_URLS : "http://*:80"
@@ -40,7 +40,7 @@ services:
     networks:
       proxy_net: null
   idserver:
-    image: simpleidserver/idserver:6.0.2
+    image: simpleidserver/idserver:6.0.3
     environment:
       VIRTUAL_HOST: "idserver.localhost.com"
       ASPNETCORE_URLS : "http://*:80"
@@ -59,7 +59,7 @@ services:
     networks:
       proxy_net: null
   website:
-    image: simpleidserver/website:6.0.2
+    image: simpleidserver/website:6.0.3
     environment:
       VIRTUAL_HOST: "website.localhost.com"
       ASPNETCORE_URLS : "http://*:80"
@@ -74,7 +74,7 @@ services:
     networks:
       proxy_net: null
   credentialissuer:
-    image: simpleidserver/credentialissuer:6.0.2
+    image: simpleidserver/credentialissuer:6.0.3
     environment:
       VIRTUAL_HOST: "credentialissuer.localhost.com"
       ASPNETCORE_URLS : "http://*:80"
@@ -86,7 +86,7 @@ services:
     networks:
       proxy_net: null
   credentialissuerwebsite:
-    image: simpleidserver/credentialissuerwebsite:6.0.2
+    image: simpleidserver/credentialissuerwebsite:6.0.3
     environment:
       VIRTUAL_HOST: "credentialissuerwebsite.localhost.com"
       ASPNETCORE_URLS : "http://*:80"

sid-kubernetes.yaml

@@ -229,7 +229,7 @@ spec:
       subdomain: localhost
       containers:
       - name: scim-deploy
-        image: simpleidserver/scim:6.0.2
+        image: simpleidserver/scim:6.0.3
         ports:
           - containerPort: 80
         env:
@@ -266,7 +266,7 @@ spec:
       subdomain: localhost
       containers:
       - name: idserver-deploy
-        image: simpleidserver/idserver:6.0.2
+        image: simpleidserver/idserver:6.0.3
         ports:
           - containerPort: 80
         env:
@@ -311,7 +311,7 @@ spec:
       subdomain: localhost
       containers:
       - name: website-deploy
-        image: simpleidserver/website:6.0.2
+        image: simpleidserver/website:6.0.3
         ports:
           - containerPort: 80
         env:
@@ -352,7 +352,7 @@ spec:
       subdomain: localhost
       containers:
       - name: credentialissuer-deploy
-        image: simpleidserver/credentialissuer:6.0.2
+        image: simpleidserver/credentialissuer:6.0.3
         ports:
           - containerPort: 80
         env:
@@ -387,7 +387,7 @@ spec:
       subdomain: localhost
       containers:
       - name: credentialissuerwebsite-deploy
-        image: simpleidserver/credentialissuerwebsite:6.0.2
+        image: simpleidserver/credentialissuerwebsite:6.0.3
         ports:
           - containerPort: 80
         env:

src/Templates/templates/SimpleIdServer.IdServer.Startup/Areas/mobile/Views/Authenticate/Index.cshtml

@@ -55,7 +55,7 @@
             var loginStatusUrl = "@loginStatusUrl";
 
             var displayError = function (errorJson) {
-                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error_description"]);
+                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error"]);
             }
 
             var displayQRCode = function (img) {

src/Templates/templates/SimpleIdServer.IdServer.Startup/Areas/mobile/Views/Register/Index.cshtml

@@ -54,7 +54,7 @@
             var isInitialized = false;
 
             var displayError = function(errorJson) {
-                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error_description"]);
+                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error"]);
             }
 
             var displaySuccessMessage = function () {

src/Templates/templates/SimpleIdServer.IdServer.Startup/Areas/vp/Views/Register/Index.cshtml

@@ -57,7 +57,7 @@
             var isCreated = "@isCreated";
 
             var displayError = function (errorJson) {
-                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error_description"]);
+                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error"]);
             }
 
             var viewQrCode = function (img) {

src/Templates/templates/SimpleIdServer.IdServer.Startup/Areas/webauthn/Views/Authenticate/Index.cshtml

@@ -60,7 +60,7 @@
             }
 
             var displayError = function (errorJson) {
-                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error_description"]);
+                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error"]);
             }
 
             var tryListenForm = function () {

src/Templates/templates/SimpleIdServer.IdServer.Startup/Areas/webauthn/Views/Register/Index.cshtml

@@ -57,7 +57,7 @@
             var isInitialized = false;
 
             var displayError = function (errorJson) {
-                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error_description"]);
+                csharpReference.invokeMethodAsync("SetErrorMessage", errorJson["error"]);
             }
 
             var displaySuccessMessage = function () {

src/Templates/templates/SimpleIdServer.IdServer.Startup/Conf/SidServerSetup.cs

@@ -19,6 +19,7 @@
 using OpenTelemetry.Trace;
 using SimpleIdServer.Configuration;
 using SimpleIdServer.Configuration.Redis;
+using SimpleIdServer.IdServer.Captcha;
 using SimpleIdServer.IdServer.Domains;
 using SimpleIdServer.IdServer.Options;
 using SimpleIdServer.IdServer.Startup.Conf.Migrations.AfterDeployment;
@@ -90,6 +91,10 @@ public static void ConfigureIdServer(WebApplicationBuilder webApplicationBuilder
             .AddLdapProvisioning()
             .AddFcmNotification()
             .AddGotifyNotification()
+            .EnableV2Recaptcha(c =>
+            {
+                ConfigureV2ReCaptcha(webApplicationBuilder, c);
+            })
             .AddSwagger(opt =>
             {
                 opt.IncludeDocumentation<AccessTokenTypeService>();
@@ -444,6 +449,13 @@ private static void ConfigureMessageBroker(WebApplicationBuilder builder, IBusRe
         }
     }
 
+    private static void ConfigureV2ReCaptcha(WebApplicationBuilder builder, V2ReCaptchaOptions options)
+    {
+        var section = builder.Configuration.GetSection(nameof(V2ReCaptchaOptions));
+        var conf = section.Get<V2ReCaptchaOptions>();
+        options.Secret = conf.Secret;
+    }
+
     private static void ConfigureMessageBrokerMigration(WebApplicationBuilder builder)
     {
         var section = builder.Configuration.GetSection(nameof(MessageBrokerOptions));

src/Templates/templates/SimpleIdServer.IdServer.Startup/Views/Shared/_FormBuilderLayout.cshtml

@@ -72,6 +72,7 @@
     <script type="text/javascript" src="@Url.Content("~/lib/bootstrap/js/bootstrap.js")"></script>
     <script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
     <script src="_content/SidFormBuilder/lib.js"></script>
+    <script src="_content/SidFormBuilder/reCaptcha.js"></script>
     <script src="_content/BlazorMonaco/jsInterop.js"></script>
     <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/loader.js"></script>
     <script src="_content/BlazorMonaco/lib/monaco-editor/min/vs/editor/editor.main.js"></script>

src/Templates/templates/SimpleIdServer.IdServer.Startup/appsettings.Docker.json

@@ -99,8 +99,7 @@
     "NotificationMode": "email",
     "ResetPasswordTitle": "Reset your password",
     "ResetPasswordBody": "Link to reset your password {0}",
-    "ResetPasswordLinkExpirationInSeconds": "30",
-    "CanResetPassword": "true"
+    "ResetPasswordLinkExpirationInSeconds": "30"
   },
   "MobileOptions": {
     "U2FExpirationTimeInSeconds": "300"
@@ -128,5 +127,8 @@
   "UserLockingOptions": {
     "LockTimeInSeconds": "300",
     "MaxLoginAttempts": "5"
+  },
+  "V2ReCaptchaOptions": {
+    "Secret": "6LcbEGQrAAAAAKEdeYsB5WXOTfHmT5d-xiAWnfSG"
   }
 }