aboutsummaryrefslogtreecommitdiff
path: root/front-end/src
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2023-08-09 11:59:15 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2023-08-09 11:59:15 -0400
commit5dd4b69ebf4f407a2ba7ccc53fe43b445ab0684e (patch)
treec0e5613aa4e33c7f436f9c67d0a4d75c1b9bfb77 /front-end/src
parentc3c0ece6fb3a66c2de545858731a066d5542ff1e (diff)
Package updates, lodash-es, release state fixes
Diffstat (limited to 'front-end/src')
-rw-r--r--front-end/src/App.vue1
-rw-r--r--front-end/src/bootstrap/Environment.vue2
-rw-r--r--front-end/src/bootstrap/components/ConfirmPrompt.vue2
-rw-r--r--front-end/src/bootstrap/components/Footer.vue2
-rw-r--r--front-end/src/bootstrap/components/Header.vue2
-rw-r--r--front-end/src/components/DynamicForm.vue2
-rw-r--r--front-end/src/views/Account/components/oauth/CreateApp.vue2
-rw-r--r--front-end/src/views/Account/components/oauth/SingleApplication.vue2
-rw-r--r--front-end/src/views/Account/components/oauth/o2Api.ts2
-rw-r--r--front-end/src/views/Account/components/profile/Profile.vue2
-rw-r--r--front-end/src/views/Account/components/settings/PasswordReset.vue2
-rw-r--r--front-end/src/views/Account/components/settings/Pki.vue2
-rw-r--r--front-end/src/views/Account/components/settings/Security.vue2
-rw-r--r--front-end/src/views/Account/components/settings/TotpSettings.vue2
-rw-r--r--front-end/src/views/Blog/ckeditor/Editor.vue2
-rw-r--r--front-end/src/views/Blog/components/Channels.vue2
-rw-r--r--front-end/src/views/Blog/components/Channels/ChannelEdit.vue4
-rw-r--r--front-end/src/views/Blog/components/Content.vue2
-rw-r--r--front-end/src/views/Blog/components/Content/ContentEditor.vue2
-rw-r--r--front-end/src/views/Blog/components/Content/ContentTable.vue2
-rw-r--r--front-end/src/views/Blog/components/ContentSearch.vue2
-rw-r--r--front-end/src/views/Blog/components/Posts.vue2
-rw-r--r--front-end/src/views/Blog/components/Posts/PostEdit.vue2
-rw-r--r--front-end/src/views/Blog/components/Posts/PostTable.vue2
-rw-r--r--front-end/src/views/Blog/components/podcast-helpers/EpisodeAdder.vue1
-rw-r--r--front-end/src/views/Blog/index.vue8
-rw-r--r--front-end/src/views/Login/components/Totp.vue2
-rw-r--r--front-end/src/views/Login/index.vue6
-rw-r--r--front-end/src/views/Login/pki/index.vue2
-rw-r--r--front-end/src/views/Login/social/[type].vue25
30 files changed, 49 insertions, 44 deletions
diff --git a/front-end/src/App.vue b/front-end/src/App.vue
index 92b8d5c..da1b914 100644
--- a/front-end/src/App.vue
+++ b/front-end/src/App.vue
@@ -5,7 +5,6 @@
<router-view />
</template>
</Environment>
-
</template>
<script setup lang="ts">
diff --git a/front-end/src/bootstrap/Environment.vue b/front-end/src/bootstrap/Environment.vue
index c077869..f575529 100644
--- a/front-end/src/bootstrap/Environment.vue
+++ b/front-end/src/bootstrap/Environment.vue
@@ -52,7 +52,7 @@
import { computed } from 'vue'
import { RouteLocation, useRouter } from 'vue-router'
-import { filter, map, without, find, includes } from 'lodash'
+import { filter, map, without, find, includes } from 'lodash-es'
import { useEnvSize, useScrollOnRouteChange, useSession, useTitle } from '@vnuge/vnlib.browser'
import CookieWarning from './components/CookieWarning.vue'
import PasswordPrompt from './components/PasswordPrompt.vue'
diff --git a/front-end/src/bootstrap/components/ConfirmPrompt.vue b/front-end/src/bootstrap/components/ConfirmPrompt.vue
index 8114387..78317e0 100644
--- a/front-end/src/bootstrap/components/ConfirmPrompt.vue
+++ b/front-end/src/bootstrap/components/ConfirmPrompt.vue
@@ -31,7 +31,7 @@
</template>
<script setup lang="ts">
-import { defaultTo } from 'lodash'
+import { defaultTo } from 'lodash-es'
import { computed, ref } from 'vue'
import {
diff --git a/front-end/src/bootstrap/components/Footer.vue b/front-end/src/bootstrap/components/Footer.vue
index e0551f9..6af6936 100644
--- a/front-end/src/bootstrap/components/Footer.vue
+++ b/front-end/src/bootstrap/components/Footer.vue
@@ -59,7 +59,7 @@
<script setup lang="ts">
import { useDark } from '@vueuse/core'
-import { debounce } from 'lodash'
+import { debounce } from 'lodash-es'
const isDark = useDark()
diff --git a/front-end/src/bootstrap/components/Header.vue b/front-end/src/bootstrap/components/Header.vue
index dfdd667..8ea2240 100644
--- a/front-end/src/bootstrap/components/Header.vue
+++ b/front-end/src/bootstrap/components/Header.vue
@@ -75,7 +75,7 @@
<script setup lang="ts">
-import { debounce, find } from 'lodash'
+import { debounce, find } from 'lodash-es'
import { useElementSize, onClickOutside, useElementHover } from '@vueuse/core'
import { computed, ref, toRefs } from 'vue'
import { useSession, useUser, useEnvSize, apiCall } from '@vnuge/vnlib.browser'
diff --git a/front-end/src/components/DynamicForm.vue b/front-end/src/components/DynamicForm.vue
index 06fed3d..2138174 100644
--- a/front-end/src/components/DynamicForm.vue
+++ b/front-end/src/components/DynamicForm.vue
@@ -59,7 +59,7 @@
</template>
<script setup lang="ts">
-import { defaultTo, cloneDeep, forEach } from 'lodash'
+import { defaultTo, cloneDeep, forEach } from 'lodash-es'
import { toRefs, computed } from 'vue'
const props = defineProps<{
diff --git a/front-end/src/views/Account/components/oauth/CreateApp.vue b/front-end/src/views/Account/components/oauth/CreateApp.vue
index 2321743..b10dd2c 100644
--- a/front-end/src/views/Account/components/oauth/CreateApp.vue
+++ b/front-end/src/views/Account/components/oauth/CreateApp.vue
@@ -97,7 +97,7 @@
</template>
<script setup lang="ts">
-import { indexOf, pull } from 'lodash'
+import { indexOf, pull } from 'lodash-es'
import { ref, toRefs } from 'vue';
import { Dialog, DialogPanel, DialogTitle } from '@headlessui/vue'
import { apiCall } from '@vnuge/vnlib.browser'
diff --git a/front-end/src/views/Account/components/oauth/SingleApplication.vue b/front-end/src/views/Account/components/oauth/SingleApplication.vue
index 9fcc5e3..247f2f3 100644
--- a/front-end/src/views/Account/components/oauth/SingleApplication.vue
+++ b/front-end/src/views/Account/components/oauth/SingleApplication.vue
@@ -89,7 +89,7 @@
</template>
<script setup lang="ts">
-import { toUpper } from 'lodash'
+import { toUpper } from 'lodash-es'
import { apiCall, useWait, useConfirm, usePassConfirm } from '@vnuge/vnlib.browser'
import { ref, computed, toRefs } from 'vue'
import { useClipboard, useTimeAgo } from '@vueuse/core'
diff --git a/front-end/src/views/Account/components/oauth/o2Api.ts b/front-end/src/views/Account/components/oauth/o2Api.ts
index c21e4ed..40db64e 100644
--- a/front-end/src/views/Account/components/oauth/o2Api.ts
+++ b/front-end/src/views/Account/components/oauth/o2Api.ts
@@ -1,4 +1,4 @@
-import { forEach } from 'lodash'
+import { forEach } from 'lodash-es'
import { Ref } from 'vue'
import useVuelidate from '@vuelidate/core'
import { maxLength, helpers, required } from '@vuelidate/validators'
diff --git a/front-end/src/views/Account/components/profile/Profile.vue b/front-end/src/views/Account/components/profile/Profile.vue
index e01707c..d742c86 100644
--- a/front-end/src/views/Account/components/profile/Profile.vue
+++ b/front-end/src/views/Account/components/profile/Profile.vue
@@ -58,7 +58,7 @@
</template>
<script setup lang="ts">
-import { defaultTo } from 'lodash'
+import { defaultTo } from 'lodash-es'
import useVuelidate from '@vuelidate/core'
import { ref, computed, watch } from 'vue'
import { Rules, FormSchema } from './profile-schema.ts'
diff --git a/front-end/src/views/Account/components/settings/PasswordReset.vue b/front-end/src/views/Account/components/settings/PasswordReset.vue
index ff04193..b3312db 100644
--- a/front-end/src/views/Account/components/settings/PasswordReset.vue
+++ b/front-end/src/views/Account/components/settings/PasswordReset.vue
@@ -60,7 +60,7 @@
</template>
<script setup lang="ts">
-import { toSafeInteger } from 'lodash';
+import { toSafeInteger } from 'lodash-es';
import useVuelidate from '@vuelidate/core'
import { required, maxLength, minLength, helpers } from '@vuelidate/validators'
import { useUser, apiCall, useMessage, useWait, useConfirm, useVuelidateWrapper } from '@vnuge/vnlib.browser'
diff --git a/front-end/src/views/Account/components/settings/Pki.vue b/front-end/src/views/Account/components/settings/Pki.vue
index a621bf2..9700e28 100644
--- a/front-end/src/views/Account/components/settings/Pki.vue
+++ b/front-end/src/views/Account/components/settings/Pki.vue
@@ -54,7 +54,7 @@
</template>
<script setup lang="ts">
-import { isEmpty, isNil } from 'lodash'
+import { isEmpty, isNil } from 'lodash-es'
import { apiCall, useConfirm, useSession, debugLog, useFormToaster } from '@vnuge/vnlib.browser'
import { computed, ref, watch } from 'vue'
import { Dialog, DialogPanel } from '@headlessui/vue'
diff --git a/front-end/src/views/Account/components/settings/Security.vue b/front-end/src/views/Account/components/settings/Security.vue
index 9ba83f7..3f8d8d6 100644
--- a/front-end/src/views/Account/components/settings/Security.vue
+++ b/front-end/src/views/Account/components/settings/Security.vue
@@ -56,7 +56,7 @@ import { useAutoHeartbeat } from '@vnuge/vnlib.browser'
import { useMfaConfig, MfaMethod, usePkiConfig } from '@vnuge/vnlib.browser/dist/mfa'
import { computed } from 'vue'
import { Switch } from '@headlessui/vue'
-import { includes } from 'lodash'
+import { includes } from 'lodash-es'
import Fido from './Fido.vue'
import Pki from './Pki.vue'
import TotpSettings from './TotpSettings.vue'
diff --git a/front-end/src/views/Account/components/settings/TotpSettings.vue b/front-end/src/views/Account/components/settings/TotpSettings.vue
index 20ee0d0..755ae61 100644
--- a/front-end/src/views/Account/components/settings/TotpSettings.vue
+++ b/front-end/src/views/Account/components/settings/TotpSettings.vue
@@ -89,7 +89,7 @@
</template>
<script setup lang="ts">
-import { isNil, chunk, defaultTo, includes, map, join } from 'lodash'
+import { isNil, chunk, defaultTo, includes, map, join } from 'lodash-es'
import { TOTP } from 'otpauth'
import base32Encode from 'base32-encode'
import VueQrcode from '@chenfengyuan/vue-qrcode'
diff --git a/front-end/src/views/Blog/ckeditor/Editor.vue b/front-end/src/views/Blog/ckeditor/Editor.vue
index 41e0ec0..ee16742 100644
--- a/front-end/src/views/Blog/ckeditor/Editor.vue
+++ b/front-end/src/views/Blog/ckeditor/Editor.vue
@@ -55,7 +55,7 @@
</template>
<script setup lang="ts">
-import { debounce, defer } from 'lodash';
+import { debounce, defer } from 'lodash-es';
import { ref } from 'vue';
import { useSessionStorage } from '@vueuse/core';
import { tryOnMounted } from '@vueuse/shared';
diff --git a/front-end/src/views/Blog/components/Channels.vue b/front-end/src/views/Blog/components/Channels.vue
index ad88e50..417d3f9 100644
--- a/front-end/src/views/Blog/components/Channels.vue
+++ b/front-end/src/views/Blog/components/Channels.vue
@@ -22,7 +22,7 @@
<script setup lang="ts">
import { computed } from 'vue';
import { BlogState } from '../blog-api';
-import { isEmpty, filter as _filter } from 'lodash';
+import { isEmpty, filter as _filter } from 'lodash-es';
import { apiCall } from '@vnuge/vnlib.browser';
import { BlogChannel, ChannelFeed, useFilteredPages } from '@vnuge/cmnext-admin';
import ChannelEdit from './Channels/ChannelEdit.vue';
diff --git a/front-end/src/views/Blog/components/Channels/ChannelEdit.vue b/front-end/src/views/Blog/components/Channels/ChannelEdit.vue
index 56376fe..b84adf0 100644
--- a/front-end/src/views/Blog/components/Channels/ChannelEdit.vue
+++ b/front-end/src/views/Blog/components/Channels/ChannelEdit.vue
@@ -16,6 +16,7 @@
<dynamic-form
id="channel-edit-form"
class="mx-auto"
+ :disabled="false"
:form="channelSchema"
:validator="channelVal.v$"
@submit="onSubmit"
@@ -42,6 +43,7 @@
class="mx-auto mt-4"
:form="feedSchema"
:validator="feedVal.v$"
+ :disabled="false"
@submit="onSubmit"
/>
@@ -61,7 +63,7 @@
<script setup lang="ts">
import { computed } from 'vue';
import { BlogState } from '../../blog-api';
-import { forEach, isEmpty, cloneDeep, isNil } from 'lodash';
+import { forEach, isEmpty, cloneDeep, isNil } from 'lodash-es';
import { reactiveComputed } from '@vueuse/core';
import { useConfirm } from '@vnuge/vnlib.browser';
import FeedFields from '../FeedFields.vue';
diff --git a/front-end/src/views/Blog/components/Content.vue b/front-end/src/views/Blog/components/Content.vue
index 00f8602..ae0f6cf 100644
--- a/front-end/src/views/Blog/components/Content.vue
+++ b/front-end/src/views/Blog/components/Content.vue
@@ -23,7 +23,7 @@
<script setup lang="ts">
import { computed } from 'vue';
import { BlogState } from '../blog-api';
-import { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash-es';
import { apiCall } from '@vnuge/vnlib.browser';
import EditorTable from './EditorTable.vue';
import ContentEditor from './Content/ContentEditor.vue';
diff --git a/front-end/src/views/Blog/components/Content/ContentEditor.vue b/front-end/src/views/Blog/components/Content/ContentEditor.vue
index 4de7f8a..d3f8438 100644
--- a/front-end/src/views/Blog/components/Content/ContentEditor.vue
+++ b/front-end/src/views/Blog/components/Content/ContentEditor.vue
@@ -100,7 +100,7 @@ import { computed, ref } from 'vue';
import { reactiveComputed, useFileDialog } from '@vueuse/core';
import { ContentMeta } from '@vnuge/cmnext-admin';
import { useConfirm, useVuelidateWrapper, useFormToaster, useWait } from '@vnuge/vnlib.browser';
-import { defaultTo, first, isEmpty, round, truncate } from 'lodash';
+import { defaultTo, first, isEmpty, round, truncate } from 'lodash-es';
import { required, helpers, maxLength } from '@vuelidate/validators'
import useVuelidate from '@vuelidate/core';
import { BlogState } from '../../blog-api';
diff --git a/front-end/src/views/Blog/components/Content/ContentTable.vue b/front-end/src/views/Blog/components/Content/ContentTable.vue
index c47a063..e5cbe58 100644
--- a/front-end/src/views/Blog/components/Content/ContentTable.vue
+++ b/front-end/src/views/Blog/components/Content/ContentTable.vue
@@ -45,7 +45,7 @@
<script setup lang="ts">
import { toRefs } from 'vue';
-import { filter as _filter, truncate } from 'lodash';
+import { filter as _filter, truncate } from 'lodash-es';
import { useClipboard } from '@vueuse/core';
import { useWait } from '@vnuge/vnlib.browser';
import { ContentMeta } from '@vnuge/cmnext-admin';
diff --git a/front-end/src/views/Blog/components/ContentSearch.vue b/front-end/src/views/Blog/components/ContentSearch.vue
index 37fd438..03cb432 100644
--- a/front-end/src/views/Blog/components/ContentSearch.vue
+++ b/front-end/src/views/Blog/components/ContentSearch.vue
@@ -38,7 +38,7 @@
import { useClipboard } from '@vueuse/core';
import { apiCall, useWait } from '@vnuge/vnlib.browser';
import { computed, Ref, ref } from 'vue';
-import { map, slice, truncate } from 'lodash';
+import { map, slice, truncate } from 'lodash-es';
import { ContentMeta } from '@vnuge/cmnext-admin';
import { BlogState } from '../blog-api';
diff --git a/front-end/src/views/Blog/components/Posts.vue b/front-end/src/views/Blog/components/Posts.vue
index 5ebeeac..0407a26 100644
--- a/front-end/src/views/Blog/components/Posts.vue
+++ b/front-end/src/views/Blog/components/Posts.vue
@@ -21,7 +21,7 @@
<script setup lang="ts">
import { computed } from 'vue';
-import { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash-es';
import { PostMeta, useFilteredPages } from '@vnuge/cmnext-admin';
import { apiCall, debugLog } from '@vnuge/vnlib.browser';
import EditorTable from './EditorTable.vue';
diff --git a/front-end/src/views/Blog/components/Posts/PostEdit.vue b/front-end/src/views/Blog/components/Posts/PostEdit.vue
index 4f7b52b..724a8d7 100644
--- a/front-end/src/views/Blog/components/Posts/PostEdit.vue
+++ b/front-end/src/views/Blog/components/Posts/PostEdit.vue
@@ -47,7 +47,7 @@
import { computed } from 'vue';
import { BlogState } from '../../blog-api';
import { reactiveComputed } from '@vueuse/core';
-import { isNil, isString, split } from 'lodash';
+import { isNil, isString, split } from 'lodash-es';
import { PostMeta, useXmlProperties } from '@vnuge/cmnext-admin';
import { apiCall, useConfirm, useUser } from '@vnuge/vnlib.browser';
import { getPostForm } from '../../form-helpers';
diff --git a/front-end/src/views/Blog/components/Posts/PostTable.vue b/front-end/src/views/Blog/components/Posts/PostTable.vue
index e5e45f2..734d340 100644
--- a/front-end/src/views/Blog/components/Posts/PostTable.vue
+++ b/front-end/src/views/Blog/components/Posts/PostTable.vue
@@ -40,7 +40,7 @@
<script setup lang="ts">
import { toRefs } from 'vue';
-import { filter as _filter, truncate } from 'lodash';
+import { filter as _filter, truncate } from 'lodash-es';
import { useClipboard } from '@vueuse/core';
import { PostMeta } from '@vnuge/cmnext-admin';
diff --git a/front-end/src/views/Blog/components/podcast-helpers/EpisodeAdder.vue b/front-end/src/views/Blog/components/podcast-helpers/EpisodeAdder.vue
index 79b21cf..d4adb6f 100644
--- a/front-end/src/views/Blog/components/podcast-helpers/EpisodeAdder.vue
+++ b/front-end/src/views/Blog/components/podcast-helpers/EpisodeAdder.vue
@@ -39,6 +39,7 @@
id="enclosure-form"
:form="schema"
:validator="v$"
+ :disabled="false"
@submit="onFormSubmit"
@cancel="onCancel"
/>
diff --git a/front-end/src/views/Blog/index.vue b/front-end/src/views/Blog/index.vue
index 6bfcb6e..b5fa0d4 100644
--- a/front-end/src/views/Blog/index.vue
+++ b/front-end/src/views/Blog/index.vue
@@ -112,8 +112,9 @@ import { computed } from 'vue';
import { useScriptTag } from '@vueuse/core';
import { useRouteQuery } from '@vueuse/router';
import { TabGroup, TabList, Tab, TabPanels, TabPanel, Switch } from '@headlessui/vue'
-import { first } from 'lodash';
-import { usePageGuard, useUser, useTitle } from '@vnuge/vnlib.browser';
+import { first } from 'lodash-es';
+import { useRoute, useRouter } from 'vue-router';
+import { usePageGuard, useUser, useTitle, useAxios } from '@vnuge/vnlib.browser';
import { createBlogContext, useComputedChannels, useComputedPosts, useComputedContent, SortType } from '@vnuge/cmnext-admin';
import { BlogState } from './blog-api';
import Channels from './components/Channels.vue';
@@ -141,6 +142,9 @@ const firstLetter = computed(() => first(userName.value))
const tabIdQ = useRouteQuery<string>('tabid', '', { mode: 'push' })
const context = createBlogContext({
+ route: useRoute(),
+ router: useRouter(),
+ axios: useAxios(null),
channelUrl: '/blog/channels',
postUrl: '/blog/posts',
contentUrl: '/blog/content'
diff --git a/front-end/src/views/Login/components/Totp.vue b/front-end/src/views/Login/components/Totp.vue
index 50a5be3..43c05d8 100644
--- a/front-end/src/views/Login/components/Totp.vue
+++ b/front-end/src/views/Login/components/Totp.vue
@@ -24,7 +24,7 @@
<script setup lang="ts">
import { useMessage, useWait } from '@vnuge/vnlib.browser';
-import { toSafeInteger } from 'lodash';
+import { toSafeInteger } from 'lodash-es';
import VOtpInput from "vue3-otp-input";
const emit = defineEmits(['submit'])
diff --git a/front-end/src/views/Login/index.vue b/front-end/src/views/Login/index.vue
index f3a3f59..d0fa9b2 100644
--- a/front-end/src/views/Login/index.vue
+++ b/front-end/src/views/Login/index.vue
@@ -51,7 +51,7 @@ import Social from './components/Social.vue'
import { apiCall, useMessage, useWait, useUser, useSession, useLastPage, useTitle, debugLog } from '@vnuge/vnlib.browser'
import { useMfaLogin, totpMfaProcessor, IMfaFlowContinuiation, MfaMethod } from '@vnuge/vnlib.browser/dist/mfa'
import { useTimeoutFn } from '@vueuse/shared'
-import { isNil } from 'lodash'
+import { isNil } from 'lodash-es'
useTitle('Login')
@@ -64,9 +64,7 @@ const { logout } = useUser();
const { loggedIn } = useSession()
//Setup mfa login
-const { login } = useMfaLogin([
- totpMfaProcessor()
-])
+const { login } = useMfaLogin([ totpMfaProcessor() ])
//If logged in re-route to the last page the user
//was on but delayed to the session has time to be set
diff --git a/front-end/src/views/Login/pki/index.vue b/front-end/src/views/Login/pki/index.vue
index ae1a4a8..4e56151 100644
--- a/front-end/src/views/Login/pki/index.vue
+++ b/front-end/src/views/Login/pki/index.vue
@@ -32,7 +32,7 @@
</template>
<script setup lang="ts">
-import { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash-es';
import { apiCall, debugLog, useUser, useMessage } from '@vnuge/vnlib.browser';
import { ITokenResponse } from '@vnuge/vnlib.browser/dist/session';
import { ref } from 'vue'
diff --git a/front-end/src/views/Login/social/[type].vue b/front-end/src/views/Login/social/[type].vue
index 5a803bd..bdb0240 100644
--- a/front-end/src/views/Login/social/[type].vue
+++ b/front-end/src/views/Login/social/[type].vue
@@ -32,11 +32,12 @@
</template>
<script setup lang="ts">
-import { isEqual } from 'lodash'
+import { isEqual } from 'lodash-es'
import { useRouteParams, useRouteQuery } from '@vueuse/router'
import { useSession, useWait, useUser, useTitle, configureApiCall } from '@vnuge/vnlib.browser'
import { useRouter } from 'vue-router';
import { ref } from 'vue'
+import { ITokenResponse } from '@vnuge/vnlib.browser/dist/session';
useTitle('Social Login')
@@ -76,7 +77,7 @@ const run = async () => {
loginUrl = '/login/social/auth0';
break;
default:
- router.push('/login')
+ router.push({ name: 'Login' })
break;
}
@@ -84,17 +85,17 @@ const run = async () => {
await apiCall(async ({ axios }) => {
const preppedLogin = prepareLogin()
// Send the login request
- const response = await axios.post(loginUrl, { nonce: nonce.value })
- if (response.data.success === true) {
- // Finalize the login
- await preppedLogin.finalize(response)
- // If the login was successful, then we can redirect to the login page
- router.push({ name: 'Login' })
- return
- }
- // Otherwise, we can show an error
- throw { response }
+ const { data } = await axios.post<ITokenResponse>(loginUrl, { nonce: nonce.value })
+
+ data.getResultOrThrow()
+
+ // Finalize the login
+ await preppedLogin.finalize(data)
+
+ // If the login was successful, then we can redirect to the login page
+ router.push({ name: 'Login' })
})
+
} else {
switch (result.value) {
case 'invalid':