♻️ oauth check token before check close

Author: trydofor

.github/reset-dev.sh

@@ -21,11 +21,19 @@ fi
 echo -e "\033[37;42;1mMixed reset to $_hash, exclude package.json\033[0m"
 read -p "Any key to continue, Ctrl+C to cancel"
 
-git stash
+_stash=false
+if ! git diff --quiet; then
+  git stash
+  _stash=true
+fi
+
 git reset --mixed $_hash
 git add 'package.json' '**package.json'
 git restore .
-git stash pop
+
+if $_stash; then
+  git stash pop
+fi
 
 echo -e "\n\n## $_tag\n\n"
 git --no-pager log --invert-grep --grep='bumping versions' --grep='Merge pull request' --pretty=format:"- %h %s" $_tag..HEAD

layers/common/composables/UseOauthLogin.ts

@@ -40,16 +40,12 @@ export function useOauthLogin(options: OauthLoginOption) {
   }
 
   async function checking(authType: string, url: string) {
-    if (!popupWin.opening()) { // failed pop open or closed
-      authing(LoadingStatus.Done);
-      return;
-    }
-
+    const open = popupWin.opening();
     try {
       const next = await options.checkToken(authType, url);
-      if (typeof next === 'boolean') {
-        popupWin.close();
+      if (typeof next === 'boolean' || !open) {
         authing(LoadingStatus.Done);
+        if (open) popupWin.close();
       }
       else {
         setTimeout(() => checking(authType, url), next);
@@ -58,7 +54,7 @@ export function useOauthLogin(options: OauthLoginOption) {
     catch (err) {
       logger.error('check oauth token failed', err);
       authing(LoadingStatus.Error);
-      popupWin.close();
+      if (open) popupWin.close();
     }
   }
 

layers/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fessional/razor-common",
-  "version": "0.8.1-dev.11",
+  "version": "0.8.1-dev.12",
   "description": "common layer for mobile and desktop",
   "type": "module",
   "main": "./nuxt.config.ts",

layers/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fessional/razor-desktop",
-  "version": "0.8.1-dev.11",
+  "version": "0.8.1-dev.12",
   "description": "desktop layer with vuetify",
   "type": "module",
   "main": "./nuxt.config.ts",

layers/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fessional/razor-mobile",
-  "version": "0.8.1-dev.11",
+  "version": "0.8.1-dev.12",
   "description": "mobile layer with ionic and capacitor",
   "type": "module",
   "main": "./nuxt.config.ts",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fessional/razor",
-  "version": "0.8.1-dev.11",
+  "version": "0.8.1-dev.12",
   "description": "Use front-end tech (Nuxt/Ts) to build multi-platform from one codebase, suitable for small team and app to write app once, apply almost anywhere.",
   "type": "module",
   "files": [