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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悶 OIDC: Use Authorization Code Flow instead of implicit flow #388

Merged
merged 5 commits into from
Apr 17, 2024
Merged

馃悶 OIDC: Use Authorization Code Flow instead of implicit flow #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
734a7e2
wip
Findeton Apr 15, 2024
1d4b957
wip
Findeton Apr 16, 2024
40e50cb
wip
Findeton Apr 16, 2024
3edb844
wip
Findeton Apr 16, 2024
a534e53
wip
Findeton Apr 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
14 changes: 9 additions & 5 deletions avRegistration/login-directive/login-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ angular.module('avRegistration')

// validate csrf token format and data
var csrf = scope.csrf = angular.fromJson($cookies.get(OIDC_CSRF_COOKIE));
var uri = "?" + $window.location.hash.substr(1);
var uri = $window.location.search;

// NOTE: if you need to debug this callback, obtain the callback
// URL, get the callback received in the server (to obtain the
Expand Down Expand Up @@ -320,6 +320,7 @@ angular.module('avRegistration')
}
autheventid = scope.eventId = attrs.eventId = scope.csrf.eventId;
scope.selectedAltMethod = scope.csrf.altAuthMethodId;
scope.setLoginOIDC = true;
} else {
autheventid = scope.eventId = attrs.eventId;
}
Expand Down Expand Up @@ -375,11 +376,11 @@ angular.module('avRegistration')
// obtain the openid login data
function getOpenidLoginData()
{
var uri = "?" + $window.location.hash.substr(1);
var uri = $window.location.search;

// Auth data to send back to our backend
var data = {
id_token: getURIParameter("id_token", uri),
code: getURIParameter("code", uri),
provider_id: scope.csrf.providerId,
nonce: scope.csrf.randomNonce
};
Expand All @@ -392,7 +393,7 @@ angular.module('avRegistration')
}

var postfix = "_authevent_" + scope.csrf.eventId;
$cookies.put("id_token_" + postfix, data.id_token, options);
$cookies.put("code_" + postfix, data.code, options);

return data;
}
Expand Down Expand Up @@ -1025,6 +1026,9 @@ angular.module('avRegistration')
) {
scope.loginUser(true);
}
if (scope.setLoginOIDC) {
scope.loginUser(true);
}
};

scope.view = function(id) {
Expand Down Expand Up @@ -1107,7 +1111,7 @@ angular.module('avRegistration')

// Craft the OpenID Connect auth URI
var authURI = (provider.public_info.authorization_endpoint +
"?response_type=id_token" +
"?response_type=code" +
"&client_id=" + encodeURIComponent(provider.public_info.client_id) +
"&scope=" + encodeURIComponent(provider.public_info.scope) +
"&redirect_uri=" + encodeURIComponent(
Expand Down
14 changes: 8 additions & 6 deletions dist/appCommon-v10.3.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,11 +513,12 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
if (!function() {
if (!$cookies.get("OIDC_CSRF")) return setOIDCErrorCookie("unexpectedOIDCRedirect"),
void redirectToLogin();
var csrf = scope.csrf = angular.fromJson($cookies.get("OIDC_CSRF")), uri = "?" + $window.location.hash.substr(1);
var csrf = scope.csrf = angular.fromJson($cookies.get("OIDC_CSRF")), uri = $window.location.search;
return $cookies.remove("OIDC_CSRF"), !!csrf && angular.isObject(csrf) && angular.isString(csrf.randomState) && angular.isString(csrf.randomNonce) && angular.isString(csrf.providerId) && angular.isNumber(csrf.created) && angular.isDefined(csrf.altAuthMethodId) && getURIParameter("state", uri) === csrf.randomState && csrf.created - Date.now() < ConfigService.authTokenExpirationSeconds ? 1 : (setOIDCErrorCookie("invalidCsrf"),
void redirectToLogin());
}()) return;
autheventid = scope.eventId = attrs.eventId = scope.csrf.eventId, scope.selectedAltMethod = scope.csrf.altAuthMethodId;
autheventid = scope.eventId = attrs.eventId = scope.csrf.eventId, scope.selectedAltMethod = scope.csrf.altAuthMethodId,
scope.setLoginOIDC = !0;
} else autheventid = scope.eventId = attrs.eventId;
scope.orgName = ConfigService.organization.orgName;
var autheventCookie = $cookies.get("authevent_" + adminId), authCookie = $cookies.get("auth_authevent_" + adminId);
Expand Down Expand Up @@ -591,13 +592,13 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
var data = {};
if (scope.isOpenId) data = function() {
var data = {
id_token: getURIParameter("id_token", "?" + $window.location.hash.substr(1)),
code: getURIParameter("code", $window.location.search),
provider_id: scope.csrf.providerId,
nonce: scope.csrf.randomNonce
}, options = {};
ConfigService.authTokenExpirationSeconds && (options.expires = new Date(Date.now() + 1e3 * ConfigService.authTokenExpirationSeconds));
var postfix = "_authevent_" + scope.csrf.eventId;
return $cookies.put("id_token_" + postfix, data.id_token, options), data;
return $cookies.put("code_" + postfix, data.code, options), data;
}(); else {
if (!scope.withCode && (scope.hasOtpFieldsCode || _.contains([ "sms-otp", "email-otp" ], scope.method)) && 0 === scope.currentFormStep) return void scope.resendAuthCode();
data.captcha_code = Authmethod.captcha_code;
Expand Down Expand Up @@ -699,7 +700,8 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
filledFields = _.filter(filledFields, function(el) {
return null !== el.value || "otp-code" === el.type;
});
!scope.isOpenId && filledFields.length !== scope.login_fields.length || scope.isOpenId || scope.isOtl || scope.isCensusQuery || scope.withCode || scope.oidcError || scope.loginUser(!0);
!scope.isOpenId && filledFields.length !== scope.login_fields.length || (scope.isOpenId || scope.isOtl || scope.isCensusQuery || scope.withCode || scope.oidcError || scope.loginUser(!0),
scope.setLoginOIDC && scope.loginUser(!0));
}, scope.view = function(id) {
Authmethod.viewEvent(id).then(function(altAuthMethod) {
"ok" === altAuthMethod.data.status ? (scope.base_authevent = angular.copy(altAuthMethod.data.events),
Expand All @@ -726,7 +728,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
created: Date.now(),
eventId: scope.eventId,
providerId: provider.public_info.id
}), options), authURI = provider.public_info.authorization_endpoint + "?response_type=id_token&client_id=" + encodeURIComponent(provider.public_info.client_id) + "&scope=" + encodeURIComponent(provider.public_info.scope) + "&redirect_uri=" + encodeURIComponent($window.location.origin + "/election/login-openid-connect-redirect") + "&state=" + randomState + "&nonce=" + authURI,
}), options), authURI = provider.public_info.authorization_endpoint + "?response_type=code&client_id=" + encodeURIComponent(provider.public_info.client_id) + "&scope=" + encodeURIComponent(provider.public_info.scope) + "&redirect_uri=" + encodeURIComponent($window.location.origin + "/election/login-openid-connect-redirect") + "&state=" + randomState + "&nonce=" + authURI,
$window.location.href = authURI) : setError("providerNotFound", "avRegistration.loginError.openid-connect.providerNotFound");
};
},
Expand Down
Loading