diff options
| author | ivarlovlie <git@ivarlovlie.no> | 2022-11-17 07:48:00 +0100 |
|---|---|---|
| committer | ivarlovlie <git@ivarlovlie.no> | 2022-11-17 07:48:00 +0100 |
| commit | 6ea5bd8c6ec089c278253d251f83c59ca5338dea (patch) | |
| tree | e74af816f5bde4cb398915c7b656ec36385b72bd /code/app/src/lib | |
| parent | 971a70d15e5531b59afd74556dc50214deeeafe9 (diff) | |
| download | greatoffice-6ea5bd8c6ec089c278253d251f83c59ca5338dea.tar.xz greatoffice-6ea5bd8c6ec089c278253d251f83c59ca5338dea.zip | |
refactor: Small changes
Diffstat (limited to 'code/app/src/lib')
| -rw-r--r-- | code/app/src/lib/api/_fetch.ts | 20 | ||||
| -rw-r--r-- | code/app/src/lib/api/account/models/LoginPayload.ts | 5 | ||||
| -rw-r--r-- | code/app/src/lib/api/account/models/UpdateProfilePayload.ts | 4 | ||||
| -rw-r--r-- | code/app/src/lib/services/settings-service.ts | 7 | ||||
| -rw-r--r-- | code/app/src/lib/session.ts | 2 | ||||
| -rw-r--r-- | code/app/src/lib/swr.ts | 6 |
6 files changed, 18 insertions, 26 deletions
diff --git a/code/app/src/lib/api/_fetch.ts b/code/app/src/lib/api/_fetch.ts index 62cdf84..21df208 100644 --- a/code/app/src/lib/api/_fetch.ts +++ b/code/app/src/lib/api/_fetch.ts @@ -1,28 +1,28 @@ -import {Temporal} from "temporal-polyfill"; -import {clear_session_data} from "$lib/session"; -import {redirect} from "@sveltejs/kit"; -import {browser} from "$app/environment"; -import {goto} from "$app/navigation"; -import {SignInPageMessage, signInPageMessageQueryKey} from "$routes/(main)/(public)/sign-in"; -import {log_error} from "$lib/logger"; +import { Temporal } from "temporal-polyfill"; +import { clear_session_data } from "$lib/session"; +import { redirect } from "@sveltejs/kit"; +import { browser } from "$app/environment"; +import { goto } from "$app/navigation"; +import { SignInPageMessage, signInPageMessageQueryKey } from "$routes/(main)/(public)/sign-in"; +import { log_error } from "$lib/logger"; export async function http_post_async(url: string, body?: object | string, timeout = -1, skip_401_check = false, abort_signal?: AbortSignal): Promise<Response> { const init = make_request_init("post", body, abort_signal); - const response = await internal_fetch_async({url, init, timeout}); + const response = await internal_fetch_async({ url, init, timeout }); if (!skip_401_check && await redirect_if_401_async(response)) throw new Error("Server returned 401"); return response; } export async function http_get_async(url: string, timeout = -1, skip_401_check = false, abort_signal?: AbortSignal): Promise<Response> { const init = make_request_init("get", undefined, abort_signal); - const response = await internal_fetch_async({url, init, timeout}); + const response = await internal_fetch_async({ url, init, timeout }); if (!skip_401_check && await redirect_if_401_async(response)) throw new Error("Server returned 401"); return response; } export async function http_delete_async(url: string, body?: object | string, timeout = -1, skip_401_check = false, abort_signal?: AbortSignal): Promise<Response> { const init = make_request_init("delete", body, abort_signal); - const response = await internal_fetch_async({url, init, timeout}); + const response = await internal_fetch_async({ url, init, timeout }); if (!skip_401_check && await redirect_if_401_async(response)) throw new Error("Server returned 401"); return response; } diff --git a/code/app/src/lib/api/account/models/LoginPayload.ts b/code/app/src/lib/api/account/models/LoginPayload.ts deleted file mode 100644 index beb96cf..0000000 --- a/code/app/src/lib/api/account/models/LoginPayload.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface LoginPayload { - username: string, - password: string, - persist: boolean -} diff --git a/code/app/src/lib/api/account/models/UpdateProfilePayload.ts b/code/app/src/lib/api/account/models/UpdateProfilePayload.ts deleted file mode 100644 index d2983ff..0000000 --- a/code/app/src/lib/api/account/models/UpdateProfilePayload.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface UpdateProfilePayload { - username?: string, - password?: string, -} diff --git a/code/app/src/lib/services/settings-service.ts b/code/app/src/lib/services/settings-service.ts index e69de29..6b801ac 100644 --- a/code/app/src/lib/services/settings-service.ts +++ b/code/app/src/lib/services/settings-service.ts @@ -0,0 +1,7 @@ +import type { ISettingsService } from "./abstractions/ISettingsService"; + +export class SettingsService implements ISettingsService { + get_user_settings(): Promise<void> { + throw new Error("Method not implemented."); + } +}
\ No newline at end of file diff --git a/code/app/src/lib/session.ts b/code/app/src/lib/session.ts index 48dcc50..317bf59 100644 --- a/code/app/src/lib/session.ts +++ b/code/app/src/lib/session.ts @@ -33,7 +33,7 @@ async function call_api(): Promise<boolean> { try { const response = await http_account.get_profile_async(true); if (response.ok) { - const userData = await response.data; + const userData = await response.json(); if (is_guid(userData.id) && userData.username) { const session = { profile: userData, diff --git a/code/app/src/lib/swr.ts b/code/app/src/lib/swr.ts deleted file mode 100644 index 39c8665..0000000 --- a/code/app/src/lib/swr.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { createDefaultSWR } from "sswr"; -import { http_get_async } from "./api/_fetch"; - -export const swr = createDefaultSWR({ - fetcher: (key: string) => http_get_async(key), -}); |
