fixing tokens

profcomff · Jan 24, 2025 · 7a888c9 · 7a888c9
1 parent 345eab4
commit 7a888c9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/src/store/apps.ts b/src/store/apps.ts
@@ -37,12 +37,17 @@ export const useAppsStore = defineStore('apps', () => {
 		appTokens.value = LocalStorage.getObject(LocalStorageItem.AppToken) ?? [];
 	};
 
+	const clearTokensFromStorage = () => {
+		LocalStorage.delete(LocalStorageItem.AppToken);
+	};
+
 	return {
 		categories,
 		appTokens,
 
 		addAppToken,
 		checkAppToken,
 		getTokensFromStorage,
+		clearTokensFromStorage,
 	};
 });
diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
@@ -15,7 +15,6 @@ const toolbar = useToolbar();
 const router = useRouter();
 const profileStore = useProfileStore();
 const appStore = useAppsStore();
-appStore.getTokensFromStorage();
 
 enum AppState {
 	WaitLoad = 1,
@@ -156,9 +155,8 @@ const openApp = async (data: ServiceData) => {
 };
 
 onMounted(async () => {
-	if (history.state.token) {
-		profileStore.updateToken(history.state.token);
-		delete history.state.token;
+	if (profileStore.token && !profileStore.id) {
+		await AuthApi.getMe(['session_scopes', 'user_scopes']);
 	}
 
 	const { data } = await apiClient.GET('/services/service/{button_id}', {

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
@@ -16,10 +16,6 @@ toolbar.setup({
 });
 
 onMounted(async () => {
-	if (history.state.token) {
-		profileStore.updateToken(history.state.token);
-		delete history.state.token;
-	}
 	AuthApi.getMe(['auth_methods']);
 });
 

diff --git a/src/views/profile/ProfileEditView.vue b/src/views/profile/ProfileEditView.vue
@@ -34,11 +34,6 @@ const photoURL = ref('');
 const userdata = ref<UserdataArray>([]);
 
 onMounted(async () => {
-	if (history.state.token) {
-		profileStore.updateToken(history.state.token);
-		delete history.state.token;
-	}
-
 	const { data: me } = await AuthApi.getMe([
 		'auth_methods',
 		'groups',

diff --git a/src/views/profile/ProfileView.vue b/src/views/profile/ProfileView.vue
@@ -102,11 +102,6 @@ const loadUserdata = async () => {
 };
 
 onMounted(async () => {
-	if (history.state.token) {
-		profileStore.updateToken(history.state.token);
-		delete history.state.token;
-	}
-
 	loadUserdata();
 });
 </script>