Merge pull request #222 from Authing/feat/miniapp-gid

zhaojj332 · web-flow · commit d9ae963c8375 · 2023-05-24T15:48:20.000+08:00
Feat/miniapp gid
diff --git a/examples/miniapp-wx/miniapp/pages/index/index.ts b/examples/miniapp-wx/miniapp/pages/index/index.ts
@@ -16,6 +16,27 @@ const authing = new Authing({
 
 Page({
   data: {},
+  onLoad() {
+    // 开启 shareTicket 用户分享获取群聊 id
+    wx.updateShareMenu({
+      withShareTicket: true,
+    })
+  },
+  onShareAppMessage() {
+    const promise = new Promise(resolve => {
+      setTimeout(() => {
+        resolve({
+          title: '自定义转发标题'
+        })
+      }, 2000)
+    })
+    return {
+      title: '自定义转发标题',
+      path: '/pages/index',
+      promise
+    }
+  },
+
 
   /**
    * 需要在真机上测试，微信开发者工具不会返回 code
@@ -257,11 +278,13 @@ Page({
   },
 
   async decryptData () {
+    const code = await authing.getLoginCode()
+
     const res = await authing.decryptData({
       extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
       encryptedData: '',
       iv: '',
-      code: ''
+      code
     })
 
     console.log('authing.decryptData res: ', res)
@@ -274,5 +297,30 @@ Page({
     })
 
     console.log('authing.getAccessToken res: ', res)
+  },
+
+  getShareInfo() {
+    const {shareTicket} = wx.getLaunchOptionsSync()
+
+    wx.getShareInfo({
+      shareTicket,
+      async success({encryptedData, iv}: any) {
+        // 公共方法获取 code
+        const code = await authing.getLoginCode()
+
+        // 解密数据
+        const res = await authing.decryptData({
+          extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
+          encryptedData,
+          iv,
+          code
+        })
+
+        console.log('authing.decryptData res: ', res)
+      },
+      fail(error: any) {
+        console.log("error: ", error);
+      }
+    })
   }
 })
diff --git a/examples/miniapp-wx/miniapp/pages/index/index.wxml b/examples/miniapp-wx/miniapp/pages/index/index.wxml
@@ -32,3 +32,5 @@
 
 <button bindtap="getLoginState">getLoginState</button>
 <button bindtap="clearLoginState">clearLoginState</button>
+
+<button bindtap="getShareInfo">getShareInfo</button>
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "npm",
   "packages": ["packages/*"],
   "useWorkspaces": true,
-  "version": "5.1.6"
+  "version": "5.1.7-alpha.0"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/miniapp-jsencrypt/package.json b/packages/miniapp-jsencrypt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp-jsencrypt",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "JavaScript encrypt module for miniapp",
   "main": "lib/index.js",
   "module": "lib/index.js",
diff --git a/packages/miniapp-sm2encrypt/package-lock.json b/packages/miniapp-sm2encrypt/package-lock.json
diff --git a/packages/miniapp-sm2encrypt/package.json b/packages/miniapp-sm2encrypt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp-sm2encrypt",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "JavaScript sm2 encrypt module for miniapp",
   "main": "lib/index.js",
   "module": "lib/index.js",
diff --git a/packages/miniapp-taro/package.json b/packages/miniapp-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp-taro",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Authing miniapp JS SDK for Taro",
   "main": "dist/bundle-taro.js",
   "types": "dist/typings/src/index.d.ts",
diff --git a/packages/miniapp-uniapp/package.json b/packages/miniapp-uniapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp-uniapp",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Authing miniapp JS SDK for uniapp",
   "main": "dist/bundle-uniapp.js",
   "types": "dist/typings/src/index.d.ts",
diff --git a/packages/miniapp-wx/package.json b/packages/miniapp-wx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp-wx",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Authing miniapp JS SDK for WX",
   "main": "dist/bundle-wx.js",
   "types": "dist/typings/src/index.d.ts",
diff --git a/packages/miniapp/package-lock.json b/packages/miniapp/package-lock.json
diff --git a/packages/miniapp/package.json b/packages/miniapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/miniapp",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Authing miniapp sdk source code",
   "main": "src/index.ts",
   "module": "src/index.ts",
diff --git a/packages/miniapp/src/Authing.ts b/packages/miniapp/src/Authing.ts
@@ -905,28 +905,12 @@ export class Authing {
 	}
 
 	async decryptData(data: DecryptDataOptions) {
-		const [error, loginState] = await this.getLoginState()
-
-		if (error) {
-			return returnError({
-				message: 'Token has expired, please login again'
-			})
-		}
-
-		const { access_token, expires_at } = loginState as LoginState
-
-		if (expires_at < Date.now()) {
-			return returnError({
-				message: 'Token has expired, please login again'
-			})
-		}
 
 		const [decryptError, res] = await request({
 			method: 'POST',
 			url: `${this.options.host}/api/v3/decrypt-wechat-miniprogram-data`,
 			data,
 			header: {
-				Authorization: access_token,
 				'x-authing-userpool-id': this.options.userPoolId
 			}
 		})
@@ -972,4 +956,5 @@ export class Authing {
 		return returnSuccess(res)
 	}
 
+
 }
diff --git a/packages/web/package-lock.json b/packages/web/package-lock.json
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/web",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Official SDK of Authing for Browser",
   "main": "dist/global/index.global.js",
   "module": "dist/esm/index.esm.js",
diff --git a/packages/weixin-official-account/package-lock.json b/packages/weixin-official-account/package-lock.json
diff --git a/packages/weixin-official-account/package.json b/packages/weixin-official-account/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@authing/weixin-official-account",
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.0",
   "description": "Authing SDK for Weixin official account",
   "module": "dist/esm/weixin-official-account.min.js",
   "types": "dist/typings/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"npmClient": "npm",`
`3`	`3`	`"packages": ["packages/*"],`
`4`	`4`	`"useWorkspaces": true,`
`5`		`- "version": "5.1.6"`
	`5`	`+ "version": "5.1.7-alpha.0"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@authing/miniapp-jsencrypt",`
`3`		`- "version": "5.1.6",`
	`3`	`+ "version": "5.1.7-alpha.0",`
`4`	`4`	`"description": "JavaScript encrypt module for miniapp",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"module": "lib/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@authing/miniapp-sm2encrypt",`
`3`		`- "version": "5.1.6",`
	`3`	`+ "version": "5.1.7-alpha.0",`
`4`	`4`	`"description": "JavaScript sm2 encrypt module for miniapp",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"module": "lib/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@authing/miniapp-taro",`
`3`		`- "version": "5.1.6",`
	`3`	`+ "version": "5.1.7-alpha.0",`
`4`	`4`	`"description": "Authing miniapp JS SDK for Taro",`
`5`	`5`	`"main": "dist/bundle-taro.js",`
`6`	`6`	`"types": "dist/typings/src/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@authing/miniapp-uniapp",`
`3`		`- "version": "5.1.6",`
	`3`	`+ "version": "5.1.7-alpha.0",`
`4`	`4`	`"description": "Authing miniapp JS SDK for uniapp",`
`5`	`5`	`"main": "dist/bundle-uniapp.js",`
`6`	`6`	`"types": "dist/typings/src/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@authing/miniapp-wx",`
`3`		`- "version": "5.1.6",`
	`3`	`+ "version": "5.1.7-alpha.0",`
`4`	`4`	`"description": "Authing miniapp JS SDK for WX",`
`5`	`5`	`"main": "dist/bundle-wx.js",`
`6`	`6`	`"types": "dist/typings/src/index.d.ts",`