diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js index 7f6c25825193fb6ca4f45646ba604fe092cd7940..99f7873d47c27f3b49f96649b36308e91a7673ac 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js @@ -111,6 +111,8 @@ module.exports = { switch (clientPlatform) { case 'app': case 'app-plus': + case 'app-android': + case 'app-ios': clientPlatform = 'app' break case 'web': diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js index ed77667a2a16a74285253aaa979d4f435ad9348e..7718282eaeb7448fe158989c9f815d4ca0c06b9f 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js @@ -18,7 +18,7 @@ const uniIdConfig = createConfig({ }) class ConfigUtils { - constructor ({ + constructor({ context } = {}) { this.context = context @@ -31,6 +31,8 @@ class ConfigUtils { switch (uniPlatform) { case 'app': case 'app-plus': + case 'app-android': + case 'app-ios': this.platform = 'app' break case 'web': @@ -43,7 +45,7 @@ class ConfigUtils { } } - getConfigArray () { + getConfigArray() { let configContent try { configContent = require('uni-config-center/uni-id/config.json') @@ -57,12 +59,12 @@ class ConfigUtils { return [configContent] } - getAppConfig () { + getAppConfig() { const configArray = this.getConfigArray() return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig) } - getPlatformConfig () { + getPlatformConfig() { const appConfig = this.getAppConfig() if (!appConfig) { throw new Error( @@ -76,8 +78,8 @@ class ConfigUtils { throw new Error( `Client platform is ${this.platform}, but ${this.platform === 'web' ? 'h5' : 'app-plus'} was found in config. Please refer to: https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary?id=m-to-co` ) - } - + } + const defaultConfig = { tokenExpiresIn: 7200, tokenExpiresThreshold: 1200, @@ -87,7 +89,7 @@ class ConfigUtils { return Object.assign(defaultConfig, appConfig, appConfig[platform]) } - getOauthProvider ({ + getOauthProvider({ provider } = {}) { const clientPlatform = this.platform @@ -101,7 +103,7 @@ class ConfigUtils { return oatuhProivder } - getOauthConfig ({ + getOauthConfig({ provider } = {}) { const config = this.getPlatformConfig() @@ -122,7 +124,7 @@ class ConfigUtils { return oauthConfig } - getHooks () { + getHooks() { if (uniIdConfig.hasFile('hooks/index.js')) { return require( uniIdConfig.resolve('hooks/index.js') @@ -132,4 +134,4 @@ class ConfigUtils { } } -module.exports = ConfigUtils +module.exports = ConfigUtils \ No newline at end of file diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js index 18f5b559574e1e8d24ee41c66e443c80e4fbb890..5cc3f45bbfb32ef19737445c254249784d67b160 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js @@ -10,6 +10,8 @@ function getQQPlatform () { switch (platform) { case 'app': case 'app-plus': + case 'app-android': + case 'app-ios': return 'app' case 'mp-qq': return 'mp' diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js index f6cc28eea51e0ad7e1e6268ede21243f5a2c89a6..672eadc29434db778641016bf0ed6c95e6d9b056 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js @@ -43,6 +43,8 @@ function getWeixinPlatform () { switch (platform) { case 'app': case 'app-plus': + case 'app-android': + case 'app-ios': return 'app' case 'mp-weixin': return 'mp'