Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 16, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd761f7
wip
Findeton May 15, 2024
7968f87
Merge branch '10.4.x' into fix/meta-913/10.4.x
Findeton May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions avRegistration/login-directive/login-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions dist/appCommon-v10.4.2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading