Fixed id_token being taken from the wrong place

.github/workflows/main_commit.yml

@@ -16,13 +16,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 9.6.0
+          version: 9
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: 22
           cache: "pnpm"
 
       - name: Install
@@ -38,13 +38,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 7.26.3
+          version: 9
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: 22
           cache: "pnpm"
 
       - name: Install

.github/workflows/pr_create.yml

@@ -14,13 +14,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 7.26.3
+          version: 9
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install
@@ -36,13 +36,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 7.26.3
+          version: 9
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install

eslint.config.js

@@ -1,22 +1,10 @@
 import globals from 'globals';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import js from '@eslint/js';
-import { FlatCompat } from '@eslint/eslintrc';
 import pluginVue from 'eslint-plugin-vue';
 import vueTsEslintConfig from '@vue/eslint-config-typescript';
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	recommendedConfig: js.configs.recommended,
-	allConfig: js.configs.all,
-});
-
 export default [
 	...tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended),
 	...pluginVue.configs['flat/recommended'],

src/api/controllers/auth/decorators.ts

@@ -65,19 +65,15 @@ export function checkToken<F extends Func<any, any>>(
 	method: F
 ): Func<Promise<ReturnType<F>>, Parameters<F>> {
 	return async (...args: any[]) => {
-		try {
-			const { error } = await apiClient.GET('/auth/me');
-			throw error;
-		} catch (err) {
-			const error = err as apiError;
-			if (error && error.message === 'Forbidden') {
-				const { deleteToken } = useProfileStore();
-				const toastStore = useToastStore();
-				deleteToken();
-				router.push('/auth');
-				toastStore.push({ title: 'Сессия истекла' });
-			}
+		const { response: checkResponse } = await apiClient.GET('/auth/me');
+		if (!checkResponse.ok && checkResponse.status === 403) {
+			const { deleteToken } = useProfileStore();
+			const toastStore = useToastStore();
+			deleteToken();
+			router.push('/auth');
+			toastStore.push({ title: 'Сессия истекла' });
 		}
+
 		const response = await method(...args);
 		return response;
 	};

src/models/index.ts

@@ -59,6 +59,13 @@ export enum SessionInfo {
 	Expires = 'expires',
 }
 
+export interface LoginError {
+	status: string;
+	message: string;
+	ru: string;
+	id_token: string;
+}
+
 // achievement models
 export type Reciever = achievementComponents['schemas']['RecieverGet'];
 export interface AchievementGet {

src/router/auth.ts

@@ -3,7 +3,7 @@ import { NavigationGuard, RouteRecordRaw } from 'vue-router';
 import { useProfileStore } from '@/store/profile';
 import { useToastStore } from '@/store/toast';
 import { AuthApi } from '@/api';
-import { UNKNOWN_DEVICE } from '@/models';
+import { UNKNOWN_DEVICE, LoginError } from '@/models';
 
 import apiClient from '@/api/';
 import { isAuthMethod } from '@/utils/authMethodName';
@@ -62,23 +62,29 @@ export const authHandler: NavigationGuard = async to => {
 			};
 		}
 
-		const { data, response } = profileStore.isUserLogged
+		const { response, data, error } = profileStore.isUserLogged
 			? await apiClient.POST(`/auth/${methodLink}/registration`, {
 					body: {
 						...to.query,
 						session_name: navigator.userAgent ?? UNKNOWN_DEVICE,
 					},
 				})
-			: await apiClient.POST(`/auth/${methodLink}/login`, { body: { ...to.query } });
+			: await apiClient.POST(`/auth/${methodLink}/login`, {
+					body: {
+						...to.query,
+						session_name: navigator.userAgent ?? UNKNOWN_DEVICE,
+					},
+				});
 
 		if (response.ok && data?.token) {
 			LocalStorage.set(LocalStorageItem.Token, data.token);
 			profileStore.updateToken();
 			toastStore.push({ title: 'Вы успешно вошли в аккаунт' });
 			return { path: '/profile', replace: true };
-		} else {
+		} else if (error) {
 			if (response.status === 401) {
-				const id_token = to.query.code;
+				const loginError = error as LoginError;
+				const id_token = loginError.id_token;
 
 				if (typeof id_token !== 'string') {
 					return {