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

Feature: Added option to not attempt sign out from Authentication server for OIDC users #1295

Merged
merged 1 commit into from
May 23, 2023
Merged

Feature: Added option to not attempt sign out from Authentication server for OIDC users #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions typescript/api/controllers/UserController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ declare var _;
declare var BrandingService, UsersService, ConfigService;
import * as uuidv4 from 'uuid/v4';

import { Controllers as controllers, RequestDetails} from '@researchdatabox/redbox-core-types';
import { Controllers as controllers, RequestDetails } from '@researchdatabox/redbox-core-types';


export module Controllers {
Expand Down Expand Up @@ -132,7 +132,7 @@ export module Controllers {
});
// instead of destroying the session, as per M$ directions, we only unset the user, so branding, etc. is retained in the session
_.unset(req.session, 'user');
res.redirect(redirUrl);
res.redirect(redirUrl);
}

public info(req, res) {
Expand Down Expand Up @@ -258,8 +258,8 @@ export module Controllers {

public openidConnectLogin(req, res) {
let passportIdentifier = 'oidc'
if(!_.isEmpty(req.param('id'))) {
passportIdentifier= `oidc-${req.param('id')}`
if (!_.isEmpty(req.param('id'))) {
passportIdentifier = `oidc-${req.param('id')}`
}
sails.config.passport.authenticate(passportIdentifier, function (err, user, info) {
sails.log.verbose("At openIdConnectAuth Controller, verify...");
Expand Down Expand Up @@ -287,7 +287,7 @@ export module Controllers {
if (_.startsWith(err, "Error: did not find expected authorization request details in session")) {
// letting the user try again seems to 'refresh' the session
req.session['data'] = `oidc-login-session-destroyed`;
return res.serverError();
return res.serverError();
}

if (_.isEmpty(err)) {
Expand All @@ -298,15 +298,15 @@ export module Controllers {
// "The specified data will be excluded from the JSON response and view locals if the app is running in the "production" environment (i.e. process.env.NODE_ENV === 'production')."
// so storing the data in session
if (_.isEmpty(req.session.data)) {
req.session['data'] = {
req.session['data'] = {
"message": 'error-auth',
"detailedMessager": `${err}${info}`
};
}

const url = `${BrandingService.getFullPath(req)}/home`;
return res.redirect(url);
}
return res.redirect(url);
}
let requestDetails = new RequestDetails(req);
UsersService.addUserAuditEvent(user, "login", requestDetails).then(response => {
sails.log.debug(`User login audit event created for OIDC login: ${_.isEmpty(user) ? '' : user.id}`)
Expand All @@ -326,8 +326,8 @@ export module Controllers {
public beginOidc(req, res) {
sails.log.verbose(`At OIDC begin flow, redirecting...`);
let passportIdentifier = 'oidc'
if(!_.isEmpty(req.param('id'))) {
passportIdentifier= `oidc-${req.param('id')}`
if (!_.isEmpty(req.param('id'))) {
passportIdentifier = `oidc-${req.param('id')}`
}
sails.config.passport.authenticate(passportIdentifier)(req, res);
}
Expand All @@ -344,17 +344,17 @@ export module Controllers {
sails.log.verbose(user);
if ((err) || (!user)) {
sails.log.error(err)
// means the provider has authenticated the user, but has been rejected, redirect to catch-all
// from https://sailsjs.com/documentation/reference/response-res/res-server-error
// "The specified data will be excluded from the JSON response and view locals if the app is running in the "production" environment (i.e. process.env.NODE_ENV === 'production')."
// so storing the data in session
if (_.isEmpty(req.session.data)) {
req.session['data'] = {
"message": 'error-auth',
"detailedMessager": `${err}${info}`
};
}
return res.serverError();
// means the provider has authenticated the user, but has been rejected, redirect to catch-all
// from https://sailsjs.com/documentation/reference/response-res/res-server-error
// "The specified data will be excluded from the JSON response and view locals if the app is running in the "production" environment (i.e. process.env.NODE_ENV === 'production')."
// so storing the data in session
if (_.isEmpty(req.session.data)) {
req.session['data'] = {
"message": 'error-auth',
"detailedMessager": `${err}${info}`
};
}
return res.serverError();
}

let requestDetails = new RequestDetails(req);
Expand Down
13 changes: 9 additions & 4 deletions typescript/api/services/UsersService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,15 @@ export module Services {

protected openIdConnectAuthVerifyCallback(oidcConfig, issuer, req, tokenSet, userinfo = undefined, done) {
const that = this;
req.session.logoutUrl = issuer.end_session_endpoint;
const postLogoutUris = _.get(oidcConfig.opts, 'client.post_logout_redirect_uris');
if (!_.isEmpty(postLogoutUris)) {
req.session.logoutUrl = `${req.session.logoutUrl}?post_logout_redirect_uri=${postLogoutUris[0]}`;
const logoutFromAuthServer = _.get(oidcConfig,'logoutFromAuthServer', true);
if(logoutFromAuthServer) {
req.session.logoutUrl = issuer.end_session_endpoint;
const postLogoutUris = _.get(oidcConfig.opts, 'client.post_logout_redirect_uris');
if (!_.isEmpty(postLogoutUris)) {
req.session.logoutUrl = `${req.session.logoutUrl}?post_logout_redirect_uri=${postLogoutUris[0]}`;
}
} else {
req.session.logoutUrl = sails.config.auth.postLogoutRedir
}
sails.log.verbose(`OIDC login success, tokenset: `);
sails.log.verbose(JSON.stringify(tokenSet));
Expand Down