diff --git a/.gitignore b/.gitignore index 458f4960..6dd5e8bb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ app/.status_hash casdoor.pub .idea/deployment.xml .idea/webServers.xml -casdoor.pem diff --git a/app/auto-imports.d.ts b/app/auto-imports.d.ts index b5b4f1d7..736276d8 100644 --- a/app/auto-imports.d.ts +++ b/app/auto-imports.d.ts @@ -90,6 +90,7 @@ declare global { export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' import('vue') } + // for vue template auto import import { UnwrapRef } from 'vue' declare module 'vue' { @@ -173,4 +174,4 @@ declare module 'vue' { readonly watchPostEffect: UnwrapRef readonly watchSyncEffect: UnwrapRef } -} +} \ No newline at end of file diff --git a/app/package.json b/app/package.json index 182d8ef8..145f6e30 100644 --- a/app/package.json +++ b/app/package.json @@ -16,7 +16,7 @@ "@0xjacky/vue-github-button": "^3.1.1", "@ant-design/icons-vue": "^7.0.1", "@formkit/auto-animate": "^0.8.2", - "@simplewebauthn/browser": "^12.0.0", + "@simplewebauthn/browser": "^13.0.0", "@vue/reactivity": "^3.5.13", "@vue/shared": "^3.5.13", "@vueuse/components": "^12.0.0", @@ -59,7 +59,6 @@ "@iconify/types": "^2.0.0", "@iconify/utils": "^2.1.33", "@iconify/vue": "^4.1.2", - "@simplewebauthn/types": "^12.0.0", "@types/lodash": "^4.17.13", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 26da37d2..91b18d11 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^0.8.2 version: 0.8.2 '@simplewebauthn/browser': - specifier: ^12.0.0 - version: 12.0.0 + specifier: ^13.0.0 + version: 13.0.0 '@vue/reactivity': specifier: ^3.5.13 version: 3.5.13 @@ -141,9 +141,6 @@ importers: '@iconify/vue': specifier: ^4.1.2 version: 4.1.2(vue@3.5.13(typescript@5.6.3)) - '@simplewebauthn/types': - specifier: ^12.0.0 - version: 12.0.0 '@types/lodash': specifier: ^4.17.13 version: 4.17.13 @@ -1515,14 +1512,8 @@ packages: '@simonwep/pickr@1.8.2': resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==} - '@simplewebauthn/browser@12.0.0': - resolution: {integrity: sha512-0w6W8qkACycyaRMb2XnHfpA9kkgs5e2Aw2Ul9ObBYmvFBbtzipyWu9u2+WP1wy98chM+GIlQFnPheUbiMBQr8w==} - - '@simplewebauthn/types@11.0.0': - resolution: {integrity: sha512-b2o0wC5u2rWts31dTgBkAtSNKGX0cvL6h8QedNsKmj8O4QoLFQFR3DBVBUlpyVEhYKA+mXGUaXbcOc4JdQ3HzA==} - - '@simplewebauthn/types@12.0.0': - resolution: {integrity: sha512-q6y8MkoV8V8jB4zzp18Uyj2I7oFp2/ONL8c3j8uT06AOWu3cIChc1au71QYHrP2b+xDapkGTiv+9lX7xkTlAsA==} + '@simplewebauthn/browser@13.0.0': + resolution: {integrity: sha512-7d/+gxoFoDQxq2EkLl/PuTIQ/rnSrA3bmr8L2Ij7bRyicJoCJX/NDGUNExyctB9nSDrEkkcrJMDkwpCYOGU3Lg==} '@sindresorhus/merge-streams@2.3.0': resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} @@ -6333,13 +6324,7 @@ snapshots: core-js: 3.39.0 nanopop: 2.4.2 - '@simplewebauthn/browser@12.0.0': - dependencies: - '@simplewebauthn/types': 12.0.0 - - '@simplewebauthn/types@11.0.0': {} - - '@simplewebauthn/types@12.0.0': {} + '@simplewebauthn/browser@13.0.0': {} '@sindresorhus/merge-streams@2.3.0': {} diff --git a/app/src/api/2fa.ts b/app/src/api/2fa.ts index ec7ee850..6f13de5d 100644 --- a/app/src/api/2fa.ts +++ b/app/src/api/2fa.ts @@ -1,4 +1,4 @@ -import type { AuthenticationResponseJSON } from '@simplewebauthn/types' +import type { AuthenticationResponseJSON } from '@simplewebauthn/browser' import http from '@/lib/http' export interface TwoFAStatusResponse { diff --git a/app/src/api/auth.ts b/app/src/api/auth.ts index 6dd1f878..3605f0c1 100644 --- a/app/src/api/auth.ts +++ b/app/src/api/auth.ts @@ -1,4 +1,4 @@ -import type { AuthenticationResponseJSON } from '@simplewebauthn/types' +import type { AuthenticationResponseJSON } from '@simplewebauthn/browser' import http from '@/lib/http' import { useUserStore } from '@/pinia' diff --git a/app/src/api/passkey.ts b/app/src/api/passkey.ts index d33baa72..7969ad11 100644 --- a/app/src/api/passkey.ts +++ b/app/src/api/passkey.ts @@ -1,5 +1,5 @@ import type { ModelBase } from '@/api/curd' -import type { RegistrationResponseJSON } from '@simplewebauthn/types' +import type { RegistrationResponseJSON } from '@simplewebauthn/browser' import http from '@/lib/http' export interface Passkey extends ModelBase {