@adminforth/two-factors-auth 1.5.1 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build.log +2 -2
- package/custom/TwoFaModal.vue +17 -11
- package/custom/TwoFactorsConfirmation.vue +6 -5
- package/custom/TwoFactorsSetup.vue +23 -24
- package/dist/custom/TwoFaModal.vue +17 -11
- package/dist/custom/TwoFactorsConfirmation.vue +6 -5
- package/dist/custom/TwoFactorsSetup.vue +23 -24
- package/dist/index.js +26 -0
- package/index.ts +28 -0
- package/package.json +1 -1
package/build.log
CHANGED
|
@@ -11,5 +11,5 @@ custom/package-lock.json
|
|
|
11
11
|
custom/package.json
|
|
12
12
|
custom/tsconfig.json
|
|
13
13
|
|
|
14
|
-
sent 31,
|
|
15
|
-
total size is 30,
|
|
14
|
+
sent 31,283 bytes received 134 bytes 62,834.00 bytes/sec
|
|
15
|
+
total size is 30,790 speedup is 0.98
|
package/custom/TwoFaModal.vue
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="fixed inset-0 z-[9999] flex items-center justify-center bg-black/50 top-0 bottom-0 left-0 right-0"
|
|
3
3
|
v-if ="modelShow">
|
|
4
4
|
<div class="relative bg-white dark:bg-gray-700 rounded-lg shadow p-6 w-full max-w-md">
|
|
5
|
-
<div id="mfaCode-label" class="mb-4 text-gray-700 dark:text-gray-100">
|
|
5
|
+
<div id="mfaCode-label" class="mb-4 text-gray-700 dark:text-gray-100 text-center">
|
|
6
6
|
{{ $t('Please enter your authenticator code') }}
|
|
7
7
|
</div>
|
|
8
8
|
|
|
@@ -57,14 +57,15 @@
|
|
|
57
57
|
let resolveFn: ((code: string) => void) | null = null;
|
|
58
58
|
let verifyingCallback: ((code: string) => boolean) | null = null;
|
|
59
59
|
let verifyFn: null | ((code: string) => Promise<boolean> | boolean) = null;
|
|
60
|
+
let rejectFn: ((err?: any) => void) | null = null;
|
|
60
61
|
|
|
61
62
|
window.adminforthTwoFaModal = {
|
|
62
|
-
getCode: (verifyingCallback?: () => Promise<boolean>) =>
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
63
|
+
getCode: (verifyingCallback?: (code: string) => Promise<boolean>) =>
|
|
64
|
+
new Promise((resolve, reject) => {
|
|
65
|
+
if (modelShow.value) throw new Error('Modal is already open');
|
|
66
66
|
modelShow.value = true;
|
|
67
67
|
resolveFn = resolve;
|
|
68
|
+
rejectFn = reject;
|
|
68
69
|
verifyFn = verifyingCallback ?? null;
|
|
69
70
|
}),
|
|
70
71
|
};
|
|
@@ -106,17 +107,16 @@
|
|
|
106
107
|
}
|
|
107
108
|
|
|
108
109
|
async function sendCode(value: string) {
|
|
109
|
-
if (!resolveFn)
|
|
110
|
-
throw new Error('Modal is not initialized properly');
|
|
111
|
-
}
|
|
112
|
-
|
|
110
|
+
if (!resolveFn) throw new Error('Modal is not initialized properly');
|
|
113
111
|
if (verifyFn) {
|
|
114
112
|
try {
|
|
115
113
|
const ok = await verifyFn(value);
|
|
116
114
|
if (!ok) {
|
|
115
|
+
rejectFn?.(new Error('Invalid code'));
|
|
117
116
|
return;
|
|
118
117
|
}
|
|
119
|
-
} catch {
|
|
118
|
+
} catch (err) {
|
|
119
|
+
rejectFn?.(err);
|
|
120
120
|
return;
|
|
121
121
|
}
|
|
122
122
|
}
|
|
@@ -141,4 +141,10 @@
|
|
|
141
141
|
window.removeEventListener('paste', handlePaste as any);
|
|
142
142
|
});
|
|
143
143
|
</script>
|
|
144
|
-
|
|
144
|
+
|
|
145
|
+
<style scoped>
|
|
146
|
+
:deep(.otp-input-container) {
|
|
147
|
+
display: flex;
|
|
148
|
+
gap: 0.75rem;
|
|
149
|
+
}
|
|
150
|
+
</style>
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<v-otp-input
|
|
19
19
|
ref="code"
|
|
20
20
|
container-class="grid grid-cols-6 gap-3 w-full"
|
|
21
|
-
input-classes="bg-gray-50 text-center
|
|
21
|
+
input-classes="bg-gray-50 text-center justify-center otp-input border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-10 h-10 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
22
22
|
:num-inputs="6"
|
|
23
23
|
inputType="number"
|
|
24
24
|
inputmode="numeric"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<div class="mt-6 flex justify-center">
|
|
32
32
|
<LinkButton
|
|
33
33
|
to="/login"
|
|
34
|
-
class="w-
|
|
34
|
+
class="w-full"
|
|
35
35
|
>
|
|
36
36
|
{{$t('Back to login')}}
|
|
37
37
|
</LinkButton>
|
|
@@ -130,15 +130,16 @@
|
|
|
130
130
|
}
|
|
131
131
|
</script>
|
|
132
132
|
|
|
133
|
-
<style lang='scss'>
|
|
133
|
+
<style scoped lang='scss'>
|
|
134
134
|
.vue3-2fa-code-input {
|
|
135
135
|
display: flex;
|
|
136
136
|
justify-content: center;
|
|
137
137
|
gap: 1rem;
|
|
138
138
|
margin-bottom: 1rem;
|
|
139
139
|
}
|
|
140
|
-
.otp-input {
|
|
141
|
-
|
|
140
|
+
:deep(.otp-input-container) {
|
|
141
|
+
display: flex;
|
|
142
|
+
gap: 0.75rem;
|
|
142
143
|
}
|
|
143
144
|
.vue3-2fa-code-input-box {
|
|
144
145
|
&[type='text'] {
|
|
@@ -15,29 +15,27 @@
|
|
|
15
15
|
<div class="p-10 w-full max-w-md max-h-full custom-auth-wrapper" >
|
|
16
16
|
<div class="m-3" >{{$t('Scan this QR code with your authenticator app or open by')}} <a class="text-blue-600" :href="totpUri">{{$t('click')}}</a></div>
|
|
17
17
|
<div class="flex justify-center m-3" >
|
|
18
|
-
<img :src="totpQrCode" class="min-w-[200px]
|
|
18
|
+
<img :src="totpQrCode" class="min-w-[200px] min-h-[200px]" alt="QR code" />
|
|
19
19
|
</div>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
</div>
|
|
36
|
-
<div class="my-4 w-full flex justify-center p-2" ref="otpRoot">
|
|
20
|
+
<div class="m-1">{{$t('Or copy this code to app manually:')}}</div>
|
|
21
|
+
<div class="w-full">
|
|
22
|
+
<div class="relative">
|
|
23
|
+
<label for="npm-install-copy-text" class="sr-only">{{$t('Label')}}</label>
|
|
24
|
+
<input id="npm-install-copy-text" type="text" class="col-span-10 bg-gray-50 border border-gray-300 text-gray-500 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full px-2.5 py-4 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-gray-400 dark:focus:ring-blue-500 dark:focus:border-blue-500 pr-12" :value="totp.newSecret" readonly>
|
|
25
|
+
<button @click="onCopyClick" data-copy-to-clipboard-target="npm-install-copy-text" class="absolute end-2.5 top-1/2 -translate-y-1/2 text-gray-900 dark:text-gray-400 hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-600 dark:hover:bg-gray-700 rounded-lg py-2 px-2.5 inline-flex items-center justify-center bg-white border-gray-200 border">
|
|
26
|
+
<span id="default-message" class="inline-flex items-center">
|
|
27
|
+
<svg class="w-3 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 20">
|
|
28
|
+
<path d="M16 1h-3.278A1.992 1.992 0 0 0 11 0H7a1.993 1.993 0 0 0-1.722 1H2a2 2 0 0 0-2 2v15a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2Zm-3 14H5a1 1 0 0 1 0-2h8a1 1 0 0 1 0 2Zm0-4H5a1 1 0 0 1 0-2h8a1 1 0 1 1 0 2Zm0-5H5a1 1 0 0 1 0-2h2V2h4v2h2a1 1 0 1 1 0 2Z"/>
|
|
29
|
+
</svg>
|
|
30
|
+
</span>
|
|
31
|
+
</button>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="my-4 w-full flex justify-center" ref="otpRoot">
|
|
37
35
|
<v-otp-input
|
|
38
36
|
ref="code"
|
|
39
37
|
container-class="grid grid-cols-6 gap-3 w-full"
|
|
40
|
-
input-classes="otp-input bg-gray-50 text-center border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block h-[
|
|
38
|
+
input-classes="otp-input bg-gray-50 text-center border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block h-[46px] w-full dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
41
39
|
:num-inputs="6"
|
|
42
40
|
inputType="number"
|
|
43
41
|
inputmode="numeric"
|
|
@@ -48,7 +46,7 @@
|
|
|
48
46
|
/>
|
|
49
47
|
</div>
|
|
50
48
|
<!-- <Vue2FACodeInput v-model="code" autofocus /> -->
|
|
51
|
-
<div class="flex flex-row gap-2.5
|
|
49
|
+
<div class="flex flex-row gap-2.5 h-12">
|
|
52
50
|
<LinkButton to="/login" class="w-full">
|
|
53
51
|
{{$t('Back to login')}}
|
|
54
52
|
</LinkButton>
|
|
@@ -220,8 +218,9 @@ const handleSkip = async () => {
|
|
|
220
218
|
}
|
|
221
219
|
}
|
|
222
220
|
</script>
|
|
223
|
-
<style>
|
|
224
|
-
.otp-input {
|
|
225
|
-
|
|
226
|
-
|
|
221
|
+
<style scoped>
|
|
222
|
+
:deep(.otp-input-container) {
|
|
223
|
+
display: flex;
|
|
224
|
+
gap: 0.75rem;
|
|
225
|
+
}
|
|
227
226
|
</style>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="fixed inset-0 z-[9999] flex items-center justify-center bg-black/50 top-0 bottom-0 left-0 right-0"
|
|
3
3
|
v-if ="modelShow">
|
|
4
4
|
<div class="relative bg-white dark:bg-gray-700 rounded-lg shadow p-6 w-full max-w-md">
|
|
5
|
-
<div id="mfaCode-label" class="mb-4 text-gray-700 dark:text-gray-100">
|
|
5
|
+
<div id="mfaCode-label" class="mb-4 text-gray-700 dark:text-gray-100 text-center">
|
|
6
6
|
{{ $t('Please enter your authenticator code') }}
|
|
7
7
|
</div>
|
|
8
8
|
|
|
@@ -57,14 +57,15 @@
|
|
|
57
57
|
let resolveFn: ((code: string) => void) | null = null;
|
|
58
58
|
let verifyingCallback: ((code: string) => boolean) | null = null;
|
|
59
59
|
let verifyFn: null | ((code: string) => Promise<boolean> | boolean) = null;
|
|
60
|
+
let rejectFn: ((err?: any) => void) | null = null;
|
|
60
61
|
|
|
61
62
|
window.adminforthTwoFaModal = {
|
|
62
|
-
getCode: (verifyingCallback?: () => Promise<boolean>) =>
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
63
|
+
getCode: (verifyingCallback?: (code: string) => Promise<boolean>) =>
|
|
64
|
+
new Promise((resolve, reject) => {
|
|
65
|
+
if (modelShow.value) throw new Error('Modal is already open');
|
|
66
66
|
modelShow.value = true;
|
|
67
67
|
resolveFn = resolve;
|
|
68
|
+
rejectFn = reject;
|
|
68
69
|
verifyFn = verifyingCallback ?? null;
|
|
69
70
|
}),
|
|
70
71
|
};
|
|
@@ -106,17 +107,16 @@
|
|
|
106
107
|
}
|
|
107
108
|
|
|
108
109
|
async function sendCode(value: string) {
|
|
109
|
-
if (!resolveFn)
|
|
110
|
-
throw new Error('Modal is not initialized properly');
|
|
111
|
-
}
|
|
112
|
-
|
|
110
|
+
if (!resolveFn) throw new Error('Modal is not initialized properly');
|
|
113
111
|
if (verifyFn) {
|
|
114
112
|
try {
|
|
115
113
|
const ok = await verifyFn(value);
|
|
116
114
|
if (!ok) {
|
|
115
|
+
rejectFn?.(new Error('Invalid code'));
|
|
117
116
|
return;
|
|
118
117
|
}
|
|
119
|
-
} catch {
|
|
118
|
+
} catch (err) {
|
|
119
|
+
rejectFn?.(err);
|
|
120
120
|
return;
|
|
121
121
|
}
|
|
122
122
|
}
|
|
@@ -141,4 +141,10 @@
|
|
|
141
141
|
window.removeEventListener('paste', handlePaste as any);
|
|
142
142
|
});
|
|
143
143
|
</script>
|
|
144
|
-
|
|
144
|
+
|
|
145
|
+
<style scoped>
|
|
146
|
+
:deep(.otp-input-container) {
|
|
147
|
+
display: flex;
|
|
148
|
+
gap: 0.75rem;
|
|
149
|
+
}
|
|
150
|
+
</style>
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<v-otp-input
|
|
19
19
|
ref="code"
|
|
20
20
|
container-class="grid grid-cols-6 gap-3 w-full"
|
|
21
|
-
input-classes="bg-gray-50 text-center
|
|
21
|
+
input-classes="bg-gray-50 text-center justify-center otp-input border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-10 h-10 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
22
22
|
:num-inputs="6"
|
|
23
23
|
inputType="number"
|
|
24
24
|
inputmode="numeric"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<div class="mt-6 flex justify-center">
|
|
32
32
|
<LinkButton
|
|
33
33
|
to="/login"
|
|
34
|
-
class="w-
|
|
34
|
+
class="w-full"
|
|
35
35
|
>
|
|
36
36
|
{{$t('Back to login')}}
|
|
37
37
|
</LinkButton>
|
|
@@ -130,15 +130,16 @@
|
|
|
130
130
|
}
|
|
131
131
|
</script>
|
|
132
132
|
|
|
133
|
-
<style lang='scss'>
|
|
133
|
+
<style scoped lang='scss'>
|
|
134
134
|
.vue3-2fa-code-input {
|
|
135
135
|
display: flex;
|
|
136
136
|
justify-content: center;
|
|
137
137
|
gap: 1rem;
|
|
138
138
|
margin-bottom: 1rem;
|
|
139
139
|
}
|
|
140
|
-
.otp-input {
|
|
141
|
-
|
|
140
|
+
:deep(.otp-input-container) {
|
|
141
|
+
display: flex;
|
|
142
|
+
gap: 0.75rem;
|
|
142
143
|
}
|
|
143
144
|
.vue3-2fa-code-input-box {
|
|
144
145
|
&[type='text'] {
|
|
@@ -15,29 +15,27 @@
|
|
|
15
15
|
<div class="p-10 w-full max-w-md max-h-full custom-auth-wrapper" >
|
|
16
16
|
<div class="m-3" >{{$t('Scan this QR code with your authenticator app or open by')}} <a class="text-blue-600" :href="totpUri">{{$t('click')}}</a></div>
|
|
17
17
|
<div class="flex justify-center m-3" >
|
|
18
|
-
<img :src="totpQrCode" class="min-w-[200px]
|
|
18
|
+
<img :src="totpQrCode" class="min-w-[200px] min-h-[200px]" alt="QR code" />
|
|
19
19
|
</div>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
</div>
|
|
36
|
-
<div class="my-4 w-full flex justify-center p-2" ref="otpRoot">
|
|
20
|
+
<div class="m-1">{{$t('Or copy this code to app manually:')}}</div>
|
|
21
|
+
<div class="w-full">
|
|
22
|
+
<div class="relative">
|
|
23
|
+
<label for="npm-install-copy-text" class="sr-only">{{$t('Label')}}</label>
|
|
24
|
+
<input id="npm-install-copy-text" type="text" class="col-span-10 bg-gray-50 border border-gray-300 text-gray-500 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full px-2.5 py-4 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-gray-400 dark:focus:ring-blue-500 dark:focus:border-blue-500 pr-12" :value="totp.newSecret" readonly>
|
|
25
|
+
<button @click="onCopyClick" data-copy-to-clipboard-target="npm-install-copy-text" class="absolute end-2.5 top-1/2 -translate-y-1/2 text-gray-900 dark:text-gray-400 hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-600 dark:hover:bg-gray-700 rounded-lg py-2 px-2.5 inline-flex items-center justify-center bg-white border-gray-200 border">
|
|
26
|
+
<span id="default-message" class="inline-flex items-center">
|
|
27
|
+
<svg class="w-3 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 20">
|
|
28
|
+
<path d="M16 1h-3.278A1.992 1.992 0 0 0 11 0H7a1.993 1.993 0 0 0-1.722 1H2a2 2 0 0 0-2 2v15a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2Zm-3 14H5a1 1 0 0 1 0-2h8a1 1 0 0 1 0 2Zm0-4H5a1 1 0 0 1 0-2h8a1 1 0 1 1 0 2Zm0-5H5a1 1 0 0 1 0-2h2V2h4v2h2a1 1 0 1 1 0 2Z"/>
|
|
29
|
+
</svg>
|
|
30
|
+
</span>
|
|
31
|
+
</button>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="my-4 w-full flex justify-center" ref="otpRoot">
|
|
37
35
|
<v-otp-input
|
|
38
36
|
ref="code"
|
|
39
37
|
container-class="grid grid-cols-6 gap-3 w-full"
|
|
40
|
-
input-classes="otp-input bg-gray-50 text-center border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block h-[
|
|
38
|
+
input-classes="otp-input bg-gray-50 text-center border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block h-[46px] w-full dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
41
39
|
:num-inputs="6"
|
|
42
40
|
inputType="number"
|
|
43
41
|
inputmode="numeric"
|
|
@@ -48,7 +46,7 @@
|
|
|
48
46
|
/>
|
|
49
47
|
</div>
|
|
50
48
|
<!-- <Vue2FACodeInput v-model="code" autofocus /> -->
|
|
51
|
-
<div class="flex flex-row gap-2.5
|
|
49
|
+
<div class="flex flex-row gap-2.5 h-12">
|
|
52
50
|
<LinkButton to="/login" class="w-full">
|
|
53
51
|
{{$t('Back to login')}}
|
|
54
52
|
</LinkButton>
|
|
@@ -220,8 +218,9 @@ const handleSkip = async () => {
|
|
|
220
218
|
}
|
|
221
219
|
}
|
|
222
220
|
</script>
|
|
223
|
-
<style>
|
|
224
|
-
.otp-input {
|
|
225
|
-
|
|
226
|
-
|
|
221
|
+
<style scoped>
|
|
222
|
+
:deep(.otp-input-container) {
|
|
223
|
+
display: flex;
|
|
224
|
+
gap: 0.75rem;
|
|
225
|
+
}
|
|
227
226
|
</style>
|
package/dist/index.js
CHANGED
|
@@ -17,6 +17,32 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
|
|
|
17
17
|
instanceUniqueRepresentation(pluginOptions) {
|
|
18
18
|
return `single`;
|
|
19
19
|
}
|
|
20
|
+
verify(code, opts) {
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
var _a, _b, _c, _d;
|
|
23
|
+
if (!code)
|
|
24
|
+
return { error: "Code is required" };
|
|
25
|
+
const authRes = this.adminforth.config.resources
|
|
26
|
+
.find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
|
|
27
|
+
if (!authRes)
|
|
28
|
+
return { error: "Auth resource not found" };
|
|
29
|
+
const connector = this.adminforth.connectors[authRes.dataSource];
|
|
30
|
+
const pkName = (_a = authRes.columns.find(c => c.primaryKey)) === null || _a === void 0 ? void 0 : _a.name;
|
|
31
|
+
if (!pkName)
|
|
32
|
+
return { error: "Primary key not found on auth resource" };
|
|
33
|
+
const pk = (_b = opts === null || opts === void 0 ? void 0 : opts.userPk) !== null && _b !== void 0 ? _b : (_d = (_c = opts === null || opts === void 0 ? void 0 : opts.adminUser) === null || _c === void 0 ? void 0 : _c.dbUser) === null || _d === void 0 ? void 0 : _d[pkName];
|
|
34
|
+
if (!pk)
|
|
35
|
+
return { error: "User PK is required" };
|
|
36
|
+
const user = yield connector.getRecordByPrimaryKey(authRes, pk);
|
|
37
|
+
if (!user)
|
|
38
|
+
return { error: "User not found" };
|
|
39
|
+
const secret = user[this.options.twoFaSecretFieldName];
|
|
40
|
+
if (!secret)
|
|
41
|
+
return { error: "2FA is not set up for this user" };
|
|
42
|
+
const verified = twofactor.verifyToken(secret, code, this.options.timeStepWindow);
|
|
43
|
+
return verified ? { ok: true } : { error: "Wrong or expired OTP code" };
|
|
44
|
+
});
|
|
45
|
+
}
|
|
20
46
|
modifyResourceConfig(adminforth, resourceConfig) {
|
|
21
47
|
super.modifyResourceConfig(adminforth, resourceConfig);
|
|
22
48
|
this.adminforth = adminforth;
|
package/index.ts
CHANGED
|
@@ -19,6 +19,34 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
|
|
|
19
19
|
return `single`;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
+
public async verify(
|
|
23
|
+
code: string,
|
|
24
|
+
opts?: { adminUser?: AdminUser; userPk?: string }
|
|
25
|
+
): Promise<{ ok: true } | { error: string }> {
|
|
26
|
+
if (!code) return { error: "Code is required" };
|
|
27
|
+
|
|
28
|
+
const authRes = this.adminforth.config.resources
|
|
29
|
+
.find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
|
|
30
|
+
|
|
31
|
+
if (!authRes) return { error: "Auth resource not found" };
|
|
32
|
+
|
|
33
|
+
const connector = this.adminforth.connectors[authRes.dataSource];
|
|
34
|
+
const pkName = authRes.columns.find(c => c.primaryKey)?.name;
|
|
35
|
+
if (!pkName) return { error: "Primary key not found on auth resource" };
|
|
36
|
+
|
|
37
|
+
const pk = opts?.userPk ?? opts?.adminUser?.dbUser?.[pkName];
|
|
38
|
+
if (!pk) return { error: "User PK is required" };
|
|
39
|
+
|
|
40
|
+
const user = await connector.getRecordByPrimaryKey(authRes, pk);
|
|
41
|
+
if (!user) return { error: "User not found" };
|
|
42
|
+
|
|
43
|
+
const secret = user[this.options.twoFaSecretFieldName];
|
|
44
|
+
if (!secret) return { error: "2FA is not set up for this user" };
|
|
45
|
+
|
|
46
|
+
const verified = twofactor.verifyToken(secret, code, this.options.timeStepWindow);
|
|
47
|
+
return verified ? { ok: true } : { error: "Wrong or expired OTP code" };
|
|
48
|
+
}
|
|
49
|
+
|
|
22
50
|
modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
|
|
23
51
|
super.modifyResourceConfig(adminforth, resourceConfig);
|
|
24
52
|
this.adminforth = adminforth;
|