CB-4097 fix: detect auth role correctly

dbeaver · Nov 1, 2023 · 16e6f48 · 16e6f48
1 parent 2645f12
commit 16e6f48
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts b/...-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoPart.ts
@@ -68,7 +68,8 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
       !isValuesEqual(this.state.enabled, this.initialState.enabled, null) ||
       !isValuesEqual(this.state.password, this.initialState.password, null) ||
       !isObjectsEqual(this.state.metaParameters, this.initialState.metaParameters) ||
-      !isArraysEqual(this.state.teams, this.initialState.teams)
+      !isArraysEqual(this.state.teams, this.initialState.teams) ||
+      !isValuesEqual(this.state.authRole, this.initialState.authRole, '')
     );
   }
 
@@ -204,12 +205,12 @@ export class UserFormInfoPart extends FormPart<IUserFormInfoState, IUserFormStat
 
     this.setInitialState({
       userId: user?.userId || this.formState.state.userId || '',
-      enabled: user?.enabled || DEFAULT_ENABLED,
+      enabled: user?.enabled ?? DEFAULT_ENABLED,
       metaParameters: observable(user?.metaParameters || {}),
       teams: observable(user?.grantedTeams || [serverConfig?.defaultUserTeam].filter(isDefined)),
       password: '',
 
-      authRole: user?.authRole || serverConfig?.defaultAuthRole || '',
+      authRole: user?.authRole ?? serverConfig?.defaultAuthRole ?? '',
     });
   }
 }