fix: update authenticate method for step 1 (#8506)

fix: update authenticate method for step 1 #8480 Signed-off-by: jgomer2001 <bonustrack310@gmail.com> Co-authored-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com>
JanssenProject · May 14, 2024 · 271e195 · 271e195
1 parent 66aa86b
commit 271e195
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/jans-casa/extras/casa-external_fido2.py b/jans-casa/extras/casa-external_fido2.py
@@ -73,6 +73,11 @@ def authenticate(self, configurationAttributes, requestParameters, step):
             print "Fido2. Authenticate for step 1"
             identity.setWorkingParameter("platformAuthenticatorAvailable",ServerUtil.getFirstValue(requestParameters, "loginForm:platformAuthenticator"))
 
+            # Modified for Casa compliance
+            authenticated_user = authenticationService.getAuthenticatedUser()
+            if authenticated_user != None:
+                return True
+
             user_password = credentials.getPassword()
             logged_in = False
             if StringHelper.isNotEmptyString(user_name) and StringHelper.isNotEmptyString(user_password):

diff --git a/jans-casa/extras/casa-external_super_gluu.py b/jans-casa/extras/casa-external_super_gluu.py
@@ -259,7 +259,11 @@ def authenticate(self, configurationAttributes, requestParameters, step):
 
                 return True
             elif self.twoStep:
-                authenticated_user = self.processBasicAuthentication(credentials)
+                # Modified for Casa compliance
+                authenticated_user = authenticationService.getAuthenticatedUser()
+                if authenticated_user == None:
+                    authenticated_user = self.processBasicAuthentication(credentials)
+
                 if authenticated_user == None:
                     return False