Skip to content

feat: allow creating manual oidc/github based users #9000

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

Merged
merged 15 commits into from
Aug 11, 2023
Merged

feat: allow creating manual oidc/github based users #9000

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bdec01f
feat: allow creating manual oidc/github based users
Emyrk Aug 8, 2023
11b7a67
Add unit test for oidc and no login type create
Emyrk Aug 9, 2023
c262998
make gen
Emyrk Aug 9, 2023
3f08b16
Begin FE selector
Emyrk Aug 9, 2023
5dca493
fix selector onchange
Emyrk Aug 9, 2023
c04285c
FE
Emyrk Aug 9, 2023
4b71284
formatting
Emyrk Aug 9, 2023
873110a
update golden files
Emyrk Aug 9, 2023
c9128ce
Add more phrasing
Emyrk Aug 9, 2023
1e1c135
Add more phrasing
Emyrk Aug 9, 2023
6dc874c
fix js selector
Emyrk Aug 9, 2023
c62c4ed
jsx test debugging
Emyrk Aug 9, 2023
c237c70
Fix js test
Emyrk Aug 9, 2023
f7a01a4
linting
Emyrk Aug 9, 2023
fd6752a
Change to open id connect
Emyrk Aug 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
Prev Previous commit
Next Next commit
FE
  • Loading branch information
@Emyrk
Emyrk committed Aug 9, 2023
commit c04285ca14ca024cd724ca91c3ac6bf22a892ec1
30 changes: 23 additions & 7 deletions site/src/components/CreateUserForm/CreateUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { FullPageForm } from "../FullPageForm/FullPageForm"
import { Stack } from "../Stack/Stack"
import { ErrorAlert } from "components/Alert/ErrorAlert"
import { hasApiFieldErrors, isApiError } from "api/errors"
import Select from "@mui/material/Select"
import MenuItem from "@mui/material/MenuItem"

export const Language = {
Expand Down Expand Up @@ -41,13 +40,18 @@ const validationSchema = Yup.object({
.trim()
.email(Language.emailInvalid)
.required(Language.emailRequired),
password: Yup.string().required(Language.passwordRequired),
password: Yup.string().when("login_type", {
is: "password",
then: (schema) => schema.required(Language.passwordRequired),
otherwise: (schema) => schema,
}),
username: nameValidator(Language.usernameLabel),
})

const authMethodSelect = (
title: string,
value: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- future will use this
description: string,
) => {
return (
Expand Down Expand Up @@ -138,25 +142,37 @@ export const CreateUserForm: FC<
label={Language.emailLabel}
/>
<TextField
{...getFieldHelpers("password")}
{...getFieldHelpers(
"password",
form.values.login_type === "password"
? ""
: "No password required for this login type",
)}
autoComplete="current-password"
fullWidth
id="password"
disabled={form.values.login_type !== "password"}
label={Language.passwordLabel}
type="password"
/>
<Select
// {...getFieldHelpers("userLoginType", "ss")}
labelId="user-login-type"
<TextField
{...getFieldHelpers(
"login_type",
"Authentication method for this user",
)}
select
id="login_type"
value={form.values.login_type}
label="Login Type"
onChange={async (e) => {
if (e.target.value !== "password") {
await form.setFieldValue("password", "")
}
await form.setFieldValue("login_type", e.target.value)
}}
>
{methods}
</Select>
</TextField>
</Stack>
<FormFooter onCancel={onCancel} isLoading={isLoading} />
</form>
Expand Down