Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00
Code Issues Projects Releases Wiki Activity

fix: SA unique token bug (#2901)

Browse Source 
Fixes a small bug on service account token creation where the tokens the
new one was being validated against were not the most up-to-date ones.
This commit is contained in:
Nuno Góis 2023-01-16 12:10:08 +00:00 committed by GitHub
parent b3fcc97f93
commit 90d7737338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountCreateTokenDialog/ServiceAccountCreateTokenDialog.tsx
View File

@ -7,21 +7,21 @@ import {
PersonalAPITokenForm, PersonalAPITokenForm,
} from 'component/user/Profile/PersonalAPITokensTab/CreatePersonalAPIToken/PersonalAPITokenForm/PersonalAPITokenForm'; } from 'component/user/Profile/PersonalAPITokensTab/CreatePersonalAPIToken/PersonalAPITokenForm/PersonalAPITokenForm';
import { ICreatePersonalApiTokenPayload } from 'hooks/api/actions/usePersonalAPITokensApi/usePersonalAPITokensApi'; import { ICreatePersonalApiTokenPayload } from 'hooks/api/actions/usePersonalAPITokensApi/usePersonalAPITokensApi';
import { IServiceAccount } from 'interfaces/service-account'; import { IPersonalAPIToken } from 'interfaces/personalAPIToken';
const DEFAULT_EXPIRATION = ExpirationOption['30DAYS']; const DEFAULT_EXPIRATION = ExpirationOption['30DAYS'];
interface IServiceAccountCreateTokenDialogProps { interface IServiceAccountCreateTokenDialogProps {
open: boolean; open: boolean;
setOpen: React.Dispatch<React.SetStateAction<boolean>>; setOpen: React.Dispatch<React.SetStateAction<boolean>>;
serviceAccount: IServiceAccount; tokens: IPersonalAPIToken[];
onCreateClick: (newToken: ICreatePersonalApiTokenPayload) => void; onCreateClick: (newToken: ICreatePersonalApiTokenPayload) => void;
} }
export const ServiceAccountCreateTokenDialog = ({ export const ServiceAccountCreateTokenDialog = ({
open, open,
setOpen, setOpen,
serviceAccount, tokens,
onCreateClick, onCreateClick,
}: IServiceAccountCreateTokenDialogProps) => { }: IServiceAccountCreateTokenDialogProps) => {
const [patDescription, setPatDescription] = useState(''); const [patDescription, setPatDescription] = useState('');
@ -40,9 +40,7 @@ export const ServiceAccountCreateTokenDialog = ({
}, [open]); }, [open]);
const isDescriptionUnique = (description: string) => const isDescriptionUnique = (description: string) =>
!serviceAccount.tokens?.some( !tokens?.some(token => token.description === description);
token => token.description === description
);
const isPATValid = const isPATValid =
patDescription.length && patDescription.length &&

2
frontend/src/component/admin/serviceAccounts/ServiceAccountsTable/ServiceAccountModal/ServiceAccountTokens/ServiceAccountTokens.tsx
View File

@ -322,7 +322,7 @@ export const ServiceAccountTokens = ({
<ServiceAccountCreateTokenDialog <ServiceAccountCreateTokenDialog
open={createOpen} open={createOpen}
setOpen={setCreateOpen} setOpen={setCreateOpen}
serviceAccount={serviceAccount} tokens={tokens}
onCreateClick={onCreateClick} onCreateClick={onCreateClick}
/> />
<ServiceAccountTokenDialog <ServiceAccountTokenDialog