Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type SetupWizarContextValue = {
saveOrganizationData: (data: SetupWizardData['organizationData']) => Promise<void>;
completeSetupWizard: () => Promise<void>;
maxSteps: number;
checkUsernameAvailability: (username: string) => Promise<boolean>;
};

export const SetupWizardContext = createContext<SetupWizarContextValue>({
Expand Down Expand Up @@ -67,6 +68,7 @@ export const SetupWizardContext = createContext<SetupWizarContextValue>({
currentStep: 1,
completeSetupWizard: async () => undefined,
maxSteps: 4,
checkUsernameAvailability: async () => true,
});

export const useSetupWizardContext = (): SetupWizarContextValue => useContext(SetupWizardContext);
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
const loginWithPassword = useLoginWithPassword();
const setForceLogin = useSessionDispatch('forceLogin');
const createRegistrationIntent = useEndpoint('POST', '/v1/cloud.createRegistrationIntent');
const checkUsernameAvailabilityEndpoint = useEndpoint('GET', '/v1/users.checkUsernameAvailability');

const goToPreviousStep = useCallback(() => setCurrentStep((currentStep) => currentStep - 1), [setCurrentStep]);
const goToNextStep = useCallback(() => setCurrentStep((currentStep) => currentStep + 1), [setCurrentStep]);
Expand All @@ -68,6 +69,18 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
[t],
);

const checkUsernameAvailability = useCallback(
async (username: string): Promise<boolean> => {
try {
const { result } = await checkUsernameAvailabilityEndpoint({ username });
return result;
} catch {
return false;
}
},
[checkUsernameAvailabilityEndpoint],
);

const registerAdminUser = useCallback(
async ({
fullname,
Expand Down Expand Up @@ -207,6 +220,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
saveOrganizationData,
completeSetupWizard,
maxSteps: data.serverAlreadyRegistered ? 2 : 4,
checkUsernameAvailability,
}),
[
setupWizardData,
Expand All @@ -224,6 +238,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
saveWorkspaceData,
saveOrganizationData,
completeSetupWizard,
checkUsernameAvailability,
],
);

Expand Down
10 changes: 7 additions & 3 deletions packages/ui-client/src/views/setupWizard/steps/AdminInfoStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const AdminInfoStep = (): ReactElement => {
const regexpForUsernameValidation = useSetting('UTF8_User_Names_Validation');
const usernameRegExp = new RegExp(`^${regexpForUsernameValidation}$`);

const { currentStep, validateEmail, registerAdminUser, maxSteps } = useSetupWizardContext();
const { currentStep, validateEmail, registerAdminUser, maxSteps, checkUsernameAvailability } = useSetupWizardContext();

const passwordPolicyOptions = usePasswordPolicyOptions();
const validatePasswordPolicy = usePasswordPolicy(passwordPolicyOptions);
Expand All @@ -39,12 +39,16 @@ const AdminInfoStep = (): ReactElement => {
.join(', ');
}, [passwordPolicyValidations.validations, t]);

// TODO: check if username exists
const validateUsername = (username: string): boolean | string => {
const validateUsername = async (username: string): Promise<boolean | string> => {
if (!usernameRegExp.test(username) || hasBlockedName(username)) {
return t('Invalid_username');
}

const isAvailable = await checkUsernameAvailability(username);
if (!isAvailable) {
return t('Username_already_exist');
}

return true;
};

Expand Down
Loading