new api support

profcomff · Nov 4, 2024 · 4cf6130 · 4cf6130
1 parent cfc292a
commit 4cf6130
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 131 deletions.
diff --git a/src/api/auth/UserSessionApi.ts b/src/api/auth/UserSessionApi.ts
diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
@@ -117,24 +117,24 @@ const getToken = async () => {
 	}
 
 	// 3. Если пользователь разрешает – запрашиваем токен на Auth api и возвращаем его
-	const session = (
-		await userSessionApi.createSession(scopes.value.length == 0 ? {} : { scopes: scopes.value })
-	).data;
-	if (!session) {
+	const { data } = await apiClient.POST('/auth/session', {
+		body: { scopes: scopes.value.length == 0 ? [] : scopes.value },
+	});
+	if (!data) {
 		appState.value = AppState.Error;
 		return;
 	}
-	authItem.token = session.token;
-	authItem.expires = session.expires;
-	profileStore.id = session.user_id;
+	authItem.token = data.token;
+	authItem.expires = data.expires;
+	profileStore.id = data.user_id;
 	if (authItemIndex != -1) {
 		appsData[authItemIndex] = authItem;
 	} else {
 		appsData.push(authItem);
 	}
 	LocalStorage.set(LocalStorageItem.SuperappAuth, appsData);
 
-	return session.token;
+	return data.token;
 };
 
 const openApp = async (data: ServiceData) => {
@@ -160,7 +160,7 @@ const openApp = async (data: ServiceData) => {
 	}
 
 	// Пользователь не авторизован => Кнопка разблокирована и не требует авторизации => Показываем приложение
-	if (data.view == ButtonView.Active && !profileStore.id) {
+	if (data.view == 'active' && !profileStore.id) {
 		appState.value = AppState.Show;
 		return;
 	}