Fixing token system (#64)

* removing local storage

* fix scopes

* added toasts

src/App.vue

@@ -2,11 +2,23 @@
 import { useProfileStore } from '@/store';
 import { onMounted } from 'vue';
 import ToastList from '@/components/ToastList.vue';
+import { useToastStore } from './store/toastStore';
+import { ToastType } from './models';
 
 const profileStore = useProfileStore();
+const toastStore = useToastStore();
 
 onMounted(() => {
+	profileStore.clearLocalStorage();
 	profileStore.fromUrl();
+	if (!profileStore.isLoggedIn) {
+		toastStore.push({
+			title: 'Не получится оставить отзыв',
+			description: 'Вы не привязали ЛК МГУ к своему профилю или не вошли в профиль',
+			type: ToastType.Error,
+		});
+	}
+	console.log(profileStore.token);
 });
 </script>
 

src/pages/ReviewPage.vue

@@ -100,11 +100,11 @@ async function sendReview() {
 					type: ToastType.Warn,
 					description: 'Подождите немного перед тем, как отправить следующий отзыв',
 				});
-			} else if (profileStore.token === 'null') {
+			} else if (!profileStore.token) {
 				toastStore.push({
-					title: 'Вы не вошли в аккаунт',
+					title: 'Не получится оставить отзыв',
+					description: 'Вы не привязали ЛК МГУ к своему профилю или не вошли в профиль',
 					type: ToastType.Error,
-					description: 'Отзыв могут оставить только зарегистрированные пользователи',
 				});
 			} else {
 				toastStore.push({

src/store/profileStore.ts

@@ -4,40 +4,30 @@ import { LocalStorage, LocalStorageItem } from '../models/LocalStorage';
 import { setupAuth } from '@profcomff/api-uilib';
 
 export const useProfileStore = defineStore('profile', () => {
-	const id = ref<number | null>(null);
-	const email = ref<string | null>(null);
 	const token = ref<string | undefined>(undefined);
 	const groups = ref<number[] | null>(null);
-	const indirectGroups = ref<number[] | null>(null);
-	const userScopes = ref<string[] | null>(null);
 	const sessionScopes = ref<string[] | null>(null);
+	const isLoggedIn = ref<boolean>(false);
 
 	const full_name = ref<string | null>(null);
 
 	const fromUrl = () => {
 		const url = new URL(document.location.toString());
 
-		const localToken = LocalStorage.get(LocalStorageItem.Token);
-		const localScopes = LocalStorage.getObject<string[]>(LocalStorageItem.TokenScopes);
 		const urlToken = url.searchParams.get('token');
 		const urlScopes = url.searchParams.get('scopes')?.split(',');
 
-		if (urlToken === null && urlScopes === undefined) {
-			token.value = localToken === 'null' ? undefined : (localToken ?? undefined);
-			sessionScopes.value = localScopes;
+		if (urlToken === null) {
+			token.value = undefined;
+			isLoggedIn.value = false;
+			sessionScopes.value = [];
 		} else {
-			token.value = urlToken === null ? undefined : urlToken;
-			sessionScopes.value = urlScopes || [];
-			LocalStorage.set(LocalStorageItem.Token, urlToken);
-			LocalStorage.set(LocalStorageItem.TokenScopes, urlScopes ?? []);
+			token.value = urlToken;
+			isLoggedIn.value = true;
+			sessionScopes.value = urlScopes ?? [];
 		}
 
 		setupAuth(token.value);
-
-		const currId = url.searchParams.get('user_id') ?? LocalStorage.get(LocalStorageItem.UserId) ?? undefined;
-		if (currId) {
-			id.value = Number(currId);
-		}
 	};
 
 	const isAdmin = () => {
@@ -48,18 +38,19 @@ export const useProfileStore = defineStore('profile', () => {
 		);
 	};
 
+	const clearLocalStorage = () => {
+		LocalStorage.delete(LocalStorageItem.Token, LocalStorageItem.TokenScopes, LocalStorageItem.UserId);
+	};
+
 	return {
-		id,
-		email,
 		token,
 		groups,
-		indirectGroups,
-		userScopes,
-		sessionScopes,
+		isLoggedIn,
 
 		full_name,
 
 		fromUrl,
 		isAdmin,
+		clearLocalStorage,
 	};
 });