mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
fix: Header Role Indicator + Disable course creation wording if user isn't connected
This commit is contained in:
parent
a124cde229
commit
7398e9e946
9 changed files with 85 additions and 169 deletions
14
apps/web/components/ContentPlaceHolder.tsx
Normal file
14
apps/web/components/ContentPlaceHolder.tsx
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
'use client';
|
||||
import React from 'react'
|
||||
import useAdminStatus from './Hooks/useAdminStatus'
|
||||
|
||||
|
||||
// Terrible name and terible implementation, need to be refactored asap
|
||||
function ContentPlaceHolderIfUserIsNotAdmin({ text }: { text: string }) {
|
||||
const isUserAdmin = useAdminStatus() as any
|
||||
return (
|
||||
<div>{isUserAdmin ? text : 'No content yet'}</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ContentPlaceHolderIfUserIsNotAdmin
|
||||
40
apps/web/components/Hooks/useAdminStatus.tsx
Normal file
40
apps/web/components/Hooks/useAdminStatus.tsx
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
import { useOrg } from '@components/Contexts/OrgContext'
|
||||
import { useSession } from '@components/Contexts/SessionContext'
|
||||
import { useEffect } from 'react'
|
||||
|
||||
function useAdminStatus() {
|
||||
const session = useSession() as any
|
||||
const org = useOrg() as any
|
||||
|
||||
// If session is not loaded, redirect to login
|
||||
|
||||
useEffect(() => {
|
||||
if (session.isLoading) {
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
, [session])
|
||||
|
||||
const isUserAdmin = () => {
|
||||
if (session.isAuthenticated) {
|
||||
const isAdmin = session.roles.some((role: any) => {
|
||||
return (
|
||||
role.org.id === org.id &&
|
||||
(role.role.id === 1 ||
|
||||
role.role.id === 2 ||
|
||||
role.role.role_uuid === 'role_global_admin' ||
|
||||
role.role.role_uuid === 'role_global_maintainer')
|
||||
)
|
||||
})
|
||||
return isAdmin
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Return the user admin status
|
||||
return isUserAdmin()
|
||||
|
||||
}
|
||||
|
||||
export default useAdminStatus
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
'use client'
|
||||
import React from 'react'
|
||||
import styled from 'styled-components'
|
||||
import Link from 'next/link'
|
||||
import {
|
||||
getNewAccessTokenUsingRefreshToken,
|
||||
getUserInfo,
|
||||
} from '@services/auth/auth'
|
||||
import { usePathname } from 'next/navigation'
|
||||
import { useRouter } from 'next/router'
|
||||
import { Settings } from 'lucide-react'
|
||||
import UserAvatar from '@components/Objects/UserAvatar'
|
||||
|
||||
export interface Auth {
|
||||
access_token: string
|
||||
isAuthenticated: boolean
|
||||
userInfo: any
|
||||
isLoading: boolean
|
||||
}
|
||||
|
||||
function ProfileArea() {
|
||||
const PRIVATE_ROUTES = ['/course/*/edit', '/settings*', '/trail']
|
||||
const NON_AUTHENTICATED_ROUTES = ['/login', '/register']
|
||||
|
||||
const router = useRouter()
|
||||
const pathname = usePathname()
|
||||
const [auth, setAuth] = React.useState<Auth>({
|
||||
access_token: '',
|
||||
isAuthenticated: false,
|
||||
userInfo: {},
|
||||
isLoading: true,
|
||||
})
|
||||
|
||||
async function checkRefreshToken() {
|
||||
let data = await getNewAccessTokenUsingRefreshToken()
|
||||
if (data) {
|
||||
return data.access_token
|
||||
}
|
||||
}
|
||||
|
||||
React.useEffect(() => {
|
||||
checkAuth()
|
||||
}, [pathname])
|
||||
|
||||
async function checkAuth() {
|
||||
try {
|
||||
let access_token = await checkRefreshToken()
|
||||
let userInfo = {}
|
||||
let isLoading = false
|
||||
|
||||
if (access_token) {
|
||||
userInfo = await getUserInfo(access_token)
|
||||
setAuth({ access_token, isAuthenticated: true, userInfo, isLoading })
|
||||
|
||||
// Redirect to home if user is trying to access a NON_AUTHENTICATED_ROUTES route
|
||||
|
||||
if (
|
||||
NON_AUTHENTICATED_ROUTES.some((route) =>
|
||||
new RegExp(`^${route.replace('*', '.*')}$`).test(pathname)
|
||||
)
|
||||
) {
|
||||
router.push('/')
|
||||
}
|
||||
} else {
|
||||
setAuth({ access_token, isAuthenticated: false, userInfo, isLoading })
|
||||
|
||||
// Redirect to login if user is trying to access a private route
|
||||
if (
|
||||
PRIVATE_ROUTES.some((route) =>
|
||||
new RegExp(`^${route.replace('*', '.*')}$`).test(pathname)
|
||||
)
|
||||
) {
|
||||
router.push('/login')
|
||||
}
|
||||
}
|
||||
} catch (error) {}
|
||||
}
|
||||
return (
|
||||
<ProfileAreaStyled>
|
||||
{!auth.isAuthenticated && (
|
||||
<UnidentifiedArea>
|
||||
<ul>
|
||||
<li>
|
||||
<Link href="/login">Login</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link href="/signup">Sign up</Link>
|
||||
</li>
|
||||
</ul>
|
||||
</UnidentifiedArea>
|
||||
)}
|
||||
{auth.isAuthenticated && (
|
||||
<AccountArea>
|
||||
<div>{auth.userInfo.user_object.username}</div>
|
||||
<div>
|
||||
<UserAvatar width={40} />
|
||||
</div>
|
||||
<Link href={'/dash'}>
|
||||
<Settings />
|
||||
</Link>
|
||||
</AccountArea>
|
||||
)}
|
||||
</ProfileAreaStyled>
|
||||
)
|
||||
}
|
||||
|
||||
const AccountArea = styled.div`
|
||||
padding-right: 20px;
|
||||
display: flex;
|
||||
place-items: center;
|
||||
|
||||
div {
|
||||
margin-right: 10px;
|
||||
}
|
||||
img {
|
||||
width: 29px;
|
||||
border-radius: 19px;
|
||||
}
|
||||
`
|
||||
|
||||
const ProfileAreaStyled = styled.div`
|
||||
display: flex;
|
||||
place-items: stretch;
|
||||
place-items: center;
|
||||
`
|
||||
|
||||
const UnidentifiedArea = styled.div`
|
||||
display: flex;
|
||||
place-items: stretch;
|
||||
flex-grow: 1;
|
||||
|
||||
ul {
|
||||
display: flex;
|
||||
place-items: center;
|
||||
list-style: none;
|
||||
padding-left: 20px;
|
||||
|
||||
li {
|
||||
padding-right: 20px;
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
color: #171717;
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
export default ProfileArea
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
'use client'
|
||||
import { useOrg } from '@components/Contexts/OrgContext'
|
||||
import { useSession } from '@components/Contexts/SessionContext'
|
||||
import useAdminStatus from '@components/Hooks/useAdminStatus'
|
||||
import { usePathname, useRouter } from 'next/navigation'
|
||||
import React from 'react'
|
||||
|
||||
|
|
@ -40,18 +41,7 @@ function AdminAuthorization(props: AuthorizationProps) {
|
|||
}
|
||||
|
||||
// Verify if the user is an Admin (1), Maintainer (2) or Member (3) of the organization
|
||||
const isUserAdmin = () => {
|
||||
const isAdmin = session.roles.some((role: any) => {
|
||||
return (
|
||||
role.org.id === org.id &&
|
||||
(role.role.id === 1 ||
|
||||
role.role.id === 2 ||
|
||||
role.role.role_uuid === 'role_global_admin' ||
|
||||
role.role.role_uuid === 'role_global_maintainer')
|
||||
)
|
||||
})
|
||||
return isAdmin
|
||||
}
|
||||
const isUserAdmin = useAdminStatus()
|
||||
|
||||
function checkPathname(pattern: string, pathname: string) {
|
||||
// Escape special characters in the pattern and replace '*' with a regex pattern
|
||||
|
|
@ -72,7 +62,7 @@ function AdminAuthorization(props: AuthorizationProps) {
|
|||
console.log('Admin path')
|
||||
if (isUserAuthenticated()) {
|
||||
// Check if the user is an Admin
|
||||
if (isUserAdmin()) {
|
||||
if (isUserAdmin) {
|
||||
setIsAuthorized(true)
|
||||
} else {
|
||||
setIsAuthorized(false)
|
||||
|
|
@ -93,7 +83,7 @@ function AdminAuthorization(props: AuthorizationProps) {
|
|||
|
||||
if (props.authorizationMode === 'component') {
|
||||
// Component mode
|
||||
if (isUserAuthenticated() && isUserAdmin()) {
|
||||
if (isUserAuthenticated() && isUserAdmin) {
|
||||
setIsAuthorized(true)
|
||||
} else {
|
||||
setIsAuthorized(false)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,19 @@
|
|||
'use client'
|
||||
import React from 'react'
|
||||
import React, { useEffect } from 'react'
|
||||
import styled from 'styled-components'
|
||||
import Link from 'next/link'
|
||||
import { Settings } from 'lucide-react'
|
||||
import { useSession } from '@components/Contexts/SessionContext'
|
||||
import UserAvatar from '@components/Objects/UserAvatar'
|
||||
import useAdminStatus from '@components/Hooks/useAdminStatus'
|
||||
|
||||
export const HeaderProfileBox = () => {
|
||||
const session = useSession() as any
|
||||
const isUserAdmin = useAdminStatus() as any
|
||||
|
||||
useEffect(() => {
|
||||
}
|
||||
, [session])
|
||||
|
||||
return (
|
||||
<ProfileArea>
|
||||
|
|
@ -26,7 +32,10 @@ export const HeaderProfileBox = () => {
|
|||
{session.isAuthenticated && (
|
||||
<AccountArea className="space-x-0">
|
||||
<div className="flex items-center space-x-2">
|
||||
<div className="text-xs">{session.user.username} </div>
|
||||
<div className='flex items-center space-x-2' >
|
||||
<p className='text-sm'>{session.user.username}</p>
|
||||
{isUserAdmin && <div className="text-[10px] bg-rose-300 px-2 font-bold rounded-md shadow-inner py-1">ADMIN</div>}
|
||||
</div>
|
||||
<div className="py-4">
|
||||
<UserAvatar border="border-4" rounded="rounded-lg" width={30} />
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue