mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Skip SAML onboarding for users with first- and lastname (#5966)

Browse source 
skip onboarding for users with first- and lastname
This commit is contained in:
Michael Auerswald 2023-04-13 10:09:50 +02:00 committed by GitHub
parent 02ab1e7eef
commit 8474cd386d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/sso/saml/routes/saml.controller.ee.ts
View file

@ -104,7 +104,7 @@ export class SamlController {
private async acsHandler(req: express.Request, res: express.Response, binding: SamlLoginBinding) { private async acsHandler(req: express.Request, res: express.Response, binding: SamlLoginBinding) {
const loginResult = await this.samlService.handleSamlLogin(req, binding); const loginResult = await this.samlService.handleSamlLogin(req, binding);
if (loginResult) { if (loginResult) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access // return attributes if this is a test connection
if (req.body.RelayState && req.body.RelayState === getServiceProviderConfigTestReturnUrl()) { if (req.body.RelayState && req.body.RelayState === getServiceProviderConfigTestReturnUrl()) {
return res.status(202).send(loginResult.attributes); return res.status(202).send(loginResult.attributes);
} }

5
packages/cli/src/sso/saml/saml.service.ee.ts
View file

@ -154,7 +154,7 @@ export class SamlService {
relations: ['globalRole', 'authIdentities'], relations: ['globalRole', 'authIdentities'],
}); });
if (user) { if (user) {
// Login path for existing users that are fully set up // Login path for existing users that are fully set up and that have a SAML authIdentity set up
if ( if (
user.authIdentities.find( user.authIdentities.find(
(e) => e.providerType === 'saml' && e.providerId === attributes.userPrincipalName, (e) => e.providerType === 'saml' && e.providerId === attributes.userPrincipalName,
@ -168,10 +168,11 @@ export class SamlService {
} else { } else {
// Login path for existing users that are NOT fully set up for SAML // Login path for existing users that are NOT fully set up for SAML
const updatedUser = await updateUserFromSamlAttributes(user, attributes); const updatedUser = await updateUserFromSamlAttributes(user, attributes);
const onboardingRequired = !updatedUser.firstName || !updatedUser.lastName;
return { return {
authenticatedUser: updatedUser, authenticatedUser: updatedUser,
attributes, attributes,
onboardingRequired: true, onboardingRequired,
}; };
} }
} else { } else {