🐞 Can't login on alt auth method with openid as main (#395) (#396)

Parent issue: sequentech/meta#913
sequentech · May 16, 2024 · 18d82c1 · 18d82c1
1 parent a6d22a2
commit 18d82c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/avRegistration/login-directive/login-directive.js b/avRegistration/login-directive/login-directive.js
@@ -848,6 +848,7 @@ angular.module('avRegistration')
             return;
           }
 
+          scope.isOpenId = altAuthMethod.auth_method === 'openid-connect';
           scope.current_alt_auth_method_id = altAuthMethod.id;
           authevent.extra_fields = altAuthMethod.extra_fields;
           authevent.auth_method_config = altAuthMethod.auth_method_config;

diff --git a/dist/appCommon-vmaster.js b/dist/appCommon-vmaster.js
@@ -666,9 +666,10 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 var authevent = angular.copy(scope.base_authevent);
                 if (null === altAuthMethod) return scope.current_alt_auth_method_id = null, scope.isOpenId = scope.isOpenId || "openid-connect" === authevent.auth_method, 
                 void scope.apply(authevent);
-                altAuthMethod.id !== scope.current_alt_auth_method_id && (isClick && "smart-link" !== scope.selectedAltMethod && "smart-link" === altAuthMethod.auth_method_name || (scope.current_alt_auth_method_id = altAuthMethod.id, 
-                authevent.extra_fields = altAuthMethod.extra_fields, authevent.auth_method_config = altAuthMethod.auth_method_config, 
-                authevent.auth_method = altAuthMethod.auth_method_name, scope.apply(authevent)));
+                altAuthMethod.id !== scope.current_alt_auth_method_id && (isClick && "smart-link" !== scope.selectedAltMethod && "smart-link" === altAuthMethod.auth_method_name || (scope.isOpenId = "openid-connect" === altAuthMethod.auth_method, 
+                scope.current_alt_auth_method_id = altAuthMethod.id, authevent.extra_fields = altAuthMethod.extra_fields, 
+                authevent.auth_method_config = altAuthMethod.auth_method_config, authevent.auth_method = altAuthMethod.auth_method_name, 
+                scope.apply(authevent)));
             }, scope.apply = function(authevent) {
                 scope.hasOtpFieldsCode = Authmethod.hasOtpCodeField(authevent), scope.method = authevent.auth_method, 
                 scope.oidc_providers = authevent.oidc_providers, scope.current_oidc_providers = getCurrentOidcProviders(authevent),