From 72f68082c3ba57bd35d85dec5ddd701d9777a67c Mon Sep 17 00:00:00 2001 From: Gagan Suie Date: Thu, 17 Aug 2023 17:20:22 -0500 Subject: [PATCH] Fix: removed roles endpoints --- src/hooks.server.ts | 2 +- src/lib/stores/authStore.ts | 3 --- src/lib/stores/userStore.ts | 1 + src/routes/+layout.svelte | 22 +++------------------- 4 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 src/lib/stores/authStore.ts diff --git a/src/hooks.server.ts b/src/hooks.server.ts index d6fa71fd..d9cb1100 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -2,7 +2,7 @@ import { redirect, type Handle } from '@sveltejs/kit' import { get as getWritableVal } from 'svelte/store' import { Authenticate } from '$lib/authentication/authentication' import { get } from '$lib/api' -import { user_role } from '$lib/stores/authStore' +import { user_role } from '$lib/stores/userStore' import { env } from '$env/dynamic/public' export const handle: Handle = async ({ event, resolve }) => { diff --git a/src/lib/stores/authStore.ts b/src/lib/stores/authStore.ts deleted file mode 100644 index cdb38c60..00000000 --- a/src/lib/stores/authStore.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { writable, type Writable } from 'svelte/store' - -export const user_role: Writable = writable(null) diff --git a/src/lib/stores/userStore.ts b/src/lib/stores/userStore.ts index 3acfcfe8..ce802ced 100644 --- a/src/lib/stores/userStore.ts +++ b/src/lib/stores/userStore.ts @@ -1,3 +1,4 @@ import { writable, type Writable } from 'svelte/store' +export const user_role: Writable = writable(null) export const isOnline: Writable = writable(false) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b0fab6a2..aca0d5bc 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -28,7 +28,7 @@ is_feature_obs_enabled } from '$lib/stores/remoteConfigStore' import { env } from '$env/dynamic/public' - import { user_role } from '$lib/stores/authStore' + import { user_role } from '$lib/stores/userStore' NProgress.configure({ minimum: 0.75, @@ -62,24 +62,8 @@ }) const getUserRole = async () => { - if ($page.data.user?.userId && !$user_role) { - const allRoles = await get('roles', { - userId: $page.data.user?.userId, - token: $page.data.user?.token - }) - if (Array.isArray(allRoles)) { - const userRole = await get('roles/role-mapping', { - userId: $page.data.user?.userId, - token: $page.data.user?.token - }) - if (userRole && userRole.role) { - const usersRoleName = allRoles.find((item) => { - return item._id == userRole.role - })?.name - $user_role = usersRoleName - } - } - } + //TODO: get role from Auth0 + $user_role = 'user' } const handleWebsocket = async () => {