Merge pull request #246 from Authing/fix-trackSession-20230721

Fix track session 20230721
Authing · Jul 21, 2023 · 683ab5d · 683ab5d
2 parents 506bd29 + cfd8c04
commit 683ab5d
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 76 deletions.
diff --git a/examples/guard-nextjs-react18/package-lock.json b/examples/guard-nextjs-react18/package-lock.json
diff --git a/examples/guard-nextjs-react18/package.json b/examples/guard-nextjs-react18/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@authing/guard-react18": "^5.2.2-alpha.0",
+    "@authing/guard-react18": "^5.2.3-alpha.0",
     "@types/node": "18.11.9",
     "@types/react": "18.0.24",
     "@types/react-dom": "18.0.8",

diff --git a/examples/guard-nextjs-react18/pages/index.tsx b/examples/guard-nextjs-react18/pages/index.tsx
@@ -1,9 +1,22 @@
 import Head from 'next/head'
 
+import { useEffect } from 'react'
+
+import { Guard } from '@authing/guard-react18'
+
+import { guardOptions } from '../config'
+
 export default function Home () {
+  const guard = new Guard(guardOptions)
   const toEmbed = () => window.location.href = '/login'
   const toJump = () => window.location.href = '/jump'
 
+  useEffect(() => {
+    guard.trackSession().then(userInfo => {
+      console.log('userInfo in index trackSession: ', userInfo)
+    })
+  }, [])
+
   return <div>
     <div style={{marginBottom: '20px'}} onClick={toEmbed}><button>嵌入模式</button></div>
     <div><button onClick={toJump}>跳转模式</button></div>

diff --git a/examples/guard-react18/normal/package-lock.json b/examples/guard-react18/normal/package-lock.json
diff --git a/examples/guard-react18/normal/package.json b/examples/guard-react18/normal/package.json
@@ -24,7 +24,7 @@
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@authing/guard-react18": "^5.2.1",
+    "@authing/guard-react18": "^5.2.3-alpha.0",
     "antd": "^4.24.0",
     "face-api.js": "^0.22.2",
     "react": "^18.2.0",

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "packages/*"
   ],
   "useWorkspaces": true,
-  "version": "5.2.2"
+  "version": "5.2.3-alpha.0"
 }
diff --git a/packages/guard-angular/package-lock.json b/packages/guard-angular/package-lock.json
diff --git a/packages/guard-angular/package.json b/packages/guard-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/guard-angular",
-  "version": "5.2.2",
+  "version": "5.2.3-alpha.0",
   "description": "Guard for Angular",
   "module": "dist/fesm2015/authing-guard-angular.mjs",
   "types": "dist/index.d.ts",
@@ -33,7 +33,7 @@
     "@angular/core": "^14.0.0"
   },
   "dependencies": {
-    "@authing/guard": "^5.2.2"
+    "@authing/guard": "^5.2.3-alpha.0"
   },
   "author": "https://github.com/authing",
   "license": "MIT",

diff --git a/packages/guard-react/package-lock.json b/packages/guard-react/package-lock.json
diff --git a/packages/guard-react/package.json b/packages/guard-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/guard-react",
-  "version": "5.2.2",
+  "version": "5.2.3-alpha.0",
   "description": "Guard for React",
   "module": "dist/esm/guard.min.js",
   "types": "dist/typings/index.d.ts",
@@ -24,7 +24,7 @@
     "webpack": "^5.72.0"
   },
   "dependencies": {
-    "@authing/guard": "^5.2.2",
+    "@authing/guard": "^5.2.3-alpha.0",
     "react": "^16.13.1"
   },
   "author": "https://github.com/authing",

diff --git a/packages/guard-react18/package-lock.json b/packages/guard-react18/package-lock.json
diff --git a/packages/guard-react18/package.json b/packages/guard-react18/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/guard-react18",
-  "version": "5.2.2",
+  "version": "5.2.3-alpha.0",
   "description": "Guard for React18",
   "module": "dist/esm/guard.min.js",
   "types": "dist/typings/index.d.ts",
@@ -25,7 +25,7 @@
     "webpack": "^5.72.0"
   },
   "dependencies": {
-    "@authing/guard-shim-react18": "^5.2.2",
+    "@authing/guard-shim-react18": "^5.2.3-alpha.0",
     "react": "^18.0.0"
   },
   "author": "https://github.com/authing",

diff --git a/packages/guard-shim-react18/package-lock.json b/packages/guard-shim-react18/package-lock.json
diff --git a/packages/guard-shim-react18/package.json b/packages/guard-shim-react18/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/guard-shim-react18",
-  "version": "5.2.2",
+  "version": "5.2.3-alpha.0",
   "description": "Guard shim for react18",
   "module": "dist/esm/guard.min.js",
   "types": "dist/typings/index.d.ts",

diff --git a/packages/guard-shim-react18/src/index.tsx b/packages/guard-shim-react18/src/index.tsx
@@ -454,10 +454,15 @@ export class Guard {
     const authClient = await this.getAuthClient()
 
     const idToken =
-      authClient.tokenProvider.getToken() || localStorage.getItem('idToken')
+      authClient.tokenProvider.getToken() ||
+      localStorage.getItem('idToken') ||
+      ''
 
     if (!idToken) {
-      return null
+      const user = await authClient.getCurrentUser()
+      if (user) {
+        return user
+      }
     }
 
     const publicConfig = await this.then()

diff --git a/packages/guard-vue2/package-lock.json b/packages/guard-vue2/package-lock.json
diff --git a/packages/guard-vue2/package.json b/packages/guard-vue2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/guard-vue2",
-  "version": "5.2.2",
+  "version": "5.2.3-alpha.0",
   "description": "Guard for Vue2",
   "module": "dist/esm/guard.min.js",
   "types": "dist/typings/index.d.ts",
@@ -23,7 +23,7 @@
     "webpack": "^5.72.0"
   },
   "dependencies": {
-    "@authing/guard": "^5.2.2",
+    "@authing/guard": "^5.2.3-alpha.0",
     "vue": "^2.6.10"
   },
   "author": "https://github.com/authing",

diff --git a/packages/guard-vue3/package-lock.json b/packages/guard-vue3/package-lock.json