Skip to content

Commit

Permalink
Merge pull request #676 from gagan-suie/dev
Browse files Browse the repository at this point in the history
Fix: removed roles endpoints
  • Loading branch information
gagansuie authored Aug 18, 2023
2 parents ca97451 + 72f6808 commit 8f7a5d1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/hooks.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down
3 changes: 0 additions & 3 deletions src/lib/stores/authStore.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/lib/stores/userStore.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { writable, type Writable } from 'svelte/store'

export const user_role: Writable<any> = writable(null)
export const isOnline: Writable<boolean> = writable(false)
22 changes: 3 additions & 19 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 () => {
Expand Down

0 comments on commit 8f7a5d1

Please sign in to comment.