兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）

uni_modules/uni-id-pages-x/uniCloud/cloudfunctions/uni-id-co/common/utils.js

@@ -171,13 +171,6 @@ function getNonceStr (length = 16) {
   return str.substring(0, length)
 }
 
-try {
-  require('lodash.merge')
-} catch (error) {
-  console.error('uni-id-co缺少依赖，请在uniCloud/cloudfunctions/uni-id-co目录执行 npm install 安装依赖')
-  throw error
-}
-
 function isMatchUserApp (userAppList, matchAppList) {
   if (userAppList === undefined || userAppList === null) {
     return true

uni_modules/uni-id-pages-x/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':

uni_modules/uni-id-pages-x/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js

-const rsaPublicKeyPem = require('../rsa-public-key-pem')
+const rsaPublicKeyPem = require('../rsa-public-key-pem')
+const {
+  jwtVerify
+} = require('../../../npm/index')
 let authKeysCache = null
 
 module.exports = class Auth {
@@ -44,7 +47,7 @@ module.exports = class Auth {
      *   nonce_supported: true
      * }
      */
-    const payload = require('jsonwebtoken').verify(
+    const payload = jwtVerify(
       identityToken,
       rsaPublicKeyPem(usedKey.n, usedKey.e),
       {

uni_modules/uni-id-pages-x/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

uni_modules/uni-id-pages-x/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'

uni_modules/uni-id-pages-x/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js

@@ -16,7 +16,9 @@ const {
   logout
 } = require('./logout')
 const PasswordUtils = require('./password')
-const merge = require('lodash.merge')
+const { 
+  merge
+} = require('../npm/index')
 
 async function realPreRegister (params = {}) {
   const {

uni_modules/uni-id-pages-x/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js

@@ -14,7 +14,9 @@ const {
 const {
   batchFindObjctValue
 } = require('../../common/utils')
-const merge = require('lodash.merge')
+const {
+  merge
+} = require('../npm/index')
 
 /**
  *

uni_modules/uni-id-pages-x/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'

uni_modules/uni-id-pages-x/uniCloud/cloudfunctions/uni-id-co/package.json

 {
   "name": "uni-id-co",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "description": "",
   "main": "index.js",
   "keywords": [],
   "author": "DCloud",
   "dependencies": {
-    "jsonwebtoken": "8.5.1",
-    "lodash.merge": "^4.6.2",
     "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
     "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
     "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",