Skip to content

Commit abe59a0

Browse files
Merge origin branch 'master' into 'fix-web-domainC14'
2 parents 4a55cb4 + 617ae92 commit abe59a0

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-jsencrypt/index.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-sm2encrypt/index.js

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-wx/index.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-wx/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/miniprogram_npm/jsbn/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/miniapp-wx/miniapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"dependencies": {
1212
"@authing/miniapp-jsencrypt": "^5.1.0",
1313
"@authing/miniapp-sm2encrypt": "^5.1.0",
14-
"@authing/miniapp-wx": "^5.1.5-alpha.1"
14+
"@authing/miniapp-wx": "^5.1.6-alpha.0"
1515
}
1616
}

examples/miniapp-wx/miniapp/pages/index/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Page({
2424
async loginByPhone (e) {
2525
const { code } = e.detail
2626
const res = await authing.loginByPhone({
27-
extIdpConnidentifier: 'EXT_IDP_CONNIDENTIFIER',
27+
extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
2828
wechatMiniProgramCodeAndPhonePayload: {
2929
wxPhoneInfo: {
3030
code
@@ -39,7 +39,7 @@ Page({
3939

4040
async loginByCode () {
4141
const res = await authing.loginByCode({
42-
extIdpConnidentifier: 'EXT_IDP_CONNIDENTIFIER',
42+
extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
4343
options: {
4444
scope: 'openid profile offline_access'
4545
}
@@ -56,7 +56,7 @@ Page({
5656
const { code } = e.detail
5757

5858
const res = await authing.getPhone({
59-
extIdpConnidentifier: 'EXT_IDP_CONNIDENTIFIER',
59+
extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
6060
code
6161
})
6262

@@ -258,7 +258,7 @@ Page({
258258

259259
async decryptData () {
260260
const res = await authing.decryptData({
261-
extIdpConnidentifier: 'EXT_IDP_CONNIDENTIFIER',
261+
extIdpConnidentifier: 'AUTHING_EXT_IDP_CONN_IDENTIFIER',
262262
encryptedData: '',
263263
iv: '',
264264
code: ''

packages/miniapp/src/Authing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class Authing {
9898
): Promise<LoginState> {
9999
const _loginState: LoginState = {
100100
...loginState,
101-
expires_at: loginState.expires_in * 1000 + Date.now() - 3600 * 1000 * 2
101+
expires_at: loginState.expires_in * 1000 + Date.now()
102102
}
103103

104104
await this.storage.set(

0 commit comments

Comments
 (0)