fix loggedIn issues

enjin · Sep 4, 2023 · 5d3ce30 · 5d3ce30
1 parent 4919859
commit 5d3ce30
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="h-full flex flex-row">
-        <SideNavbar v-if="appStore.loggedIn" />
+        <SideNavbar v-if="appStore.hasValidConfig" />
         <SnackbarGroup />
 
         <div class="flex flex-col w-full overflow-hidden">

diff --git a/resources/js/components/DisclosureMenu.vue b/resources/js/components/DisclosureMenu.vue
@@ -2,7 +2,7 @@
     <DisclosurePanel
         class="fixed bg-white left-0 right-0 md:hidden divide-y divide-gray-200 shadow-md"
         v-slot="{ close }"
-        v-if="appStore.hasValidConfig"
+        v-if="appStore.loggedIn"
     >
         <div class="space-y-1 py-2 px-4">
             <RouterLink

diff --git a/resources/js/components/NotificationsList.vue b/resources/js/components/NotificationsList.vue
@@ -13,7 +13,7 @@
             <ScaleTransition>
                 <MenuItems
                     class="absolute right-0 z-10 mt-2 w-72 sm:w-80 origin-top-right divide-y divide-gray-100 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none pt-1"
-                    v-if="appStore.hasValidConfig"
+                    v-if="appStore.loggedIn"
                 >
                     <div class="max-h-80 overflow-y-auto divide-y divide-gray-100 scrollbar-hide">
                         <MenuItem

diff --git a/resources/js/components/ProfileMenu.vue b/resources/js/components/ProfileMenu.vue
@@ -12,7 +12,7 @@
             </div>
             <ScaleTransition>
                 <MenuItems
-                    v-if="appStore.hasValidConfig"
+                    v-if="appStore.loggedIn"
                     class="absolute right-0 z-10 mt-2 w-56 origin-top-right divide-y divide-gray-100 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none pt-1"
                 >
                     <div class="px-4 py-2" v-if="appStore.user">
@@ -29,10 +29,10 @@
                             :address="appStore.user?.account"
                         />
                     </div>
-                    <div class="px-4 py-2" v-if="appStore.config.hostname">
-                        <p class="text-sm text-gray-500">Hostname</p>
+                    <div class="px-4 py-2" v-if="appStore.config.url">
+                        <p class="text-sm text-gray-500">URL</p>
                         <p class="truncate text-sm font-medium text-gray-900">
-                            {{ appStore.config.hostname }}
+                            {{ appStore.config.url }}
                         </p>
                     </div>
                     <div class="px-4 py-2" v-if="appStore.config.network">

diff --git a/resources/js/components/pages/Settings.vue b/resources/js/components/pages/Settings.vue
@@ -48,7 +48,7 @@
                     <div class="">
                         <h1 class="text-xl md:text-2xl">
                             Wallet Account
-                            <span v-if="!appStore.hasValidConfig && !walletAccount" class="text-red-500">&nbsp;*</span>
+                            <span v-if="!appStore.loggedIn && !walletAccount" class="text-red-500">&nbsp;*</span>
                         </h1>
                         <p class="mt-1 text-sm text-gray-500 max-w-3xl">
                             The platform depends on there being a funded wallet daemon account setup and connected to

diff --git a/resources/js/components/pages/Setup.vue b/resources/js/components/pages/Setup.vue
@@ -77,12 +77,14 @@ const setupAccount = async () => {
         const parsedUrl = new URL(url.value);
         if (!(await appStore.checkURL(parsedUrl))) return;
 
-        if (
-            await appStore.setupAccount({
-                url: parsedUrl,
-                authorization_token: authorizationToken.value,
-            })
-        ) {
+        await appStore.setupAccount({
+            url: parsedUrl,
+            authorization_token: authorizationToken.value,
+        });
+
+        if (appStore.isMultiTenant) {
+            router.push({ name: 'platform.auth.login' });
+        } else {
             redirectToCollections();
         }
     } catch (e: any) {
@@ -93,7 +95,7 @@ const setupAccount = async () => {
 };
 
 (async () => {
-    if (appStore.hasValidConfig) redirectToCollections();
+    if (appStore.loggedIn) redirectToCollections();
     url.value = appStore.config.url as URL;
 })();
 

diff --git a/resources/js/components/pages/auth/Login.vue b/resources/js/components/pages/auth/Login.vue
@@ -125,9 +125,9 @@ const checkVerified = () => {
 })();
 
 watch(
-    () => appStore.hasValidConfig,
+    () => appStore.loggedIn,
     () => {
-        if (appStore.hasValidConfig) router.push({ name: 'platform.collections' });
+        if (appStore.loggedIn) router.push({ name: 'platform.collections' });
     }
 );
 </script>
diff --git a/resources/js/store/index.ts b/resources/js/store/index.ts
@@ -76,7 +76,6 @@ export const useAppStore = defineStore('app', {
                 if (this.hasFuelTanksPackage) this.addFuelTanksNavigation();
                 if (this.hasMarketplacePackage) this.addMarketplaceNavigation();
 
-                this.loggedIn = true;
                 if (this.isMultiTenant && this.loggedIn) await this.getUser();
 
                 return await this.fetchCollectionIds();
@@ -90,7 +89,9 @@ export const useAppStore = defineStore('app', {
         async setupAccount({ url, authorization_token }: { url: URL; authorization_token: string }) {
             this.url = url;
             this.authorization_token = authorization_token;
-            this.loggedIn = true;
+            if (!this.isMultiTenant) {
+                this.loggedIn = true;
+            }
 
             return await this.init();
         },
@@ -158,6 +159,7 @@ export const useAppStore = defineStore('app', {
             return true;
         },
         async login(email: string, password: string) {
+            this.loggedIn = true;
             const res = await AuthApi.login(email, password);
             if (!res.data.Login) throw [{ field: 'Login error', message: 'Invalid credentials' }];