mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix typeorm .save usage (no-changelog) (#8678)

Browse Source
This commit is contained in:
Tomi Turtiainen
2024-02-20 17:34:54 +02:00
committed by GitHub
parent afd2eb1f4a
commit 05e13a68ea
14 changed files with 96 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/cli/src/sso/saml/saml.service.ee.ts
View File

@@ -287,13 +287,18 @@ export class SamlService {
let result: Settings;
if (samlPreferences) {
samlPreferences.value = settingsValue;
result = await Container.get(SettingsRepository).save(samlPreferences);
} else {
result = await Container.get(SettingsRepository).save({
key: SAML_PREFERENCES_DB_KEY,
value: settingsValue,
loadOnStartup: true,
result = await Container.get(SettingsRepository).save(samlPreferences, {
transaction: false,
});
} else {
result = await Container.get(SettingsRepository).save(
{
key: SAML_PREFERENCES_DB_KEY,
value: settingsValue,
loadOnStartup: true,
},
{ transaction: false },
);
}
if (result) return jsonParse<SamlPreferences>(result.value);
return;

10
packages/cli/src/sso/saml/samlHelpers.ts
View File

@@ -109,10 +109,12 @@ export async function createUserFromSamlAttributes(attributes: SamlUserAttribute
authIdentity.providerId = attributes.userPrincipalName;
authIdentity.providerType = 'saml';
authIdentity.user = user;
const resultAuthIdentity = await Container.get(AuthIdentityRepository).save(authIdentity);
const resultAuthIdentity = await Container.get(AuthIdentityRepository).save(authIdentity, {
transaction: false,
});
if (!resultAuthIdentity) throw new AuthError('Could not create AuthIdentity');
user.authIdentities = [authIdentity];
const resultUser = await Container.get(UserRepository).save(user);
const resultUser = await Container.get(UserRepository).save(user, { transaction: false });
if (!resultUser) throw new AuthError('Could not create User');
return resultUser;
}
@@ -133,10 +135,10 @@ export async function updateUserFromSamlAttributes(
} else {
samlAuthIdentity.providerId = attributes.userPrincipalName;
}
await Container.get(AuthIdentityRepository).save(samlAuthIdentity);
await Container.get(AuthIdentityRepository).save(samlAuthIdentity, { transaction: false });
user.firstName = attributes.firstName;
user.lastName = attributes.lastName;
const resultUser = await Container.get(UserRepository).save(user);
const resultUser = await Container.get(UserRepository).save(user, { transaction: false });
if (!resultUser) throw new AuthError('Could not create User');
return resultUser;
}

13
packages/cli/src/sso/ssoHelpers.ts
View File

@@ -13,11 +13,14 @@ export async function setCurrentAuthenticationMethod(
authenticationMethod: AuthProviderType,
): Promise<void> {
config.set('userManagement.authenticationMethod', authenticationMethod);
await Container.get(SettingsRepository).save({
key: 'userManagement.authenticationMethod',
value: authenticationMethod,
loadOnStartup: true,
});
await Container.get(SettingsRepository).save(
{
key: 'userManagement.authenticationMethod',
value: authenticationMethod,
loadOnStartup: true,
},
{ transaction: false },
);
}
export function getCurrentAuthenticationMethod(): AuthProviderType {