diff --git a/apps/www/src/routes/layout.tsx b/apps/www/src/routes/layout.tsx index 8ee54ec0..f92b767c 100644 --- a/apps/www/src/routes/layout.tsx +++ b/apps/www/src/routes/layout.tsx @@ -1,8 +1,8 @@ +import posthog from "posthog-js"; import Nestri from "@nestri/sdk"; import { NavProgress } from "@nestri/ui"; import { component$, Slot, useVisibleTask$ } from "@builder.io/qwik"; import { type DocumentHead, type RequestHandler } from "@builder.io/qwik-city"; -import posthog from "posthog-js"; export const onGet: RequestHandler = async ({ cacheControl }) => { // Control caching for this request for best performance and to reduce hosting costs: @@ -15,18 +15,26 @@ export const onGet: RequestHandler = async ({ cacheControl }) => { }); }; -export const onRequest: RequestHandler = async ({ cookie, sharedMap }) => { +export const onRequest: RequestHandler = async ({ cookie, url, redirect, sharedMap }) => { const access = cookie.get("access_token") if (access) { - const bearerToken = access.value + try { - const nestriClient = new Nestri({ - bearerToken, - baseURL: "https://api.nestri.io" - }) + const bearerToken = access.value - const currentProfile = await nestriClient.users.retrieve() - sharedMap.set("profile", currentProfile.data) + const nestriClient = new Nestri({ + bearerToken, + baseURL: "https://api.nestri.io" + }) + const currentProfile = await nestriClient.users.retrieve() + sharedMap.set("profile", currentProfile.data) + } catch (error) { + console.log("error working with bearer token", error) + cookie.delete("access_token") + cookie.delete("refresh_token") + + throw redirect(302, url.origin) + } } } diff --git a/bun.lockb b/bun.lockb index 87c2a0ab..cea9dbb4 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/packages/ui/src/home-nav-bar.tsx b/packages/ui/src/home-nav-bar.tsx index ae30c859..40ca7d0c 100644 --- a/packages/ui/src/home-nav-bar.tsx +++ b/packages/ui/src/home-nav-bar.tsx @@ -127,7 +127,7 @@ export const HomeNavBar = component$(({ avatarUrl, username, discriminator }: Pr value={team.name} class="leading-none text-sm items-center flex px-2 h-8 rounded-md outline-none relative select-none w-full" > - + {team.name} diff --git a/packages/ui/src/nav-bar.tsx b/packages/ui/src/nav-bar.tsx index 7332f9df..d9cdfc46 100644 --- a/packages/ui/src/nav-bar.tsx +++ b/packages/ui/src/nav-bar.tsx @@ -38,8 +38,8 @@ export const NavBar = component$(({ link }: Props) => {