Merge pull request #214 from Authing/fix-web-domainC14n

zhaoyiming0803 · web-flow · commit cf5f767f9e86 · 2023-04-25T19:59:09.000+08:00
fix(web): update regexp in domainC14n
diff --git a/examples/web/sso/react/website1/package-lock.json b/examples/web/sso/react/website1/package-lock.json
diff --git a/examples/web/sso/react/website1/package.json b/examples/web/sso/react/website1/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@authing/web": "^5.1.3-alpha.2",
+    "@authing/web": "^5.1.6-alpha.2",
     "@types/node": "^16.7.13",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
diff --git a/examples/web/sso/react/website1/yarn.lock b/examples/web/sso/react/website1/yarn.lock
@@ -19,10 +19,10 @@
     "jsonpointer" "^5.0.0"
     "leven" "^3.1.0"
 
-"@authing/web@^5.1.3-alpha.2":
-  "integrity" "sha512-PIfWl4393gkFohoh5CytYtRBnmGsiL49oEXeIf1IfAQXXKEu5xKWBlMEIUKmJ50HAwVITxx2ZbrPNWUR730m4A=="
-  "resolved" "https://registry.npmjs.org/@authing/web/-/web-5.1.3-alpha.2.tgz"
-  "version" "5.1.3-alpha.2"
+"@authing/web@^5.1.6-alpha.2":
+  "integrity" "sha512-yL7pTmou4lqD0KSy+a2M7ULXNJE6xCUwMqjypnKk82JoEh2CmqqCZ5w8B2/0RBkAf6Qqb+QOAo8j81sbVBlZng=="
+  "resolved" "https://registry.npmjs.org/@authing/web/-/web-5.1.6-alpha.2.tgz"
+  "version" "5.1.6-alpha.2"
   dependencies:
     "axios" "^0.26.1"
 
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "npm",
   "packages": ["packages/*"],
   "useWorkspaces": true,
-  "version": "5.1.6-alpha.0"
+  "version": "5.1.6-alpha.2"
 }
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-alpha.0",
+  "version": "5.1.6-alpha.2",
   "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-alpha.0",
+  "version": "5.1.6-alpha.2",
   "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-alpha.1",
+  "version": "5.1.6-alpha.2",
   "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-alpha.1",
+  "version": "5.1.6-alpha.2",
   "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-alpha.1",
+  "version": "5.1.6-alpha.2",
   "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-alpha.0",
+  "version": "5.1.6-alpha.2",
   "description": "Authing miniapp sdk source code",
   "main": "src/index.ts",
   "module": "src/index.ts",
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-alpha.0",
+  "version": "5.1.6-alpha.2",
   "description": "Official SDK of Authing for Browser",
   "main": "dist/global/index.global.js",
   "module": "dist/esm/index.esm.js",
diff --git a/packages/web/src/utils.ts b/packages/web/src/utils.ts
@@ -69,11 +69,10 @@ export async function genPKCEPair(algorithm = 'SHA-256') {
 }
 
 export function domainC14n(domain: string) {
-	const domainExp =
-    /^((?:http)|(?:https):\/\/)?((?:[\w-_]+)(?:\.[\w-_]+)+)(?:\/.*)?$/
+	const domainExp = /^(((?:http)|(?:https)):\/\/)?((?:[\w-_]+)(?:\.[\w-_]+)+)(?:\/.*)?$/
 	const matchRes = domainExp.exec(domain)
-	if (matchRes && matchRes[2]) {
-		return `${matchRes[1] ?? 'https://'}${matchRes[2]}`
+	if (matchRes && matchRes[3]) {
+		return `${matchRes[1] ?? 'https://'}${matchRes[3]}`
 	}
 	throw Error(`无效的域名配置: ${domain}`)
 }
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-alpha.0",
+  "version": "5.1.6-alpha.2",
   "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-alpha.0"`
	`5`	`+ "version": "5.1.6-alpha.2"`
`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-alpha.0",`
	`3`	`+ "version": "5.1.6-alpha.2",`
`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-alpha.0",`
	`3`	`+ "version": "5.1.6-alpha.2",`
`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-alpha.1",`
	`3`	`+ "version": "5.1.6-alpha.2",`
`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-alpha.1",`
	`3`	`+ "version": "5.1.6-alpha.2",`
`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",`