diff --git a/app/src/hooks.ts b/app/src/hooks.ts index 8d1c133..1d66a02 100644 --- a/app/src/hooks.ts +++ b/app/src/hooks.ts @@ -1,17 +1,3 @@ -import type { Handle } from "@sveltejs/kit"; import { appAuth } from "$lib/appAuth"; -export const handle: Handle = async ({ event, resolve }) => { - // TODO https://github.com/sveltejs/kit/issues/1046 - - - if (event.request.query.has("_method")) { - event.request.method = event.request.query.get("_method").toUpperCase(); - } - - const response = await resolve(event); - - return response; -}; - export const { getSession } = appAuth; diff --git a/app/src/routes/__layout.svelte b/app/src/routes/__layout.svelte index 57506b0..a6f6675 100644 --- a/app/src/routes/__layout.svelte +++ b/app/src/routes/__layout.svelte @@ -47,7 +47,7 @@ "rounded-full", )} > - {#if $page.path === "/profile"} + {#if $page.url.pathname === "/profile"} element in src/app.html - target: "#svelte", - }, }; export default config; diff --git a/src/auth.ts b/src/auth.ts index 383c739..016672b 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -1,6 +1,5 @@ import type { GetSession, RequestHandler } from "@sveltejs/kit"; -import type { EndpointOutput } from "@sveltejs/kit/types/endpoint"; -import { RequestEvent } from "@sveltejs/kit/types/hooks"; +import type { EndpointOutput, RequestEvent } from "@sveltejs/kit"; import cookie from "cookie"; import * as jsonwebtoken from "jsonwebtoken"; import type { JWT, Session } from "./interfaces"; diff --git a/src/providers/base.ts b/src/providers/base.ts index 621fd50..f990a56 100644 --- a/src/providers/base.ts +++ b/src/providers/base.ts @@ -1,5 +1,4 @@ -import type { EndpointOutput } from "@sveltejs/kit"; -import { RequestEvent } from "@sveltejs/kit/types/hooks"; +import type { EndpointOutput, RequestEvent } from "@sveltejs/kit"; import type { Auth } from "../auth"; import type { CallbackResult } from "../types"; diff --git a/src/providers/oauth2.base.ts b/src/providers/oauth2.base.ts index 41f6c5f..7bb89fe 100644 --- a/src/providers/oauth2.base.ts +++ b/src/providers/oauth2.base.ts @@ -1,5 +1,4 @@ -import type { EndpointOutput } from "@sveltejs/kit/types/endpoint"; -import { RequestEvent } from "@sveltejs/kit/types/hooks"; +import type { EndpointOutput, RequestEvent } from "@sveltejs/kit"; import type { Auth } from "../auth"; import type { CallbackResult } from "../types"; import { Provider, ProviderConfig } from "./base"; diff --git a/src/providers/oauth2.ts b/src/providers/oauth2.ts index e4ae183..b455bf3 100644 --- a/src/providers/oauth2.ts +++ b/src/providers/oauth2.ts @@ -1,4 +1,4 @@ -import { RequestEvent } from "@sveltejs/kit/types/hooks"; +import { RequestEvent } from "@sveltejs/kit"; import type { Auth } from "../auth"; import { ucFirst } from "../helpers"; import { OAuth2BaseProvider, OAuth2BaseProviderConfig, OAuth2Tokens } from "./oauth2.base"; diff --git a/src/providers/twitter.ts b/src/providers/twitter.ts index 6efb62e..1c120ea 100644 --- a/src/providers/twitter.ts +++ b/src/providers/twitter.ts @@ -1,4 +1,4 @@ -import { RequestEvent } from "@sveltejs/kit/types/hooks"; +import { RequestEvent } from "@sveltejs/kit"; import type { Auth } from "../auth"; import { OAuth2BaseProvider, OAuth2BaseProviderConfig } from "./oauth2.base";