mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

enhance: by default, passkey is used for 2fa if passkey is used to login

Browse source
This commit is contained in:
Jacky 2024-09-16 13:57:31 +08:00
parent 0a6a7693a1
commit f42a6c2d08
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
13 changed files with 263 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/src/views/other/Login.vue
View file

@ -8,8 +8,9 @@ import auth from '@/api/auth'
import install from '@/api/install'
import SetLanguage from '@/components/SetLanguage/SetLanguage.vue'
import SwitchAppearance from '@/components/SwitchAppearance/SwitchAppearance.vue'
import OTPAuthorization from '@/components/2FA/2FAAuthorization.vue'
import Authorization from '@/components/2FA/Authorization.vue'
import gettext, { $gettext } from '@/gettext'
import passkey from '@/api/passkey'
const thisYear = new Date().getFullYear()
@ -26,6 +27,7 @@ const enabled2FA = ref(false)
const refOTP = ref()
const passcode = ref('')
const recoveryCode = ref('')
const passkeyConfigStatus = ref(false)
const modelRef = reactive({
username: '',
@ -49,7 +51,7 @@ const rulesRef = reactive({
const { validate, validateInfos, clearValidate } = Form.useForm(modelRef, rulesRef)
const userStore = useUserStore()
const { login } = userStore
const { login, passkeyLogin } = userStore
const { secureSessionId } = storeToRefs(userStore)
const onSubmit = () => {
@ -97,7 +99,7 @@ const onSubmit = () => {
const user = useUserStore()
if (user.is_login) {
if (user.isLogin) {
const next = (route.query?.next || '').toString() || '/dashboard'
router.push(next)
@ -147,8 +149,13 @@ function handleOTPSubmit(code: string, recovery: string) {
onSubmit()
})
}
passkey.get_config_status().then(r => {
passkeyConfigStatus.value = r.status
})
const passkeyLoginLoading = ref(false)
async function passkeyLogin() {
async function handlePasskeyLogin() {
passkeyLoginLoading.value = true
try {
const begin = await auth.begin_passkey_login()
@ -162,7 +169,7 @@ async function passkeyLogin() {
if (r.token) {
const next = (route.query?.next || '').toString() || '/'
login(r.token)
passkeyLogin(asseResp.rawId, r.token)
await router.push(next)
}
@ -217,9 +224,14 @@ async function passkeyLogin() {
</AButton>
</template>
<div v-else>
<OTPAuthorization
<Authorization
ref="refOTP"
@on-submit="handleOTPSubmit"
:two-f-a-status="{
enabled: true,
otp_status: true,
passkey_status: true,
}"
@submit-o-t-p="handleOTPSubmit"
/>
</div>
@ -235,7 +247,10 @@ async function passkeyLogin() {
{{ $gettext('Login') }}
</AButton>
<div class="flex flex-col justify-center">
<div
v-if="passkeyConfigStatus"
class="flex flex-col justify-center"
>
<ADivider>
<div class="text-sm font-normal opacity-75">
{{ $gettext('Or') }}
@ -244,7 +259,7 @@ async function passkeyLogin() {
<AButton
:loading="passkeyLoginLoading"
@click="passkeyLogin"
@click="handlePasskeyLogin"
>
<KeyOutlined />
{{ $gettext('Sign in with a passkey') }}