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

added openid and profile to scope #690

Closed
wants to merge 2 commits into from
Closed

added openid and profile to scope #690

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
73d2aa9
added openid and profile to scope
shaunlumbcgov Nov 25, 2024
404ed07
added the idtoken for passport and updated the logout routes to inclu…
shaunlumbcgov Nov 27, 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
4 changes: 3 additions & 1 deletion backend/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ utils.getOidcDiscovery().then(discovery => {
callbackURL: config.get('server:frontend') + '/api/auth/callback',
scope: discovery.scopes_supported,
kc_idp_hint: config.get('server:idirIDPHint')
}, (_issuer, _sub, profile, accessToken, refreshToken, done) => {
}, (_issuer, _sub, profile, accessToken, refreshToken, params, done) => {
const idToken = params.id_token;
if ((typeof (accessToken) === 'undefined') || (accessToken === null) ||
(typeof (refreshToken) === 'undefined') || (refreshToken === null)) {
return done('No access token', null);
Expand All @@ -116,6 +117,7 @@ utils.getOidcDiscovery().then(discovery => {
profile.jwtFrontend = auth.generateUiToken();
profile.jwt = accessToken;
profile.refreshToken = refreshToken;
profile.idToken = idToken;
return done(null, profile);
}));
//JWT strategy is used for authorization
Expand Down
48 changes: 24 additions & 24 deletions backend/src/routes/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ router.get(
"/login",
passport.authenticate("oidc", {
failureRedirect: "error",
scope: ['openid','profile']
})
);

Expand All @@ -54,34 +55,33 @@ function logout(req) {
}

//removes tokens and destroys session
router.get("/logout", async (req, res) => {
if (req?.session?.passport?.user) {
logout(req);
router.get("/logout", async (req, res, next) => {
let primaryURL = config.get('logoutEndpoint') + '?post_logout_redirect_uri=' + config.get('server:frontend');
let idToken = req?.session?.passport?.user?.idToken;
if (idToken) {
req.logout(function(err) {
if (err) {
return next(err);
}
req.session.destroy();
let retUrl;
if (req.query && req.query.sessionExpired) {
retUrl = encodeURIComponent(primaryURL + '/session-expired' + '&id_token_hint=' + idToken);
} else {
retUrl = encodeURIComponent(primaryURL + '/logout' + '&id_token_hint=' + idToken);
}
res.redirect(config.get('siteMinder_logout_endpoint') + retUrl);
});
}else {
let retUrl;
if (req.query && req.query.sessionExpired) {
retUrl = encodeURIComponent(
config.get("logoutEndpoint") +
"?post_logout_redirect_uri=" +
config.get("server:frontend") +
"/session-expired"
);
console.log("1")
retUrl = encodeURIComponent(primaryURL + '/session-expired' + '&client_id=' + config.get('oidc:clientId'));
} else {
retUrl = encodeURIComponent(

config.get("logoutEndpoint") +
"?post_logout_redirect_uri=" +
config.get("server:frontend") +
"/logout"
);
console.log("2")
retUrl = encodeURIComponent(primaryURL + '/logout' + '&client_id=' + config.get('oidc:clientId'));
}
res.redirect(config.get("siteMinder_logout_endpoint") + retUrl);
} else {
res.redirect(config.get("server:frontend") + "/logout");
// if (req.query && req.query.sessionExpired) {
// res.redirect(config.get("server:frontend") + "/session-expired");
// } else {
// res.redirect(config.get("server:frontend") + "/logout");
// }
res.redirect(config.get('siteMinder_logout_endpoint') + retUrl);
}
});

Expand Down