Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ChenYFan_OHHH
uni-app
提交
9ce85c2c
U
uni-app
项目概览
ChenYFan_OHHH
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ce85c2c
编写于
7月 01, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(App): checkIsSupportSoterAuthentication、checkIsSoterEnrolledInDevice、startSoterAuthentication
上级
3969441b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
361 addition
and
0 deletion
+361
-0
packages/uni-api/src/index.ts
packages/uni-api/src/index.ts
+1
-0
packages/uni-api/src/protocols/device/soterAuthentication.ts
packages/uni-api/src/protocols/device/soterAuthentication.ts
+50
-0
packages/uni-app-plus/src/service/api/device/soterAuthentication.ts
...ni-app-plus/src/service/api/device/soterAuthentication.ts
+308
-0
packages/uni-app-plus/src/service/api/index.ts
packages/uni-app-plus/src/service/api/index.ts
+1
-0
packages/uni-components/src/components/radio/index.tsx
packages/uni-components/src/components/radio/index.tsx
+1
-0
未找到文件。
packages/uni-api/src/index.ts
浏览文件 @
9ce85c2c
...
...
@@ -31,6 +31,7 @@ export * from './protocols/device/vibrate'
export
*
from
'
./protocols/device/bluetooth
'
export
*
from
'
./protocols/device/ibeacon
'
export
*
from
'
./protocols/device/brightness
'
export
*
from
'
./protocols/device/soterAuthentication
'
export
*
from
'
./protocols/storage/storage
'
...
...
packages/uni-api/src/protocols/device/soterAuthentication.ts
0 → 100644
浏览文件 @
9ce85c2c
export
const
API_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
=
'
soterAuthentication
'
export
type
API_TYPE_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
=
typeof
uni
.
checkIsSupportSoterAuthentication
export
const
API_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
=
'
checkIsSoterEnrolledInDevice
'
export
type
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
=
typeof
uni
.
checkIsSoterEnrolledInDevice
export
type
CheckIsSoterEnrolledInDeviceCheckAuthMode
=
Parameters
<
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
>
[
0
][
'
checkAuthMode
'
]
const
CheckAuthModes
:
CheckIsSoterEnrolledInDeviceCheckAuthMode
[]
=
[
'
fingerPrint
'
,
'
facial
'
,
'
speech
'
,
]
export
const
CheckIsSoterEnrolledInDeviceOptions
:
ApiOptions
<
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
>
=
{
formatArgs
:
{
checkAuthMode
(
value
,
params
)
{
if
(
!
value
||
!
CheckAuthModes
.
includes
(
value
))
return
'
checkAuthMode 填写错误
'
},
},
}
export
const
CheckIsSoterEnrolledInDeviceProtocols
:
ApiProtocol
<
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
>
=
{
checkAuthMode
:
String
as
any
,
}
export
const
API_START_SOTER_AUTHENTICATION
=
'
checkIsSoterEnrolledInDevice
'
export
type
API_TYPE_START_SOTER_AUTHENTICATION
=
typeof
uni
.
startSoterAuthentication
export
const
StartSoterAuthenticationOptions
:
ApiOptions
<
API_TYPE_START_SOTER_AUTHENTICATION
>
=
{
formatArgs
:
{
requestAuthModes
(
value
,
params
)
{
if
(
!
value
.
includes
(
'
fingerPrint
'
)
&&
!
value
.
includes
(
'
facial
'
))
return
'
requestAuthModes 填写错误
'
},
},
}
export
const
StartSoterAuthenticationProtocols
:
ApiProtocol
<
API_TYPE_START_SOTER_AUTHENTICATION
>
=
{
requestAuthModes
:
{
type
:
Array
,
required
:
true
,
},
challenge
:
String
,
authContent
:
String
,
}
packages/uni-app-plus/src/service/api/device/soterAuthentication.ts
0 → 100644
浏览文件 @
9ce85c2c
import
{
extend
}
from
'
@vue/shared
'
import
{
requireNativePlugin
}
from
'
../../api/base/requireNativePlugin
'
import
{
useI18n
,
initI18nStartSoterAuthenticationMsgsOnce
,
}
from
'
@dcloudio/uni-core
'
import
{
defineAsyncApi
,
API_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
,
API_TYPE_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
,
CheckIsSoterEnrolledInDeviceCheckAuthMode
,
API_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
,
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
,
CheckIsSoterEnrolledInDeviceOptions
,
CheckIsSoterEnrolledInDeviceProtocols
,
API_START_SOTER_AUTHENTICATION
,
API_TYPE_START_SOTER_AUTHENTICATION
,
StartSoterAuthenticationOptions
,
StartSoterAuthenticationProtocols
,
}
from
'
@dcloudio/uni-api
'
function
checkIsSupportFaceID
()
{
const
platform
=
plus
.
os
.
name
!
.
toLowerCase
()
if
(
platform
!==
'
ios
'
)
{
return
false
}
const
faceID
=
requireNativePlugin
(
'
faceID
'
)
return
!!
(
faceID
&&
faceID
.
isSupport
())
}
function
checkIsSupportFingerPrint
()
{
return
!!
(
plus
.
fingerprint
&&
plus
.
fingerprint
.
isSupport
())
}
const
baseCheckIsSupportSoterAuthentication
=
(
resolve
?:
(...
args
:
any
)
=>
void
)
=>
{
const
supportMode
:
UniApp
.
SoterAuthModes
[]
=
[]
if
(
checkIsSupportFingerPrint
())
{
supportMode
.
push
(
'
fingerPrint
'
)
}
if
(
checkIsSupportFaceID
())
{
supportMode
.
push
(
'
facial
'
)
}
resolve
&&
resolve
({
supportMode
,
})
return
{
supportMode
,
errMsg
:
'
checkIsSupportSoterAuthentication:ok
'
,
}
}
export
const
checkIsSupportSoterAuthentication
=
defineAsyncApi
<
API_TYPE_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
>
(
API_CHECK_IS_SUPPORT_SOTER_AUTHENTICATION
,
(
_
,
{
resolve
,
reject
})
=>
{
baseCheckIsSupportSoterAuthentication
(
resolve
)
}
)
const
basecheckIsSoterEnrolledInDevice
=
({
checkAuthMode
,
resolve
,
reject
,
}:
{
checkAuthMode
:
CheckIsSoterEnrolledInDeviceCheckAuthMode
resolve
?:
(...
args
:
any
)
=>
void
reject
?:
(
errMsg
:
string
,
errRes
?:
any
)
=>
void
})
=>
{
const
wrapReject
=
(
errMsg
:
string
,
errRes
?:
any
)
=>
reject
&&
reject
(
errMsg
,
...
errRes
)
const
wrapResolve
=
(
res
?:
any
)
=>
resolve
&&
resolve
(
res
)
if
(
checkAuthMode
===
'
fingerPrint
'
)
{
if
(
checkIsSupportFingerPrint
())
{
const
isEnrolled
=
plus
.
fingerprint
.
isKeyguardSecure
()
&&
plus
.
fingerprint
.
isEnrolledFingerprints
()
wrapResolve
({
isEnrolled
})
return
{
isEnrolled
,
errMsg
:
'
checkIsSoterEnrolledInDevice:ok
'
,
}
}
wrapReject
(
'
not support
'
,
{
isEnrolled
:
false
})
return
{
isEnrolled
:
false
,
errMsg
:
'
checkIsSoterEnrolledInDevice:fail not support
'
,
}
}
else
if
(
checkAuthMode
===
'
facial
'
)
{
if
(
checkIsSupportFaceID
())
{
const
faceID
=
requireNativePlugin
(
'
faceID
'
)
const
isEnrolled
=
faceID
&&
faceID
.
isKeyguardSecure
()
&&
faceID
.
isEnrolledFaceID
()
wrapResolve
({
isEnrolled
})
return
{
isEnrolled
,
errMsg
:
'
checkIsSoterEnrolledInDevice:ok
'
,
}
}
wrapReject
(
'
not support
'
,
{
isEnrolled
:
false
})
return
{
isEnrolled
:
false
,
errMsg
:
'
checkIsSoterEnrolledInDevice:fail not support
'
,
}
}
wrapReject
(
'
not support
'
,
{
isEnrolled
:
false
})
return
{
isEnrolled
:
false
,
errMsg
:
'
checkIsSoterEnrolledInDevice:fail not support
'
,
}
}
export
const
checkIsSoterEnrolledInDevice
=
defineAsyncApi
<
API_TYPE_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
>
(
API_CHECK_IS_SOTER_ENROLLED_IN_DEVICE
,
({
checkAuthMode
},
{
resolve
,
reject
})
=>
{
basecheckIsSoterEnrolledInDevice
({
checkAuthMode
,
resolve
,
reject
})
},
CheckIsSoterEnrolledInDeviceProtocols
,
CheckIsSoterEnrolledInDeviceOptions
)
export
const
startSoterAuthentication
=
defineAsyncApi
<
API_TYPE_START_SOTER_AUTHENTICATION
>
(
API_START_SOTER_AUTHENTICATION
,
(
{
requestAuthModes
,
challenge
=
false
,
authContent
},
{
resolve
,
reject
}
)
=>
{
/*
以手机不支持facial未录入fingerPrint为例
requestAuthModes:['facial','fingerPrint']时,微信小程序返回值里的authMode为"fingerPrint"
requestAuthModes:['fingerPrint','facial']时,微信小程序返回值里的authMode为"fingerPrint"
即先过滤不支持的方式之后再判断是否录入
微信小程序errCode(从企业号开发者中心查到如下文档):
0:识别成功 'startSoterAuthentication:ok'
90001:本设备不支持SOTER 'startSoterAuthentication:fail not support soter'
90002:用户未授权微信使用该生物认证接口 注:APP端暂不支持
90003:请求使用的生物认证方式不支持 'startSoterAuthentication:fail no corresponding mode'
90004:未传入challenge或challenge长度过长(最长512字符)注:APP端暂不支持
90005:auth_content长度超过限制(最长42个字符)注:微信小程序auth_content指纹识别时无效果,faceID暂未测试
90007:内部错误 'startSoterAuthentication:fail auth key update error'
90008:用户取消授权 'startSoterAuthentication:fail cancel'
90009:识别失败 'startSoterAuthentication:fail'
90010:重试次数过多被冻结 'startSoterAuthentication:fail authenticate freeze. please try again later'
90011:用户未录入所选识别方式 'startSoterAuthentication:fail no fingerprint enrolled'
*/
initI18nStartSoterAuthenticationMsgsOnce
()
const
{
t
}
=
useI18n
()
const
supportMode
=
baseCheckIsSupportSoterAuthentication
().
supportMode
if
(
supportMode
.
length
===
0
)
{
return
{
authMode
:
'
fingerPrint
'
,
errCode
:
90001
,
errMsg
:
'
startSoterAuthentication:fail
'
,
}
}
const
supportRequestAuthMode
:
UniApp
.
SoterAuthModes
[]
=
[]
requestAuthModes
.
map
((
item
,
index
)
=>
{
if
(
supportMode
.
indexOf
(
item
)
>
-
1
)
{
supportRequestAuthMode
.
push
(
item
)
}
})
if
(
supportRequestAuthMode
.
length
===
0
)
{
return
{
authMode
:
'
fingerPrint
'
,
errCode
:
90003
,
errMsg
:
'
startSoterAuthentication:fail no corresponding mode
'
,
}
}
const
enrolledRequestAuthMode
:
UniApp
.
SoterAuthModes
[]
=
[]
supportRequestAuthMode
.
map
((
item
,
index
)
=>
{
const
checked
=
basecheckIsSoterEnrolledInDevice
({
checkAuthMode
:
item
,
}).
isEnrolled
if
(
checked
)
{
enrolledRequestAuthMode
.
push
(
item
)
}
})
if
(
enrolledRequestAuthMode
.
length
===
0
)
{
return
{
authMode
:
supportRequestAuthMode
[
0
],
errCode
:
90011
,
errMsg
:
`startSoterAuthentication:fail no
${
supportRequestAuthMode
[
0
]}
enrolled`
,
}
}
const
realAuthMode
=
enrolledRequestAuthMode
[
0
]
if
(
realAuthMode
===
'
fingerPrint
'
)
{
if
(
plus
.
os
.
name
!
.
toLowerCase
()
===
'
android
'
)
{
plus
.
nativeUI
.
showWaiting
(
authContent
||
t
(
'
uni.startSoterAuthentication.authContent
'
)
).
onclose
=
function
()
{
plus
.
fingerprint
.
cancel
()
}
}
plus
.
fingerprint
.
authenticate
(
()
=>
{
plus
.
nativeUI
.
closeWaiting
()
resolve
({
authMode
:
realAuthMode
,
errCode
:
0
,
})
},
(
e
)
=>
{
const
res
=
{
authMode
:
realAuthMode
,
}
switch
(
e
.
code
)
{
case
e
.
AUTHENTICATE_MISMATCH
:
// 微信小程序没有这个回调,如果要实现此处回调需要多次触发需要用事件publish实现
// invoke(callbackId, {
// authMode: realAuthMode,
// errCode: 90009,
// errMsg: 'startSoterAuthentication:fail'
// })
break
case
e
.
AUTHENTICATE_OVERLIMIT
:
// 微信小程序在第一次重试次数超限时安卓IOS返回不一致,安卓端会返回次数超过限制(errCode: 90010),IOS端会返回认证失败(errCode: 90009)。APP-IOS实际运行时不会次数超限,超过指定次数之后会弹出输入密码的界面
plus
.
nativeUI
.
closeWaiting
()
reject
(
'
authenticate freeze. please try again later
'
,
extend
(
res
,
{
errCode
:
90010
,
})
)
break
case
e
.
CANCEL
:
plus
.
nativeUI
.
closeWaiting
()
reject
(
'
cancel
'
,
extend
(
res
,
{
errCode
:
90008
,
})
)
break
default
:
plus
.
nativeUI
.
closeWaiting
()
reject
(
''
,
extend
(
res
,
{
errCode
:
90007
,
})
)
break
}
},
{
message
:
authContent
,
}
)
}
else
if
(
realAuthMode
===
'
facial
'
)
{
const
faceID
=
requireNativePlugin
(
'
faceID
'
)
faceID
.
authenticate
(
{
message
:
authContent
,
},
(
e
:
Data
)
=>
{
const
res
=
{
authMode
:
realAuthMode
,
}
if
(
e
.
type
===
'
success
'
&&
e
.
code
===
0
)
{
resolve
({
authMode
:
realAuthMode
,
errCode
:
0
,
})
}
else
{
switch
(
e
.
code
)
{
case
4
:
reject
(
''
,
extend
(
res
,
{
errCode
:
90009
,
})
)
break
case
5
:
reject
(
'
authenticate freeze. please try again later
'
,
extend
(
res
,
{
errCode
:
90010
,
})
)
break
case
6
:
reject
(
''
,
extend
(
res
,
{
errCode
:
90008
,
})
)
break
default
:
reject
(
''
,
extend
(
res
,
{
errCode
:
90007
,
})
)
break
}
}
}
)
}
},
StartSoterAuthenticationProtocols
,
StartSoterAuthenticationOptions
)
packages/uni-app-plus/src/service/api/index.ts
浏览文件 @
9ce85c2c
...
...
@@ -10,6 +10,7 @@ export * from './device/ibeacon'
export
*
from
'
./device/makePhoneCall
'
export
*
from
'
./device/clipboard
'
export
*
from
'
./device/network
'
export
*
from
'
./device/soterAuthentication
'
export
*
from
'
./media/getImageInfo
'
export
*
from
'
./media/getVideoInfo
'
...
...
packages/uni-components/src/components/radio/index.tsx
浏览文件 @
9ce85c2c
...
...
@@ -87,6 +87,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({
<
div
class
=
"uni-radio-wrapper"
>
<
div
class
=
"uni-radio-input"
// @ts-ignore
class
=
{
{
'
uni-radio-input-disabled
'
:
props
.
disabled
}
}
style
=
{
radioChecked
.
value
?
checkedStyle
.
value
:
''
}
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录