Skip to content

Commit fdb2bff

Browse files
committed
fix(OTP Generator): add query and storage for secret (so can be remembered)
Fix CorentinTh#1208
1 parent b430bae commit fdb2bff

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

src/composable/queryParams.ts

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { useRouteQuery } from '@vueuse/router';
22
import { computed } from 'vue';
3+
import { useStorage } from '@vueuse/core';
34

4-
export { useQueryParam };
5+
export { useQueryParam, useQueryParamOrStorage };
56

67
const transformers = {
78
number: {
@@ -16,6 +17,12 @@ const transformers = {
1617
fromQuery: (value: string) => value.toLowerCase() === 'true',
1718
toQuery: (value: boolean) => (value ? 'true' : 'false'),
1819
},
20+
object: {
21+
fromQuery: (value: string) => {
22+
return JSON.parse(value);
23+
},
24+
toQuery: (value: object) => JSON.stringify(value),
25+
},
1926
};
2027

2128
function useQueryParam<T>({ name, defaultValue }: { name: string; defaultValue: T }) {
@@ -33,3 +40,27 @@ function useQueryParam<T>({ name, defaultValue }: { name: string; defaultValue:
3340
},
3441
});
3542
}
43+
44+
function useQueryParamOrStorage<T>({ name, storageName, defaultValue }: { name: string; storageName: string; defaultValue: T }) {
45+
const type = typeof defaultValue;
46+
const transformer = transformers[type as keyof typeof transformers] ?? transformers.string;
47+
48+
const storageRef = useStorage(storageName, defaultValue);
49+
const proxyDefaultValue = transformer.toQuery(defaultValue as never);
50+
const proxy = useRouteQuery(name, proxyDefaultValue);
51+
52+
const r = ref(defaultValue);
53+
54+
watch(r,
55+
(value) => {
56+
proxy.value = transformer.toQuery(value as never);
57+
storageRef.value = value as never;
58+
},
59+
{ deep: true });
60+
61+
r.value = (proxy.value && proxy.value !== proxyDefaultValue
62+
? transformer.fromQuery(proxy.value) as unknown as T
63+
: storageRef.value as T) as never;
64+
65+
return r;
66+
}

src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,18 @@ import TokenDisplay from './token-display.vue';
77
import { useStyleStore } from '@/stores/style.store';
88
import InputCopyable from '@/components/InputCopyable.vue';
99
import { computedRefreshable } from '@/composable/computedRefreshable';
10+
import { useQueryParamOrStorage } from '@/composable/queryParams';
1011
1112
const now = useTimestamp();
1213
const interval = computed(() => (now.value / 1000) % 30);
1314
const theme = useThemeVars();
1415
const styleStore = useStyleStore();
1516
16-
const secret = ref(generateSecret());
17+
const secret = useQueryParamOrStorage({
18+
name: 'secret',
19+
storageName: 'otp-gen:secret',
20+
defaultValue: generateSecret(),
21+
});
1722
1823
function refreshSecret() {
1924
secret.value = generateSecret();

0 commit comments

Comments
 (0)