Skip to content

fix: manage backend authXService errors #3190

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 5 commits into from
Jul 26, 2022
Merged

fix: manage backend authXService errors #3190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5899c44
fix: manage backend authXService errors
AbhineetJain Jul 25, 2022
f7c1560
fix stories
AbhineetJain Jul 25, 2022
047b6c7
add new stories
AbhineetJain Jul 25, 2022
6a71be5
fix lint
AbhineetJain Jul 25, 2022
9faca3c
fix error state stories
AbhineetJain Jul 26, 2022
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
fix stories
  • Loading branch information
@AbhineetJain
AbhineetJain committed Jul 25, 2022
commit f7c1560f4b65cf968561bb592b7bd709ad475d95
23 changes: 19 additions & 4 deletions site/src/components/SignInForm/SignInForm.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export default {
component: SignInForm,
argTypes: {
isLoading: "boolean",
authErrorMessage: "string",
onSubmit: { action: "Submit" },
},
}
Expand All @@ -16,7 +15,7 @@ const Template: Story<SignInFormProps> = (args: SignInFormProps) => <SignInForm
export const SignedOut = Template.bind({})
SignedOut.args = {
isLoading: false,
authErrorMessage: undefined,
authError: undefined,
onSubmit: () => {
return Promise.resolve()
},
Expand All @@ -33,12 +32,28 @@ Loading.args = {
}

export const WithLoginError = Template.bind({})
WithLoginError.args = { ...SignedOut.args, authErrorMessage: "Email or password was invalid" }
WithLoginError.args = {
...SignedOut.args,
authError: {
response: {
data: {
message: "Email or password was invalid",
validations: [
{
field: "password",
detail: "Password is invalid.",
},
],
},
},
isAxiosError: true,
},
}

export const WithAuthMethodsError = Template.bind({})
WithAuthMethodsError.args = {
...SignedOut.args,
methodsErrorMessage: "Failed to fetch auth methods",
methodsError: new Error("Failed to fetch auth methods"),
}

export const WithGithub = Template.bind({})
Expand Down
13 changes: 7 additions & 6 deletions site/src/xServices/auth/authXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { AxiosError } from "axios"
import { assign, createMachine } from "xstate"
import * as API from "../../api/api"
import * as TypesGen from "../../api/typesGenerated"
Expand Down Expand Up @@ -48,19 +47,21 @@ export const permissionsToCheck = {
type Permissions = Record<keyof typeof permissionsToCheck, boolean>

export interface AuthContext {
getUserError?: Error | unknown // not used anywhere
getUserError?: Error | unknown
// The getMethods API call does not return an ApiError.
// It can only error out in a generic fashion.
getMethodsError?: Error | unknown
authError?: Error | AxiosError | unknown
authError?: Error | unknown
updateProfileError?: Error | unknown
updateSecurityError?: Error | unknown
me?: TypesGen.User
methods?: TypesGen.AuthMethods
permissions?: Permissions
checkPermissionsError?: Error | unknown // not used anywhere
checkPermissionsError?: Error | unknown
// SSH
sshKey?: TypesGen.GitSSHKey
getSSHKeyError?: Error | unknown // not used anywhere
regenerateSSHKeyError?: Error | unknown // not used anywhere
getSSHKeyError?: Error | unknown
regenerateSSHKeyError?: Error | unknown
}

export type AuthEvent =
Expand Down