refactor(core): Remove roleId indirection (no-changelog) (#8413)
This commit is contained in:
committed by
GitHub
parent
1affebd85e
commit
d6deceacde
@@ -174,7 +174,7 @@ export class SamlService {
|
||||
const lowerCasedEmail = attributes.email.toLowerCase();
|
||||
const user = await Container.get(UserRepository).findOne({
|
||||
where: { email: lowerCasedEmail },
|
||||
relations: ['globalRole', 'authIdentities'],
|
||||
relations: ['authIdentities'],
|
||||
});
|
||||
if (user) {
|
||||
// Login path for existing users that are fully set up and that have a SAML authIdentity set up
|
||||
|
||||
@@ -17,7 +17,6 @@ import {
|
||||
} from '../ssoHelpers';
|
||||
import { getServiceProviderConfigTestReturnUrl } from './serviceProvider.ee';
|
||||
import type { SamlConfiguration } from './types/requests';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
import { UserRepository } from '@db/repositories/user.repository';
|
||||
import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
|
||||
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
|
||||
@@ -104,7 +103,7 @@ export async function createUserFromSamlAttributes(attributes: SamlUserAttribute
|
||||
user.email = lowerCasedEmail;
|
||||
user.firstName = attributes.firstName;
|
||||
user.lastName = attributes.lastName;
|
||||
user.globalRole = await Container.get(RoleService).findGlobalMemberRole();
|
||||
user.role = 'global:member';
|
||||
// generates a password that is not used or known to the user
|
||||
user.password = await Container.get(PasswordUtility).hash(generatePassword());
|
||||
authIdentity.providerId = attributes.userPrincipalName;
|
||||
|
||||
Reference in New Issue
Block a user