Skip to content

Commit 940feea

Browse files
committed
chore(ui): get rid of axios dependency
1 parent 99889bf commit 940feea

13 files changed

Lines changed: 140 additions & 227 deletions

File tree

components/secutils-webui/package-lock.json

Lines changed: 18 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/secutils-webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@emotion/css": "^11.13.5",
4545
"@emotion/react": "^11.14.0",
4646
"@monaco-editor/react": "^4.7.0",
47-
"@ory/client": "^1.22.23",
47+
"@ory/kratos-client-fetch": "^25.4.0",
4848
"moment": "^2.30.1",
4949
"monaco-editor": "^0.55.1",
5050
"nanoid": "^5.1.6",

components/secutils-webui/src/app_container/settings_flyout.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
EuiTitle,
2020
} from '@elastic/eui';
2121
import { css } from '@emotion/react';
22-
import type { UiNodeInputAttributes } from '@ory/client';
22+
import type { UiNodeInputAttributes } from '@ory/kratos-client-fetch';
2323
import { unix, utc } from 'moment/moment';
2424
import type { ChangeEvent } from 'react';
2525
import { lazy, useCallback, useState } from 'react';
@@ -89,7 +89,7 @@ export function SettingsFlyout({ onClose }: Props) {
8989
refreshUiState();
9090
};
9191

92-
const { data: flow } = await api.createBrowserSettingsFlow();
92+
const flow = await api.createBrowserSettingsFlow();
9393
const publicKeyNode = flow?.ui?.nodes?.find(
9494
(node) =>
9595
node.attributes.node_type === 'input' && node.attributes.name === 'webauthn_register_trigger',
@@ -123,7 +123,7 @@ export function SettingsFlyout({ onClose }: Props) {
123123
setIsReauthenticateModalVisible({
124124
visible: true,
125125
action: async () => {
126-
const { data: updatedFlow } = await api.getSettingsFlow({ id: flow.id });
126+
const updatedFlow = await api.getSettingsFlow({ id: flow.id });
127127
await api.updateSettingsFlow({
128128
flow: flow.id,
129129
updateSettingsFlowBody: {
@@ -142,8 +142,8 @@ export function SettingsFlyout({ onClose }: Props) {
142142

143143
updateState();
144144
})
145-
.catch((err: Error) => {
146-
const originalErrorMessage = getSecurityErrorMessage(err);
145+
.catch(async (err: Error) => {
146+
const originalErrorMessage = await getSecurityErrorMessage(err);
147147
setSetPasskeyStatus({ status: 'failed', error: originalErrorMessage ?? 'Unknown error' });
148148

149149
addToast({
@@ -235,7 +235,7 @@ export function SettingsFlyout({ onClose }: Props) {
235235
refreshUiState();
236236
};
237237

238-
const { data: flow } = await api.createBrowserSettingsFlow();
238+
const flow = await api.createBrowserSettingsFlow();
239239
try {
240240
await api.updateSettingsFlow({
241241
flow: flow.id,
@@ -254,7 +254,7 @@ export function SettingsFlyout({ onClose }: Props) {
254254
setIsReauthenticateModalVisible({
255255
visible: true,
256256
action: async () => {
257-
const { data: updatedFlow } = await api.getSettingsFlow({ id: flow.id });
257+
const updatedFlow = await api.getSettingsFlow({ id: flow.id });
258258
await api.updateSettingsFlow({
259259
flow: flow.id,
260260
updateSettingsFlowBody: {
@@ -272,8 +272,8 @@ export function SettingsFlyout({ onClose }: Props) {
272272

273273
updateState();
274274
})
275-
.catch((err: Error) => {
276-
const originalErrorMessage = getSecurityErrorMessage(err);
275+
.catch(async (err: Error) => {
276+
const originalErrorMessage = await getSecurityErrorMessage(err);
277277
setSetPasswordStatus({ status: 'failed', error: originalErrorMessage ?? 'Unknown error' });
278278

279279
addToast({

components/secutils-webui/src/hooks/page_header_actions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export function usePageHeaderActions() {
8080
getOryApi()
8181
.then(async (api) => {
8282
const flow = await api.createBrowserLogoutFlow();
83-
await api.updateLogoutFlow({ token: flow.data.logout_token });
83+
await api.updateLogoutFlow({ token: flow.logout_token });
8484

8585
window.location.replace('/signin');
8686
setTimeout(() => window.location.reload(), 500);

components/secutils-webui/src/model/errors.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
import { isOryError } from './security_flows';
2-
3-
export function isAbortError(err: unknown) {
4-
return (
5-
(err instanceof DOMException || isOryError(err)) && (err.name === 'AbortError' || err.name === 'CanceledError')
6-
);
7-
}
1+
import { ResponseError as OryResponseError } from '@ory/kratos-client-fetch';
82

93
export function getErrorMessage(err: unknown) {
10-
return (
11-
(isOryError(err) ? err.response?.data?.error?.reason || err.response?.data?.error?.message : undefined) ||
12-
(err as Error).message ||
13-
'Unknown error'
14-
);
4+
return (err as Error)?.message || 'Unknown error';
155
}
166

177
export function isClientError(err: unknown) {
@@ -24,8 +14,8 @@ export function getErrorStatus(err: unknown) {
2414
return err.status;
2515
}
2616

27-
if (isOryError(err)) {
28-
return err.response?.status;
17+
if (err instanceof OryResponseError) {
18+
return err.response.status;
2919
}
3020
}
3121

0 commit comments

Comments
 (0)