👔 Use session wallet to determine connected user

likecoin · Sep 20, 2024 · 21ac94b · 21ac94b
1 parent 5dad640
commit 21ac94b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/src/components/AuthRequiredView.vue b/src/components/AuthRequiredView.vue
@@ -70,7 +70,7 @@ export default {
   },
   mounted() {
     const { login } = this.$route.query;
-    if (!this.walletIsMatchedSession && login) {
+    if (!this.getSessionWallet && login) {
       this.onClickLogin();
     }
   },

diff --git a/src/components/EventModal/Collect/index.vue b/src/components/EventModal/Collect/index.vue
@@ -723,7 +723,7 @@ export default {
       try {
         switch (method) {
           case 'crypto': {
-            if (!this.getAddress) {
+            if (!this.getSessionWallet) {
               const isConnected = await this.connectWallet();
               if (!isConnected) return;
             }
@@ -755,7 +755,7 @@ export default {
             await this.collectNFTWithStripe(classId, { memo: this.memo });
             break;
           case 'free': {
-            if (!this.getAddress) {
+            if (!this.getSessionWallet) {
               const isConnected = await this.connectWallet();
               if (!isConnected) return;
             }

diff --git a/src/components/SiteHeader.vue b/src/components/SiteHeader.vue
@@ -57,7 +57,7 @@
       </Dropdown>
 
       <ButtonV2
-        v-if="!loginAddress"
+        v-if="!getSessionWallet"
         class="hidden laptop:flex"
         preset="secondary"
         :text="$t('header_button_connect_to_wallet')"
@@ -70,7 +70,7 @@
 
       <Dropdown class="hidden laptop:block ml-[4px]">
         <template #trigger="{ toggle }">
-          <div v-if="loginAddress" class="relative">
+          <div v-if="getSessionWallet" class="relative">
             <Identity
               class="cursor-pointer"
               :avatar-url="walletUserAvatar"
@@ -136,7 +136,7 @@
 
       {{ /* phone version */ }}
       <ButtonV2
-        v-if="!loginAddress"
+        v-if="!getSessionWallet"
         class="laptop:hidden"
         preset="plain"
         @click="handleOpenSlider"
@@ -171,7 +171,7 @@
       @close="isShowMobileMenu = false"
     >
       <ButtonV2
-        v-if="!loginAddress"
+        v-if="!getSessionWallet"
         class="w-full"
         preset="secondary"
         @click="handleConnectWallet"
@@ -292,6 +292,7 @@ export default {
       'getUserId',
       'getNotificationCount',
       'shoppingCartBookProductList',
+      'getSessionWallet',
     ]),
     currentLocale() {
       return this.$i18n.locale;
@@ -317,10 +318,10 @@ export default {
     },
   },
   async mounted() {
-    await this.restoreSession();
+    await this.restoreAuthSession();
   },
   methods: {
-    ...mapActions(['updatePreferences', 'userLogout']),
+    ...mapActions(['updatePreferences', 'userLogout', 'restoreAuthSession']),
     handleClickGoStore() {
       logTrackerEvent(this, 'site_header', 'site_header_click_store', '', 1);
     },
@@ -366,7 +367,7 @@ export default {
           this.$router.push(
             this.localeLocation({
               name: 'bookshelf',
-              params: { id: this.loginAddress },
+              params: { id: this.getSessionWallet },
               query: { tab: 'collected' },
             })
           );
@@ -392,12 +393,12 @@ export default {
     handleOpenSlider() {
       this.isShowMobileMenu = true;
 
-      if (this.loginAddress) {
+      if (this.getSessionWallet) {
         logTrackerEvent(
           this,
           'site_menu',
           'site_menu_click_slider_menu',
-          this.loginAddress,
+          this.getSessionWallet,
           1
         );
       } else {

diff --git a/src/mixins/wallet.js b/src/mixins/wallet.js
@@ -36,6 +36,9 @@ export default {
       'walletIsMatchedSession',
       'walletIsLoggingIn',
       'loginAddress',
+      'getToken',
+      'getSessionWallet',
+      'getIsRestoringSession',
     ]),
     hasConnectedWallet() {
       return !!this.getAddress && !!this.walletMethodType;

diff --git a/src/pages/_id/index.vue b/src/pages/_id/index.vue
@@ -516,7 +516,7 @@ export default {
         1
       );
 
-      if (!this.getAddress) {
+      if (!this.getSessionWallet) {
         const isConnected = await this.connectWallet();
         if (!isConnected) return;
         this.walletFetchLIKEBalance();

diff --git a/src/pages/bookshelf/index.vue b/src/pages/bookshelf/index.vue
@@ -193,7 +193,7 @@ export default {
       'walletFollowees',
     ]),
     wallet() {
-      return this.loginAddress;
+      return this.getSessionWallet;
     },
   },
   watch: {

diff --git a/src/pages/nft/claim/index.vue b/src/pages/nft/claim/index.vue
@@ -760,7 +760,7 @@ export default {
       );
     },
     claimingAddress() {
-      return this.loginAddress;
+      return this.getSessionWallet;
     },
     claimingEmail() {
       return this.walletEmail || this.walletEmailUnverified;

diff --git a/src/pages/reader.vue b/src/pages/reader.vue
@@ -127,15 +127,15 @@ export default {
       await this.fetchISCNMetadata();
       await this.restoreSession();
       // TODO: use loginAddress
-      if (this.getAddress) {
+      if (this.getSessionWallet) {
         await Promise.all([
           this.fetchUserCollectedCount(),
           this.updateNFTOwners(),
         ]);
         if (
           (!this.userCollectedCount && this.isLoginRequired) ||
           (this.nftCollectorWalletAddress &&
-            this.nftCollectorWalletAddress !== this.getAddress)
+            this.nftCollectorWalletAddress !== this.getSessionWallet)
         ) {
           this.$router.replace(
             this.localeLocation({

diff --git a/src/pages/shopping-cart/wnft.vue b/src/pages/shopping-cart/wnft.vue
@@ -237,7 +237,7 @@ export default {
         1
       );
       try {
-        if (!this.getAddress) {
+        if (!this.getSessionWallet) {
           const isConnected = await this.connectWallet();
           if (!isConnected) return;
         } else {