Skip to content

Commit 135020f

Browse files
code rabbit suggestions
1 parent 2fa4037 commit 135020f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

admin-ui/app/redux/sagas/LicenseSaga.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,19 @@ let defaultToken: ApiTokenResponse | undefined
4040
const getBackendStatusFromError = (error: unknown) => {
4141
const err = error as ApiErrorLike
4242
const statusCode = typeof err?.response?.status === 'number' ? err.response.status : null
43-
const errorMessage = err?.response?.data?.responseMessage ?? err?.response?.data?.message ?? null
44-
return { active: false as const, errorMessage: errorMessage ?? null, statusCode }
43+
const errorMessage =
44+
err?.response?.data?.responseMessage ??
45+
err?.response?.data?.message ??
46+
(err instanceof Error ? err.message : error != null ? String(error) : 'Network error')
47+
return { active: false as const, errorMessage, statusCode }
4548
}
4649

4750
export function* getAccessToken() {
4851
if (!defaultToken) {
4952
try {
5053
defaultToken = (yield call(fetchApiTokenWithDefaultScopes)) as ApiTokenResponse
5154
yield put(setApiDefaultToken(defaultToken))
55+
yield put(setBackendStatus({ active: true, errorMessage: null, statusCode: null }))
5256
} catch (error) {
5357
devLogger.error('Failed to fetch API token with default scopes', error)
5458
yield put(setBackendStatus(getBackendStatusFromError(error)))

0 commit comments

Comments
 (0)