Redmine:16027 ([NetKit] Enhancement of authenticationPage and authenticationErrorPage: enhance error response page with customizable close button and localization support)

Author: yannicktrinh

Project/Sources/Classes/Tools.4dm

@@ -581,12 +581,20 @@ Function makeError($inCode : Integer; $inParameters : Object) : Object
 	// ----------------------------------------------------
 
 
-Function buildPageFromTemplate($inTitle : Text; $inMessage : Text; $inDetails : Text) : Text
-	
+Function buildPageFromTemplate($inTitle : Text; $inMessage : Text; $inDetails : Text; $inButtonText : Text) : Text
+	/*
+		Builds a response page from the template file.
+		Parameters:
+			- $inTitle: Title of the page
+			- $inMessage: Main message to display
+			- $inDetails: Additional details to display
+			- $inButtonText: Text for the close button (optional)
+	*/
 	var $responseTemplateFile : 4D.File:=Folder(fk resources folder).file("responseTemplate.html")
 	var $responseTemplateContent : Text:=$responseTemplateFile.getText()
 	var $responseBody : Text:=""
+	var $closeButtonText : Text:=(Length($inButtonText)>0) ? $inButtonText : Localized string("OAuth2_Response_Close")
 
-	PROCESS 4D TAGS($responseTemplateContent; $responseBody; $inTitle; $inMessage; $inDetails)
+	PROCESS 4D TAGS($responseTemplateContent; $responseBody; $inTitle; $inMessage; $inDetails; $closeButtonText)
 
 	return $responseBody

Project/Sources/Methods/_authorize.4dm

@@ -85,8 +85,9 @@ If ($URL=$redirectURI)
 
             var $responseFileContent : Text:=$responseFile.getText()
             var $outResponseBody : Text:=""
+            var $closeButtonText : Text:=Localized string("OAuth2_Response_Close")
 
-            PROCESS 4D TAGS($responseFileContent; $outResponseBody; $pageTitle; $pageMessage; $pageDetails)
+            PROCESS 4D TAGS($responseFileContent; $outResponseBody; $pageTitle; $pageMessage; $pageDetails; $closeButtonText)
 
             $outResponse.status:=200
             $outResponse.body:=$outResponseBody

Resources/en.lproj/NetKitEN.xlf

@@ -89,6 +89,10 @@
           <source>You may now close this window</source>
           <target>You may now close this window</target>
         </trans-unit>
+        <trans-unit resname="OAuth2_Response_Close">
+          <source>Close</source>
+          <target>Close</target>
+        </trans-unit>
         <trans-unit resname="List_No_Next_Page">
           <source>No next page.</source>
           <target>No next page.</target>

Resources/fr.lproj/NetKitFR.xlf

@@ -89,6 +89,10 @@
           <source>You may now close this window</source>
           <target>Vous pouvez maintenant fermer la fenêtre</target>
         </trans-unit>
+        <trans-unit resname="OAuth2_Response_Close">
+          <source>Close</source>
+          <target>Fermer</target>
+        </trans-unit>
         <trans-unit resname="List_No_Next_Page">
           <source>No next page.</source>
           <target>Pas de page suivante.</target>

Resources/responseTemplate.html

@@ -95,6 +95,15 @@
     <div id="title"><h2><!--#4DTEXT $1--></h2></div>
     <div id="message"><p><!--#4DHTML $2--></p></div>
     <div id="details"><code><p><!--#4DTEXT $3--></p></code></div>
+    <button id="closeBtn" onclick="window.close();" style="margin-top:22px;padding:10px 28px 10px 18px;font-size:1em;border-radius:6px;border:none;background:#4e7ad2;color:#fff;cursor:pointer;box-shadow:0 2px 8px rgba(44,75,121,0.10);transition:background 0.2s;display:inline-flex;align-items:center;gap:10px;">
+        <span style="display:inline-flex;align-items:center;">
+            <svg width="20" height="20" viewBox="0 0 20 20" fill="none" style="margin-right:6px;" xmlns="http://www.w3.org/2000/svg">
+                <circle cx="10" cy="10" r="10" fill="#fff" opacity="0.18"/>
+                <path d="M6 6L14 14M14 6L6 14" stroke="#fff" stroke-width="2" stroke-linecap="round"/>
+            </svg>
+            <!--#4DTEXT $4-->
+        </span>
+    </button>
 </div>
 </body>
 </html>