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

CB-3985 show password for all users if local provider is enabled #2113

Merged
merged 6 commits into from
Nov 10, 2023
Merged

CB-3985 show password for all users if local provider is enabled #2113

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
041b54a
CB-3985 show password for all users if local provider is enabled
devnaumov Nov 8, 2023
7a4f3b2
CB-3985 remove extra imports
devnaumov Nov 8, 2023
433583c
CB-3985 review fixes
devnaumov Nov 9, 2023
28bdc4a
Merge branch 'devel' into CB-3985-password-sso-user
dariamarutkina Nov 10, 2023
fffc456
Merge branch 'devel' into CB-3985-password-sso-user
dariamarutkina Nov 10, 2023
ea50390
Merge branch 'devel' into CB-3985-password-sso-user
dariamarutkina Nov 10, 2023
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
10 changes: 8 additions & 2 deletions ...ication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import { observer } from 'mobx-react-lite';

import { isLocalUser, UsersResource } from '@cloudbeaver/core-authentication';
import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, isLocalUser, UsersResource } from '@cloudbeaver/core-authentication';
import { Container, GroupTitle, InputField, useCustomInputValidation, useResource, useTranslate } from '@cloudbeaver/core-blocks';
import { FormMode } from '@cloudbeaver/core-ui';
import { isValuesEqual } from '@cloudbeaver/core-utils';
Expand All @@ -32,7 +32,13 @@ export const UserFormInfoCredentials = observer<Props>(function UserFormInfoCred
{ key: tabState.initialState.userId, includes: ['includeMetaParameters'] },
{ active: tabSelected && editing },
);
const local = !editing || (userInfo.data && isLocalUser(userInfo.data));
const authProvidersResource = useResource(UserFormInfoCredentials, AuthProvidersResource, null);

let local = authProvidersResource.resource.isEnabled(AUTH_PROVIDER_LOCAL_ID);

if (!local) {
local = !editing || (!!userInfo.data && isLocalUser(userInfo.data));
}

const passwordRepeatRef = useCustomInputValidation<string>(value => {
if (!isValuesEqual(value, tabState.state.password, null)) {
Expand Down
Loading