From 85eecdbccd6a72272fb5d66ecd4e4a185be764b7 Mon Sep 17 00:00:00 2001
From: Ariel Lin <smsllbear1600@gmail.com>
Date: Wed, 1 Nov 2023 12:04:37 +0800
Subject: [PATCH 1/2] fix: sign-in/sign-up form shows success even if API was
 not sent successfully [SPMVP-6214]

---
 src/PaywallSystem.vue                    | 11 +++++++++--
 src/components/UserDialog/UserDialog.vue |  1 +
 src/components/UserDialog/definition.ts  |  1 +
 src/composables/auth.ts                  |  7 +++++++
 src/modal-text.ts                        |  5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/PaywallSystem.vue b/src/PaywallSystem.vue
index 4740e4c8..8511514c 100644
--- a/src/PaywallSystem.vue
+++ b/src/PaywallSystem.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { ApolloError } from '@apollo/client/core'
 import { useEventBus, useVModel } from '@vueuse/core'
 import { computed, provide, ref, watch } from 'vue'
 import type {
@@ -91,11 +92,15 @@ const profile = computed(() => {
 async function handleSignup(email: string, customArticleType?: string) {
   const checkExistEmailAndShowDialog = async (showDialogType: UserDialogType) => {
     const result = await onSignup(email)
-    if (result && result?.data.signUpSubscriber) {
+    if (result instanceof ApolloError) {
+      const result = await onLogin({ email })
+      if (!result) dialogType.value = 'error'
+      modalVisible.value = true
+    } else if (result && result?.data.signUpSubscriber) {
       dialogType.value = showDialogType
       visible.value = true
     } else {
-      onLogin({ email })
+      dialogType.value = 'error'
       modalVisible.value = true
     }
   }
@@ -201,6 +206,8 @@ function onConfirmModal() {
       dialogType.value = 'shareToTwitter'
       modalVisible.value = true
     }, 300)
+  } else if (dialogType.value === 'error') {
+    dialogType.value = 'welcome'
   }
 }
 
diff --git a/src/components/UserDialog/UserDialog.vue b/src/components/UserDialog/UserDialog.vue
index 14aa29bd..9ae6f1cf 100644
--- a/src/components/UserDialog/UserDialog.vue
+++ b/src/components/UserDialog/UserDialog.vue
@@ -77,6 +77,7 @@ const dialogMap: Record<UserDialogType | '', Component | undefined> = {
   subscribe: AccountDetail,
   confirmation: OnlyButton,
   shareToTwitter: undefined,
+  error: undefined,
   '': undefined,
 }
 
diff --git a/src/components/UserDialog/definition.ts b/src/components/UserDialog/definition.ts
index 1459c4b9..5e60d4ad 100644
--- a/src/components/UserDialog/definition.ts
+++ b/src/components/UserDialog/definition.ts
@@ -11,6 +11,7 @@ export type UserDialogType =
   | 'subscribe'
   | 'confirmation'
   | 'shareToTwitter'
+  | 'error'
 
 export interface SubscriberInput {
   email?: string
diff --git a/src/composables/auth.ts b/src/composables/auth.ts
index aef2e5e0..33fc938d 100644
--- a/src/composables/auth.ts
+++ b/src/composables/auth.ts
@@ -2,6 +2,7 @@ import { useMutation } from '@vue/apollo-composable'
 import { useStorage } from '@vueuse/core'
 import gql from 'graphql-tag'
 import { type Ref, computed } from 'vue'
+import { ApolloError } from '@apollo/client/core'
 
 export type AuthAPI = ReturnType<typeof useAuth>
 
@@ -58,6 +59,12 @@ export function useAuth(tokenRef: Ref<string | null> = useStorage('test-token',
         return result
       }
     } catch (e) {
+      if (e instanceof ApolloError) {
+        const errorMessage = e.graphQLErrors[0]?.message
+        if (errorMessage === 'Bad Request.') {
+          return e
+        }
+      }
       // eslint-disable-next-line no-console
       console.log('e: ', e)
     }
diff --git a/src/modal-text.ts b/src/modal-text.ts
index 8851d981..de90264f 100644
--- a/src/modal-text.ts
+++ b/src/modal-text.ts
@@ -23,4 +23,9 @@ export const modalTexts: Record<string, ModalText> = {
     title: 'Spread the word',
     sub: 'If you want to help __PUBLICATION_NAME__ even more, share your reason for subscribing.',
   },
+  error: {
+    title: 'An error occurred',
+    sub: 'Please retry later.',
+    button: 'Close',
+  },
 }

From 36fae8a9b3cf16e09fa174ea1322c3e8f8988a13 Mon Sep 17 00:00:00 2001
From: DanSnow <dododavid006@gmail.com>
Date: Wed, 1 Nov 2023 15:04:05 +0800
Subject: [PATCH 2/2] ci: upgrade node to 18

---
 .github/workflows/chromatic.yml       | 2 +-
 .github/workflows/release-please.yml  | 4 ++--
 .github/workflows/static-analyzer.yml | 2 +-
 .github/workflows/unit-test.yml       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 87676a26..7004aaa0 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0 # disable shallow checkout, chromatic need git history
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
       - name: Install dependencies
         run: yarn
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 7b8aa7a3..f9c3dea5 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
       - name: publish package
         run: |
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
       - name: publish package
         run: |
diff --git a/.github/workflows/static-analyzer.yml b/.github/workflows/static-analyzer.yml
index 0e59263b..a8c5dc15 100644
--- a/.github/workflows/static-analyzer.yml
+++ b/.github/workflows/static-analyzer.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
       - run: yarn
 
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 0251783f..259d13a3 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
       - run: yarn
       - run: yarn test --coverage