-
Notifications
You must be signed in to change notification settings - Fork 54
fix(errors): type server/auth errors and restore type compatibility #1561
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.
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
Open
workos-sdk-automation
wants to merge
3
commits into
main
Choose a base branch
from
reset-error-types
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
7c66a71
fix: Type error responses and throw on unrecognized webhook events
gjtorikian 98fb7cb
fix(types): make WorkOSResponseError compatible with WorkOSErrorData
gjtorikian d88636f
fix: address review comments on error handling and event deserialization
devin-ai-integration[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { | ||
| GenericServerException, | ||
| WorkOSErrorData, | ||
| } from './generic-server.exception'; | ||
|
|
||
| export type AuthenticationErrorCode = | ||
| | 'email_verification_required' | ||
| | 'organization_selection_required' | ||
| | 'mfa_enrollment' | ||
| | 'mfa_challenge' | ||
| | 'mfa_verification' | ||
| | 'sso_required'; | ||
|
|
||
| export interface AuthenticationErrorData extends WorkOSErrorData { | ||
| code: AuthenticationErrorCode; | ||
| pending_authentication_token?: string; | ||
| user?: Record<string, unknown>; | ||
| organizations?: Array<{ id: string; name: string }>; | ||
| } | ||
|
|
||
| const AUTHENTICATION_ERROR_CODES: ReadonlySet<string> = new Set<string>([ | ||
| 'email_verification_required', | ||
| 'organization_selection_required', | ||
| 'mfa_enrollment', | ||
| 'mfa_challenge', | ||
| 'mfa_verification', | ||
| 'sso_required', | ||
| ]); | ||
|
|
||
| export function isAuthenticationErrorData( | ||
| data: WorkOSErrorData, | ||
| ): data is AuthenticationErrorData { | ||
| return ( | ||
| typeof data.code === 'string' && AUTHENTICATION_ERROR_CODES.has(data.code) | ||
| ); | ||
| } | ||
|
|
||
| export class AuthenticationException extends GenericServerException { | ||
| readonly name = 'AuthenticationException'; | ||
| readonly pendingAuthenticationToken: string | undefined; | ||
|
|
||
| constructor( | ||
| status: number, | ||
| readonly rawData: AuthenticationErrorData, | ||
| requestID: string, | ||
| ) { | ||
| super(status, rawData.message, rawData, requestID); | ||
| this.pendingAuthenticationToken = rawData.pending_authentication_token; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,26 @@ | ||
| import { RequestException } from '../interfaces/request-exception.interface'; | ||
|
|
||
| export interface WorkOSErrorData { | ||
| code?: string; | ||
| message?: string; | ||
| [key: string]: unknown; | ||
| } | ||
|
|
||
| export class GenericServerException extends Error implements RequestException { | ||
| readonly name: string = 'GenericServerException'; | ||
| readonly message: string = 'The request could not be completed.'; | ||
| readonly code: string | undefined; | ||
|
|
||
| constructor( | ||
| readonly status: number, | ||
| message: string | undefined, | ||
| readonly rawData: unknown, | ||
| readonly rawData: WorkOSErrorData, | ||
| readonly requestID: string, | ||
| ) { | ||
| super(); | ||
| if (message) { | ||
| this.message = message; | ||
| } | ||
| this.code = rawData.code; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.