Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 6 additions & 16 deletions packages/apps/human-app/frontend/src/api/auth-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@ import {
} from '@/shared/schemas';
import { type BrowserAuthProvider } from '@/shared/types/browser-auth-provider';
import { type HttpApiClient } from './http-api-client';
import { commonApiPaths } from './common-api-paths';

export interface AuthProvider {
getAccessToken: () => Promise<string | null>;
refreshAccessToken: () => Promise<void>;
}

const apiPaths = {
worker: {
signIn: {
path: '/auth/signin',
},
},
} as const;
signIn: '/auth/signin',
refresh: '/auth/refresh',
};

export class AuthService implements AuthProvider {
private readonly browserAuthProvider: BrowserAuthProvider =
Expand All @@ -33,7 +29,7 @@ export class AuthService implements AuthProvider {

async signIn(data: SignInDto): Promise<AuthTokensSuccessResponse> {
const res = await this.httpClient.post<AuthTokensSuccessResponse>(
apiPaths.worker.signIn.path,
apiPaths.signIn,
{
successSchema: authTokensSuccessResponseSchema,
body: data,
Expand Down Expand Up @@ -70,12 +66,6 @@ export class AuthService implements AuthProvider {
}

async refreshAccessToken(): Promise<void> {
const authType = this.browserAuthProvider.getAuthType();

if (!authType) {
throw new Error('Auth type not found');
}

if (!AuthService.refreshPromise) {
AuthService.refreshPromise = this.fetchTokenRefresh();
}
Expand All @@ -88,7 +78,7 @@ export class AuthService implements AuthProvider {
throw new Error('Failed to refresh access token');
}

browserAuthProvider.signIn(tokens, authType);
browserAuthProvider.signIn(tokens);
}

private async fetchTokenRefresh(): Promise<AuthTokensSuccessResponse | null> {
Expand All @@ -100,7 +90,7 @@ export class AuthService implements AuthProvider {

try {
const response = await this.httpClient.post<AuthTokensSuccessResponse>(
commonApiPaths.auth.refresh.path,
apiPaths.refresh,
{
body: {
refresh_token: refreshToken,
Expand Down
7 changes: 0 additions & 7 deletions packages/apps/human-app/frontend/src/api/common-api-paths.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,28 @@ import { useMutation } from '@tanstack/react-query';
import { useNavigate } from 'react-router-dom';
import { useAuth } from '@/modules/auth/hooks/use-auth';
import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
import type { AuthType } from '@/shared/types/browser-auth-provider';
import { useWeb3Auth } from '@/modules/auth-web3/hooks/use-web3-auth';
import { routerPaths } from '@/router/router-paths';
import { authService } from '../authorized-http-api-client';

type RefreshAccessTokenParams = {
throwExpirationModalOnSignOut?: boolean;
};

export function useAccessTokenRefresh() {
const navigate = useNavigate();
const { signOut: web2SignOut, user: web2User } = useAuth();

const { signOut: web3SignOut, user: web3User } = useWeb3Auth();
const { user, signOut } = useAuth();

const mutation = useMutation({
mutationFn: async ({
authType,
throwExpirationModalOnSignOut = true,
}: {
authType: AuthType;
throwExpirationModalOnSignOut?: boolean;
}) => {
mutationFn: async (params?: RefreshAccessTokenParams) => {
const throwExpirationModalOnSignOut =
params?.throwExpirationModalOnSignOut ?? true;

try {
await authService.refreshAccessToken();
} catch (error) {
console.error(error);
if (authType === 'web2' && web2User) {
web2SignOut({ throwExpirationModal: false });
}
if (authType === 'web3' && web3User) {
web3SignOut({ throwExpirationModal: false });
if (user) {
signOut({ throwExpirationModal: false });
}
browserAuthProvider.signOut({
triggerSignOutSubscriptions: throwExpirationModalOnSignOut,
Expand All @@ -45,8 +39,16 @@ export function useAccessTokenRefresh() {
});

return {
refreshAccessToken: mutation.mutate,
refreshAccessTokenAsync: mutation.mutateAsync,
refreshAccessToken: (
params?: RefreshAccessTokenParams,
options?: Parameters<typeof mutation.mutate>[1]
) => {
mutation.mutate(params, options);
},
refreshAccessTokenAsync: (
params?: RefreshAccessTokenParams,
options?: Parameters<typeof mutation.mutateAsync>[1]
) => mutation.mutateAsync(params, options),
isRefreshingAccessToken: mutation.isPending,
};
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 6 additions & 9 deletions packages/apps/human-app/frontend/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import '@fontsource/inter/800.css';
import '@fontsource/roboto/400.css';
import '@fontsource/roboto/500.css';
import { WalletConnectProvider } from '@/shared/contexts/wallet-connect';
import { Web3AuthProvider } from '@/modules/auth-web3/context/web3-auth-context';
import { JWTExpirationCheck } from '@/shared/contexts/jwt-expiration-check';
import { ColorModeProvider } from '@/shared/contexts/color-mode';
import { NotificationProvider } from '@/shared/providers/notifications-provider';
Expand All @@ -39,14 +38,12 @@ createRoot(root).render(
<BrowserRouter>
<WalletConnectProvider>
<ModalProvider>
<Web3AuthProvider>
<AuthProvider>
<GlobalModal />
<JWTExpirationCheck>
<Router />
</JWTExpirationCheck>
</AuthProvider>
</Web3AuthProvider>
<AuthProvider>
<GlobalModal />
<JWTExpirationCheck>
<Router />
</JWTExpirationCheck>
</AuthProvider>
</ModalProvider>
</WalletConnectProvider>
</BrowserRouter>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading