From 2afcbc1808f1cbde8dc86e93f75924c29264baad Mon Sep 17 00:00:00 2001
From: Ilya Batuev <batuev.io18@physics.msu.ru>
Date: Sun, 24 Nov 2024 16:55:27 +0000
Subject: [PATCH 1/9] display single oauth method and disable it's unlinking

---
 src/views/profile/ProfileEditAuthView.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index bc10e31..9006d39 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -40,13 +40,14 @@ const canUnlinked = computed(() =>
 			</div>
 		</section>
 
-		<section v-if="profileStore.authMethods && profileStore.authMethods.length > 1" class="section">
+		<section v-if="profileStore.authMethods && profileStore.authMethods.length > 0" class="section">
 			<h2>Отвязать аккаунт</h2>
 			<div class="buttons">
 				<IrdomAuthButton
 					v-for="button of canUnlinked"
 					:key="button.method"
 					:button="button"
+					:disabled="canUnlinked.length === 1"
 					unlink
 				/>
 			</div>

From 50ed0b9c93fb73e2a9885bf61f25efd3c38a3a89 Mon Sep 17 00:00:00 2001
From: Ilya Batuev <batuev.io18@physics.msu.ru>
Date: Sun, 24 Nov 2024 21:14:47 +0000
Subject: [PATCH 2/9] fix admin panel display and typo

---
 src/views/admin/AdminView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/admin/AdminView.vue b/src/views/admin/AdminView.vue
index 7d4058a..5360188 100644
--- a/src/views/admin/AdminView.vue
+++ b/src/views/admin/AdminView.vue
@@ -45,7 +45,7 @@ onMounted(() => {
 
 <template>
 	<IrdomLayout>
-		<h3>Информаця о пользователе</h3>
+		<h3>Информация о пользователе</h3>
 		<div class="info">
 			<h4>Ваш id: {{ profileStore.id }}</h4>
 			<h4>Токен:</h4>
@@ -83,7 +83,7 @@ onMounted(() => {
 			</v-btn>
 		</div>
 
-		<h3>Инструменты администратора</h3>
+		<h3 v-if="profileStore.hasTokenAccess('webapp.admin.show')">Инструменты администратора</h3>
 
 		<AccessRestricted :scope="scopename.auth.group.create">
 			<RouterLink to="/admin/groups" class="link">Группы пользователей</RouterLink>

From 66c67537728e3b4afb69ef7e1bce3d63e804b6aa Mon Sep 17 00:00:00 2001
From: Ilya Batuev <batuev.io18@physics.msu.ru>
Date: Sun, 24 Nov 2024 22:06:02 +0000
Subject: [PATCH 3/9] fix trying to open profiles that don't exist

---
 src/router/profile.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/router/profile.ts b/src/router/profile.ts
index 0169583..8af0e19 100644
--- a/src/router/profile.ts
+++ b/src/router/profile.ts
@@ -1,3 +1,4 @@
+import apiClient from '@/api';
 import { RouteRecordRaw } from 'vue-router';
 
 export const profileRoutes: RouteRecordRaw[] = [
@@ -12,6 +13,16 @@ export const profileRoutes: RouteRecordRaw[] = [
 	{
 		path: ':id(\\d+)',
 		component: () => import('@/views/profile/ProfileView.vue'),
+		beforeEnter: async to => {
+			const { response } = await apiClient.GET('/auth/user/{user_id}', {
+				params: { path: { user_id: Number(to.params.id) } },
+			});
+			if (response.ok) {
+				return true;
+			} else {
+				return { path: '/error' };
+			}
+		},
 	},
 	// Раскомментируйте, если починили; удалите, если решили дропнуть
 	// {

From cae6caf0c090f18b2fc6c9e1c34341268e3ccaae Mon Sep 17 00:00:00 2001
From: Ilya Batuev <batuev.io18@physics.msu.ru>
Date: Tue, 26 Nov 2024 22:33:12 +0000
Subject: [PATCH 4/9] waiting for coder

---
 src/api/controllers/auth/AuthApi.ts    | 54 ++++++++++++--------------
 src/api/controllers/auth/decorators.ts | 10 ++---
 src/views/profile/ProfileView.vue      |  4 +-
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/api/controllers/auth/AuthApi.ts b/src/api/controllers/auth/AuthApi.ts
index 8935122..03eb30c 100644
--- a/src/api/controllers/auth/AuthApi.ts
+++ b/src/api/controllers/auth/AuthApi.ts
@@ -145,7 +145,7 @@ export class AuthApi {
 					session_name: navigator.userAgent ?? UNKNOWN_DEVICE,
 				},
 			});
-			const { data, error } = await promise;
+			const { data } = await promise;
 
 			if (data) {
 				LocalStorage.set(LocalStorageItem.Token, data.token);
@@ -154,8 +154,6 @@ export class AuthApi {
 				toastStore.push({
 					title: 'Вы успешно вошли в аккаунт',
 				});
-			} else {
-				throw error;
 			}
 
 			return promise;
@@ -166,12 +164,16 @@ export class AuthApi {
 	static approveEmail = apply(
 		async (token: string) => {
 			const toastStore = useToastStore();
-			const promise = await apiClient.GET('/auth/email/approve', { params: { query: { token } } });
-			toastStore.push({
-				title: 'Вы успешно подтвердили E-mail',
-			});
+			const promise = apiClient.GET('/auth/email/approve', { params: { query: { token } } });
+			const data = await promise;
+
+			if (data) {
+				toastStore.push({
+					title: 'Вы успешно подтвердили E-mail',
+				});
+			}
 
-			if (promise.error) throw promise.error;
+			return promise;
 		},
 		[showErrorToast]
 	);
@@ -185,10 +187,9 @@ export class AuthApi {
 
 	static getSessions = apply(
 		async (info?: SessionInfo[]) => {
-			const { data, error } = await apiClient.GET('/auth/session', { params: { query: { info } } });
-			if (error) throw error;
+			const promise = apiClient.GET('/auth/session', { params: { query: { info } } });
 
-			return data;
+			return promise;
 		},
 		[showErrorToast],
 		[checkToken]
@@ -196,12 +197,11 @@ export class AuthApi {
 
 	static deleteSession = apply(
 		async (token: string) => {
-			const { data, error } = await apiClient.DELETE('/auth/session/{token}', {
+			const promise = apiClient.DELETE('/auth/session/{token}', {
 				params: { path: { token } },
 			});
-			if (error) throw error;
 
-			return data;
+			return promise;
 		},
 		[checkToken],
 		[showErrorToast]
@@ -209,27 +209,25 @@ export class AuthApi {
 
 	static requestResetForgottenPassword = apply(
 		async (email: string) => {
-			const { data, error } = await apiClient.POST('/auth/email/reset/password/restore', {
+			const promise = apiClient.POST('/auth/email/reset/password/restore', {
 				body: { email },
 			});
-			if (error) throw error;
 
-			return data;
+			return promise;
 		},
 		[showErrorToast]
 	);
 
 	static requestResetPassword = apply(
 		async (password: string, new_password: string) => {
-			const { data, error } = await apiClient.POST('/auth/email/reset/password/request', {
+			const promise = apiClient.POST('/auth/email/reset/password/request', {
 				body: {
 					password,
 					new_password,
 				},
 			});
-			if (error) throw error;
 
-			return data;
+			return promise;
 		},
 		[showErrorToast],
 		[checkToken]
@@ -237,36 +235,34 @@ export class AuthApi {
 
 	static resetPassword = apply(
 		async (new_password: string, token: string) => {
-			const { data, error } = await apiClient.POST('/auth/email/reset/password', {
+			const promise = apiClient.POST('/auth/email/reset/password', {
 				params: { header: { 'reset-token': token } },
 				body: { new_password },
 			});
-			if (error) throw error;
-			return data;
+
+			return promise;
 		},
 		[showErrorToast]
 	);
 
 	static resetEmail = apply(
 		async (token: string) => {
-			const { data, error } = await apiClient.GET('/auth/email/reset/email', {
+			const promise = apiClient.GET('/auth/email/reset/email', {
 				params: { query: { token } },
 			});
-			if (error) throw error;
 
-			return data;
+			return promise;
 		},
 		[showErrorToast]
 	);
 
 	static requestResetEmail = apply(
 		async (email: string) => {
-			const { data, error } = await apiClient.POST('/auth/email/reset/email/request', {
+			const promise = apiClient.POST('/auth/email/reset/email/request', {
 				body: { email },
 			});
-			if (error) throw error;
 
-			return data;
+			return promise;
 		},
 		[checkToken],
 		[showErrorToast]
diff --git a/src/api/controllers/auth/decorators.ts b/src/api/controllers/auth/decorators.ts
index 4b33fea..4d9eee9 100644
--- a/src/api/controllers/auth/decorators.ts
+++ b/src/api/controllers/auth/decorators.ts
@@ -4,7 +4,6 @@ import { ToastType } from '@/models';
 import router from '@/router';
 import { useProfileStore } from '@/store/profile';
 import { useToastStore } from '@/store/toast';
-import { apiError } from '@/utils/errorHandler';
 
 export type Func<R = any, FuncArgs extends any[] = any[]> = (...args: FuncArgs) => R;
 type Decorator<F extends Func = Func, DecoratorArgs extends any[] = any[]> = Func<
@@ -40,11 +39,12 @@ export function showErrorToast<F extends Func>(
 ): Func<Promise<ReturnType<F>>, Parameters<F>> {
 	return async (...args: any[]) => {
 		const toastStore = useToastStore();
-		try {
-			const response = await method(...args);
+		const response = await method(...args);
+		console.log(response);
+		if (response.ok) {
 			return response;
-		} catch (err) {
-			const error = err as apiError;
+		} else {
+			const error = response.error;
 			if (error) {
 				toastStore.push({
 					title: error.ru ?? error.message,
diff --git a/src/views/profile/ProfileView.vue b/src/views/profile/ProfileView.vue
index fdb5aec..a5f81f1 100644
--- a/src/views/profile/ProfileView.vue
+++ b/src/views/profile/ProfileView.vue
@@ -65,7 +65,7 @@ const loadUserdata = async () => {
 
 	userdataLoadingState.value = UserdataLoadingState.Loading;
 
-	const { data: me } = await (isOwnProfile
+	const response = await (isOwnProfile
 		? AuthApi.getMe(['auth_methods', 'groups', 'indirect_groups', 'session_scopes', 'user_scopes'])
 		: AuthApi.getById(Number(route.params.id), [
 				'auth_methods',
@@ -73,7 +73,7 @@ const loadUserdata = async () => {
 				'indirect_groups',
 				'scopes',
 			]));
-
+	console.log(response);
 	if (me) {
 		const { data } = await UserdataApi.getUser(me.id);
 		if (data) {

From f0fc5a4f5a7f859e9ea651c50eff0de039917a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B0=D1=82=D1=83=D0=B5=D0=B2=20=D0=98=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=8F=20=D0=9E=D0=BB=D0=B5=D0=B3=D0=BE=D0=B2=D0=B8=D1=87?=
 <batuevio@it.profcomff.com>
Date: Mon, 16 Dec 2024 15:24:52 +0000
Subject: [PATCH 5/9] Revert "waiting for coder"

This reverts commit cae6caf0c090f18b2fc6c9e1c34341268e3ccaae.
---
 src/api/controllers/auth/AuthApi.ts    | 54 ++++++++++++++------------
 src/api/controllers/auth/decorators.ts | 10 ++---
 src/views/profile/ProfileView.vue      |  4 +-
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/api/controllers/auth/AuthApi.ts b/src/api/controllers/auth/AuthApi.ts
index 03eb30c..8935122 100644
--- a/src/api/controllers/auth/AuthApi.ts
+++ b/src/api/controllers/auth/AuthApi.ts
@@ -145,7 +145,7 @@ export class AuthApi {
 					session_name: navigator.userAgent ?? UNKNOWN_DEVICE,
 				},
 			});
-			const { data } = await promise;
+			const { data, error } = await promise;
 
 			if (data) {
 				LocalStorage.set(LocalStorageItem.Token, data.token);
@@ -154,6 +154,8 @@ export class AuthApi {
 				toastStore.push({
 					title: 'Вы успешно вошли в аккаунт',
 				});
+			} else {
+				throw error;
 			}
 
 			return promise;
@@ -164,16 +166,12 @@ export class AuthApi {
 	static approveEmail = apply(
 		async (token: string) => {
 			const toastStore = useToastStore();
-			const promise = apiClient.GET('/auth/email/approve', { params: { query: { token } } });
-			const data = await promise;
-
-			if (data) {
-				toastStore.push({
-					title: 'Вы успешно подтвердили E-mail',
-				});
-			}
+			const promise = await apiClient.GET('/auth/email/approve', { params: { query: { token } } });
+			toastStore.push({
+				title: 'Вы успешно подтвердили E-mail',
+			});
 
-			return promise;
+			if (promise.error) throw promise.error;
 		},
 		[showErrorToast]
 	);
@@ -187,9 +185,10 @@ export class AuthApi {
 
 	static getSessions = apply(
 		async (info?: SessionInfo[]) => {
-			const promise = apiClient.GET('/auth/session', { params: { query: { info } } });
+			const { data, error } = await apiClient.GET('/auth/session', { params: { query: { info } } });
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[showErrorToast],
 		[checkToken]
@@ -197,11 +196,12 @@ export class AuthApi {
 
 	static deleteSession = apply(
 		async (token: string) => {
-			const promise = apiClient.DELETE('/auth/session/{token}', {
+			const { data, error } = await apiClient.DELETE('/auth/session/{token}', {
 				params: { path: { token } },
 			});
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[checkToken],
 		[showErrorToast]
@@ -209,25 +209,27 @@ export class AuthApi {
 
 	static requestResetForgottenPassword = apply(
 		async (email: string) => {
-			const promise = apiClient.POST('/auth/email/reset/password/restore', {
+			const { data, error } = await apiClient.POST('/auth/email/reset/password/restore', {
 				body: { email },
 			});
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[showErrorToast]
 	);
 
 	static requestResetPassword = apply(
 		async (password: string, new_password: string) => {
-			const promise = apiClient.POST('/auth/email/reset/password/request', {
+			const { data, error } = await apiClient.POST('/auth/email/reset/password/request', {
 				body: {
 					password,
 					new_password,
 				},
 			});
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[showErrorToast],
 		[checkToken]
@@ -235,34 +237,36 @@ export class AuthApi {
 
 	static resetPassword = apply(
 		async (new_password: string, token: string) => {
-			const promise = apiClient.POST('/auth/email/reset/password', {
+			const { data, error } = await apiClient.POST('/auth/email/reset/password', {
 				params: { header: { 'reset-token': token } },
 				body: { new_password },
 			});
-
-			return promise;
+			if (error) throw error;
+			return data;
 		},
 		[showErrorToast]
 	);
 
 	static resetEmail = apply(
 		async (token: string) => {
-			const promise = apiClient.GET('/auth/email/reset/email', {
+			const { data, error } = await apiClient.GET('/auth/email/reset/email', {
 				params: { query: { token } },
 			});
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[showErrorToast]
 	);
 
 	static requestResetEmail = apply(
 		async (email: string) => {
-			const promise = apiClient.POST('/auth/email/reset/email/request', {
+			const { data, error } = await apiClient.POST('/auth/email/reset/email/request', {
 				body: { email },
 			});
+			if (error) throw error;
 
-			return promise;
+			return data;
 		},
 		[checkToken],
 		[showErrorToast]
diff --git a/src/api/controllers/auth/decorators.ts b/src/api/controllers/auth/decorators.ts
index 4d9eee9..4b33fea 100644
--- a/src/api/controllers/auth/decorators.ts
+++ b/src/api/controllers/auth/decorators.ts
@@ -4,6 +4,7 @@ import { ToastType } from '@/models';
 import router from '@/router';
 import { useProfileStore } from '@/store/profile';
 import { useToastStore } from '@/store/toast';
+import { apiError } from '@/utils/errorHandler';
 
 export type Func<R = any, FuncArgs extends any[] = any[]> = (...args: FuncArgs) => R;
 type Decorator<F extends Func = Func, DecoratorArgs extends any[] = any[]> = Func<
@@ -39,12 +40,11 @@ export function showErrorToast<F extends Func>(
 ): Func<Promise<ReturnType<F>>, Parameters<F>> {
 	return async (...args: any[]) => {
 		const toastStore = useToastStore();
-		const response = await method(...args);
-		console.log(response);
-		if (response.ok) {
+		try {
+			const response = await method(...args);
 			return response;
-		} else {
-			const error = response.error;
+		} catch (err) {
+			const error = err as apiError;
 			if (error) {
 				toastStore.push({
 					title: error.ru ?? error.message,
diff --git a/src/views/profile/ProfileView.vue b/src/views/profile/ProfileView.vue
index a5f81f1..fdb5aec 100644
--- a/src/views/profile/ProfileView.vue
+++ b/src/views/profile/ProfileView.vue
@@ -65,7 +65,7 @@ const loadUserdata = async () => {
 
 	userdataLoadingState.value = UserdataLoadingState.Loading;
 
-	const response = await (isOwnProfile
+	const { data: me } = await (isOwnProfile
 		? AuthApi.getMe(['auth_methods', 'groups', 'indirect_groups', 'session_scopes', 'user_scopes'])
 		: AuthApi.getById(Number(route.params.id), [
 				'auth_methods',
@@ -73,7 +73,7 @@ const loadUserdata = async () => {
 				'indirect_groups',
 				'scopes',
 			]));
-	console.log(response);
+
 	if (me) {
 		const { data } = await UserdataApi.getUser(me.id);
 		if (data) {

From 47271502c2069f54e280d76d0bb74ca1ae5fbe3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B0=D1=82=D1=83=D0=B5=D0=B2=20=D0=98=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=8F=20=D0=9E=D0=BB=D0=B5=D0=B3=D0=BE=D0=B2=D0=B8=D1=87?=
 <batuevio@it.profcomff.com>
Date: Mon, 16 Dec 2024 15:33:58 +0000
Subject: [PATCH 6/9] fixed disabling single linked authButton

---
 src/views/profile/ProfileEditAuthView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index 9006d39..fea9101 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -47,7 +47,7 @@ const canUnlinked = computed(() =>
 					v-for="button of canUnlinked"
 					:key="button.method"
 					:button="button"
-					:disabled="canUnlinked.length === 1"
+					:disabled="profileStore.authMethods === 1"
 					unlink
 				/>
 			</div>

From aefe3fe999093a26cb5ccdcdd01ce943b51eb505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B0=D1=82=D1=83=D0=B5=D0=B2=20=D0=98=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=8F=20=D0=9E=D0=BB=D0=B5=D0=B3=D0=BE=D0=B2=D0=B8=D1=87?=
 <batuevio@it.profcomff.com>
Date: Mon, 16 Dec 2024 15:37:06 +0000
Subject: [PATCH 7/9] commented modal asking for scopes before app

---
 src/views/apps/ApplicationFrame.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index ad3db31..147bc80 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -169,7 +169,8 @@ onMounted(async () => {
 			allow="camera"
 		/>
 		<FullscreenLoader v-else-if="appState == AppState.WaitLoad" />
-		<div v-else-if="appState == AppState.WaitApprove" class="deligate-container">
+		<!-- Раскомментить, если появятся приложения от сторонних разработчиков -->
+		<!-- <div v-else-if="appState == AppState.WaitApprove" class="deligate-container">
 			<h2>Приложение запрашивает права на доступ к вашему аккаунту</h2>
 			<p>Для работы будут делегированы следующие права:</p>
 			<ul>
@@ -177,7 +178,7 @@ onMounted(async () => {
 			</ul>
 			<v-btn color="primary" @click="userScopeApproved = true">Разрешить</v-btn>
 			<v-btn variant="plain" @click="userScopeApproved = false">Запретить</v-btn>
-		</div>
+		</div> -->
 		<div v-else-if="appState == AppState.Blocked" class="exception-container">
 			<h2>У вас недостаточно прав для использования этого приложения</h2>
 			<v-btn @click="router.push('/apps')">Вернуться к списку приложений</v-btn>

From 7c148786aa2037ed3aad2cb13317beaa9e717cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B0=D1=82=D1=83=D0=B5=D0=B2=20=D0=98=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=8F=20=D0=9E=D0=BB=D0=B5=D0=B3=D0=BE=D0=B2=D0=B8=D1=87?=
 <batuevio@it.profcomff.com>
Date: Mon, 16 Dec 2024 17:35:46 +0000
Subject: [PATCH 8/9] fixed condition for disabling oauth button

---
 src/views/profile/ProfileEditAuthView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index fea9101..3942953 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -47,7 +47,7 @@ const canUnlinked = computed(() =>
 					v-for="button of canUnlinked"
 					:key="button.method"
 					:button="button"
-					:disabled="profileStore.authMethods === 1"
+					:disabled="profileStore.authMethods.length === 1"
 					unlink
 				/>
 			</div>

From 2dc5550ef97bd3f5cb289df1a7f1b62fac136817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B0=D1=82=D1=83=D0=B5=D0=B2=20=D0=98=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=8F=20=D0=9E=D0=BB=D0=B5=D0=B3=D0=BE=D0=B2=D0=B8=D1=87?=
 <batuevio@it.profcomff.com>
Date: Mon, 16 Dec 2024 17:38:36 +0000
Subject: [PATCH 9/9] fix modal window

---
 src/views/apps/ApplicationFrame.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 147bc80..a99a19a 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Ref, onMounted, ref, watch } from 'vue';
+import { Ref, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useToolbar } from '@/store/toolbar';
 import { useProfileStore } from '@/store/profile';
@@ -27,7 +27,7 @@ const appState = ref(AppState.WaitLoad);
 const scopes: Ref<string[]> = ref([]);
 
 const scopeNamesToRequest: Ref<string[]> = ref([]);
-const userScopeApproved: Ref<boolean | undefined> = ref();
+// const userScopeApproved: Ref<boolean | undefined> = ref();
 
 toolbar.setup({
 	backUrl: '/apps',
@@ -50,9 +50,10 @@ const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
 function showApproveScopesScreen() {
 	appState.value = AppState.WaitApprove;
 	// immediately return a Promise
-	return new Promise(resolve => {
-		watch(userScopeApproved, value => resolve(value));
-	});
+	// return new Promise(resolve => {
+	// 	watch(userScopeApproved, value => resolve(value));
+	// });
+	return true;
 }
 
 const getToken = async () => {