nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show toast for other errors in Login

Browse Source
This commit is contained in:
Kloon ImKloon 2023-10-01 14:57:02 +02:00
parent 57e4dad7fd
commit 38db04f8ae
No known key found for this signature in database
GPG Key ID: CCF1C86A995C5B6A
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/api/utils.ts
View File

@ -42,7 +42,11 @@ export async function fetchURL(
} }
if (res.status < 200 || res.status > 299) { if (res.status < 200 || res.status > 299) {
const error = new StatusError(await res.text(), res.status); const body = await res.text();
const error = new StatusError(
body || `${res.status} ${res.statusText}`,
res.status
);
if (auth && res.status == 401) { if (auth && res.status == 401) {
logout(); logout();

12
frontend/src/utils/auth.ts
View File

@ -48,7 +48,10 @@ export async function login(
if (res.status === 200) { if (res.status === 200) {
parseToken(body); parseToken(body);
} else { } else {
throw new StatusError(body, res.status); throw new StatusError(
body || `${res.status} ${res.statusText}`,
res.status
);
} }
} }
@ -65,7 +68,10 @@ export async function renew(jwt: string) {
if (res.status === 200) { if (res.status === 200) {
parseToken(body); parseToken(body);
} else { } else {
throw new StatusError(body, res.status); throw new StatusError(
body || `${res.status} ${res.statusText}`,
res.status
);
} }
} }
@ -81,7 +87,7 @@ export async function signup(username: string, password: string) {
}); });
if (res.status !== 200) { if (res.status !== 200) {
throw new StatusError(res.statusText, res.status); throw new StatusError(`${res.status} ${res.statusText}`, res.status);
} }
} }

19
frontend/src/views/Login.vue
View File

@ -42,6 +42,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { StatusError } from "@/api/utils";
import * as auth from "@/utils/auth"; import * as auth from "@/utils/auth";
import { import {
name, name,
@ -50,7 +51,7 @@ import {
recaptchaKey, recaptchaKey,
signup, signup,
} from "@/utils/constants"; } from "@/utils/constants";
import { onMounted, ref } from "vue"; import { inject, onMounted, ref } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from "vue-router";
@ -67,6 +68,8 @@ const { t } = useI18n({});
// Define functions // Define functions
const toggleMode = () => (createMode.value = !createMode.value); const toggleMode = () => (createMode.value = !createMode.value);
const $showError = inject<IToastError>("$showError")!;
const submit = async (event: Event) => { const submit = async (event: Event) => {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -98,11 +101,15 @@ const submit = async (event: Event) => {
await auth.login(username.value, password.value, captcha); await auth.login(username.value, password.value, captcha);
router.push({ path: redirect }); router.push({ path: redirect });
} catch (e: any) { } catch (e: any) {
console.error(e); // console.error(e);
if (e.message == 409) { if (e instanceof StatusError) {
error.value = t("login.usernameTaken"); if (e.status === 409) {
} else { error.value = t("login.usernameTaken");
error.value = t("login.wrongCredentials"); } else if (e.status === 403) {
error.value = t("login.wrongCredentials");
} else {
$showError(e);
}
} }
} }
}; };