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 9263b46b4f3a7787b2781e74a1bd287fea7d05c7..11166d52994ec2c07c0daa2d7d2250f7e501989f 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 @@ -1,8 +1,7 @@ -const path = require('path') -const fs = require('fs') const { getWeixinPlatform } = require('./weixin') +const createConfig = require('uni-config-center') const requiredConfig = { 'web.h5-weixin': ['appid', 'appsecret'], @@ -13,6 +12,11 @@ const requiredConfig = { 'mp-alipay.alipay': ['appid', 'privateKey'], 'app.apple': ['bundleId'] } + +const uniIdConfig = createConfig({ + pluginId: 'uni-id' +}) + class ConfigUtils { constructor ({ context @@ -61,14 +65,17 @@ class ConfigUtils { getPlatformConfig () { const appConfig = this.getAppConfig() if (!appConfig) { - throw new Error(`Config for current app (${this.appId}) was not found, please check your config file or client appId`) + throw new Error( + `Config for current app (${this.appId}) was not found, please check your config file or client appId`) } const platform = this.platform if ( (this.platform === 'app' && appConfig['app-plus']) || (this.platform === 'web' && appConfig.h5) ) { - 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`) + 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 = { @@ -116,10 +123,10 @@ class ConfigUtils { } getHooks () { - const configPath = require.resolve('uni-config-center/uni-id') - const hookPath = path.resolve(configPath, 'hooks/index.js') - if (fs.existsSync(hookPath)) { - return require(hookPath) + if (uniIdConfig.hasFile('hooks/index.js')) { + return require( + uniIdConfig.resolve('hooks/index.js') + ) } return {} }