...
 
Commits (4)
    https://gitcode.net/dcloud/hello_uni-id-pages/-/commit/94584efa8d89efd037d8fbadfb5d1468286f43c6 feat: 兼容uni-app-x的客户端平台 2024-04-28T16:04:47+08:00 王亚琪 wangyaqi988@163.com https://gitcode.net/dcloud/hello_uni-id-pages/-/commit/60171c1ed46e73e277a9f9e55233c0d4ee29c737 feat: 内置npm依赖减少因依赖安装导致的上传失败 2024-04-28T16:04:47+08:00 王亚琪 wangyaqi988@163.com https://gitcode.net/dcloud/hello_uni-id-pages/-/commit/5a408663ca2b73970d5ef8c22268d26d1354d042 Update package.json 2024-04-28T16:04:48+08:00 王亚琪 wangyaqi988@163.com https://gitcode.net/dcloud/hello_uni-id-pages/-/commit/cfee1e783c05e1bf17ad8b4cffc82b9d5d595149 update uni-id-common/publish 1.1.20 2024-04-28T16:05:27+08:00 Anne_LXM liuxiaomei@dcloud.io
## 1.0.17(2024-04-26)
- 兼容uni-app-x对客户端uniPlatform的调整(uni-app-x内uniPlatform区分app-android、app-ios)
## 1.0.16(2023-04-25) ## 1.0.16(2023-04-25)
- 新增maxTokenLength配置,用于限制数据库用户记录token数组的最大长度 - 新增maxTokenLength配置,用于限制数据库用户记录token数组的最大长度
## 1.0.15(2023-04-06) ## 1.0.15(2023-04-06)
......
{ {
"id": "uni-id-common", "id": "uni-id-common",
"displayName": "uni-id-common", "displayName": "uni-id-common",
"version": "1.0.16", "version": "1.0.17",
"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块", "description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
"keywords": [ "keywords": [
"uni-id-common", "uni-id-common",
"uniCloud", "uniCloud",
"token", "token",
"权限" "权限"
], ],
"repository": "https://gitcode.net/dcloud/uni-id-common", "repository": "https://gitcode.net/dcloud/uni-id-common",
"engines": { "engines": {
"HBuilderX": "^3.1.0" "HBuilderX": "^3.1.0"
}, },
"dcloudext": { "dcloudext": {
"sale": { "sale": {
"regular": { "regular": {
"price": "0.00" "price": "0.00"
}, },
"sourcecode": { "sourcecode": {
"price": "0.00" "price": "0.00"
} }
}, },
"contact": { "contact": {
"qq": "" "qq": ""
}, },
"declaration": { "declaration": {
"ads": "无", "ads": "无",
"data": "无", "data": "无",
"permissions": "无" "permissions": "无"
}, },
"npmurl": "", "npmurl": "",
"type": "unicloud-template-function" "type": "unicloud-template-function"
}, },
"uni_modules": { "uni_modules": {
"dependencies": ["uni-config-center"], "dependencies": ["uni-config-center"],
"encrypt": [], "encrypt": [],
"platforms": { "platforms": {
"cloud": { "cloud": {
"tcb": "y", "tcb": "y",
"aliyun": "y" "aliyun": "y",
}, "alipay": "n"
"client": { },
"Vue": { "client": {
"vue2": "u", "Vue": {
"vue3": "u" "vue2": "u",
}, "vue3": "u"
"App": { },
"app-vue": "u", "App": {
"app-nvue": "u" "app-vue": "u",
}, "app-nvue": "u"
"H5-mobile": { },
"Safari": "u", "H5-mobile": {
"Android Browser": "u", "Safari": "u",
"微信浏览器(Android)": "u", "Android Browser": "u",
"QQ浏览器(Android)": "u" "微信浏览器(Android)": "u",
}, "QQ浏览器(Android)": "u"
"H5-pc": { },
"Chrome": "u", "H5-pc": {
"IE": "u", "Chrome": "u",
"Edge": "u", "IE": "u",
"Firefox": "u", "Edge": "u",
"Safari": "u" "Firefox": "u",
}, "Safari": "u"
"小程序": { },
"微信": "u", "小程序": {
"阿里": "u", "微信": "u",
"百度": "u", "阿里": "u",
"字节跳动": "u", "百度": "u",
"QQ": "u", "字节跳动": "u",
"钉钉": "u", "QQ": "u",
"快手": "u", "钉钉": "u",
"飞书": "u", "快手": "u",
"京东": "u" "飞书": "u",
}, "京东": "u"
"快应用": { },
"华为": "u", "快应用": {
"联盟": "u" "华为": "u",
} "联盟": "u"
} }
} }
} }
}
} }
# uni-id-common # uni-id-common
文档请参考:[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html) 文档请参考:[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)
\ No newline at end of file
{ {
"name": "uni-id-common", "name": "uni-id-common",
"version": "1.0.16", "version": "1.0.17",
"description": "uni-id token生成、校验、刷新", "description": "uni-id token生成、校验、刷新",
"main": "index.js", "main": "index.js",
"homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html", "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",
......
## 1.1.20(2024-04-28)
- uni-id-co 兼容uni-app-x对客户端uniPlatform的调整(uni-app-x内uniPlatform区分app-android、app-ios)
## 1.1.19(2024-03-20) ## 1.1.19(2024-03-20)
- uni-id-co 修复 实人认证的认证照片在阿里云服务空间没有保存到指定路径下的Bug - uni-id-co 修复 实人认证的认证照片在阿里云服务空间没有保存到指定路径下的Bug
- uni-id-co 修复 云对象开发依赖未移除的Bug - uni-id-co 修复 云对象开发依赖未移除的Bug
......
{ {
"id": "uni-id-pages", "id": "uni-id-pages",
"displayName": "uni-id-pages", "displayName": "uni-id-pages",
"version": "1.1.19", "version": "1.1.20",
"description": "云端一体简单、统一、可扩展的用户中心页面模版", "description": "云端一体简单、统一、可扩展的用户中心页面模版",
"keywords": [ "keywords": [
"用户管理", "用户管理",
......
...@@ -171,13 +171,6 @@ function getNonceStr (length = 16) { ...@@ -171,13 +171,6 @@ function getNonceStr (length = 16) {
return str.substring(0, length) 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) { function isMatchUserApp (userAppList, matchAppList) {
if (userAppList === undefined || userAppList === null) { if (userAppList === undefined || userAppList === null) {
return true return true
......
...@@ -111,6 +111,8 @@ module.exports = { ...@@ -111,6 +111,8 @@ module.exports = {
switch (clientPlatform) { switch (clientPlatform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
clientPlatform = 'app' clientPlatform = 'app'
break break
case 'web': case 'web':
......
const rsaPublicKeyPem = require('../rsa-public-key-pem') const rsaPublicKeyPem = require('../rsa-public-key-pem')
const {
jwtVerify
} = require('../../../npm/index')
let authKeysCache = null let authKeysCache = null
module.exports = class Auth { module.exports = class Auth {
...@@ -44,7 +47,7 @@ module.exports = class Auth { ...@@ -44,7 +47,7 @@ module.exports = class Auth {
* nonce_supported: true * nonce_supported: true
* } * }
*/ */
const payload = require('jsonwebtoken').verify( const payload = jwtVerify(
identityToken, identityToken,
rsaPublicKeyPem(usedKey.n, usedKey.e), rsaPublicKeyPem(usedKey.n, usedKey.e),
{ {
......
...@@ -18,7 +18,7 @@ const uniIdConfig = createConfig({ ...@@ -18,7 +18,7 @@ const uniIdConfig = createConfig({
}) })
class ConfigUtils { class ConfigUtils {
constructor ({ constructor({
context context
} = {}) { } = {}) {
this.context = context this.context = context
...@@ -31,6 +31,8 @@ class ConfigUtils { ...@@ -31,6 +31,8 @@ class ConfigUtils {
switch (uniPlatform) { switch (uniPlatform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
this.platform = 'app' this.platform = 'app'
break break
case 'web': case 'web':
...@@ -43,7 +45,7 @@ class ConfigUtils { ...@@ -43,7 +45,7 @@ class ConfigUtils {
} }
} }
getConfigArray () { getConfigArray() {
let configContent let configContent
try { try {
configContent = require('uni-config-center/uni-id/config.json') configContent = require('uni-config-center/uni-id/config.json')
...@@ -57,12 +59,12 @@ class ConfigUtils { ...@@ -57,12 +59,12 @@ class ConfigUtils {
return [configContent] return [configContent]
} }
getAppConfig () { getAppConfig() {
const configArray = this.getConfigArray() const configArray = this.getConfigArray()
return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig) return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
} }
getPlatformConfig () { getPlatformConfig() {
const appConfig = this.getAppConfig() const appConfig = this.getAppConfig()
if (!appConfig) { if (!appConfig) {
throw new Error( throw new Error(
...@@ -76,8 +78,8 @@ class ConfigUtils { ...@@ -76,8 +78,8 @@ class ConfigUtils {
throw new Error( 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` `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 = { const defaultConfig = {
tokenExpiresIn: 7200, tokenExpiresIn: 7200,
tokenExpiresThreshold: 1200, tokenExpiresThreshold: 1200,
...@@ -87,7 +89,7 @@ class ConfigUtils { ...@@ -87,7 +89,7 @@ class ConfigUtils {
return Object.assign(defaultConfig, appConfig, appConfig[platform]) return Object.assign(defaultConfig, appConfig, appConfig[platform])
} }
getOauthProvider ({ getOauthProvider({
provider provider
} = {}) { } = {}) {
const clientPlatform = this.platform const clientPlatform = this.platform
...@@ -101,7 +103,7 @@ class ConfigUtils { ...@@ -101,7 +103,7 @@ class ConfigUtils {
return oatuhProivder return oatuhProivder
} }
getOauthConfig ({ getOauthConfig({
provider provider
} = {}) { } = {}) {
const config = this.getPlatformConfig() const config = this.getPlatformConfig()
...@@ -122,7 +124,7 @@ class ConfigUtils { ...@@ -122,7 +124,7 @@ class ConfigUtils {
return oauthConfig return oauthConfig
} }
getHooks () { getHooks() {
if (uniIdConfig.hasFile('hooks/index.js')) { if (uniIdConfig.hasFile('hooks/index.js')) {
return require( return require(
uniIdConfig.resolve('hooks/index.js') uniIdConfig.resolve('hooks/index.js')
...@@ -132,4 +134,4 @@ class ConfigUtils { ...@@ -132,4 +134,4 @@ class ConfigUtils {
} }
} }
module.exports = ConfigUtils module.exports = ConfigUtils
\ No newline at end of file
...@@ -10,6 +10,8 @@ function getQQPlatform () { ...@@ -10,6 +10,8 @@ function getQQPlatform () {
switch (platform) { switch (platform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
return 'app' return 'app'
case 'mp-qq': case 'mp-qq':
return 'mp' return 'mp'
......
...@@ -16,7 +16,9 @@ const { ...@@ -16,7 +16,9 @@ const {
logout logout
} = require('./logout') } = require('./logout')
const PasswordUtils = require('./password') const PasswordUtils = require('./password')
const merge = require('lodash.merge') const {
merge
} = require('../npm/index')
async function realPreRegister (params = {}) { async function realPreRegister (params = {}) {
const { const {
......
...@@ -14,7 +14,9 @@ const { ...@@ -14,7 +14,9 @@ const {
const { const {
batchFindObjctValue batchFindObjctValue
} = require('../../common/utils') } = require('../../common/utils')
const merge = require('lodash.merge') const {
merge
} = require('../npm/index')
/** /**
* *
......
...@@ -43,6 +43,8 @@ function getWeixinPlatform () { ...@@ -43,6 +43,8 @@ function getWeixinPlatform () {
switch (platform) { switch (platform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
return 'app' return 'app'
case 'mp-weixin': case 'mp-weixin':
return 'mp' return 'mp'
......
{ {
"name": "uni-id-co", "name": "uni-id-co",
"version": "1.1.19", "version": "1.1.20",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"keywords": [], "keywords": [],
"author": "DCloud", "author": "DCloud",
"dependencies": { "dependencies": {
"jsonwebtoken": "8.5.1",
"lodash.merge": "^4.6.2",
"uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha", "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
"uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center", "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", "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
......