mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-25 07:45:47 +00:00
Merge branch 'feat/FE/US-77/transfer-to-laying' into 'development'
[FEAT/FE][US#77] Transfer to Laying See merge request mbugroup/lti-web-client!16
This commit is contained in:
@@ -0,0 +1,11 @@
|
|||||||
|
import SuspenseHelper from '@/components/helper/SuspenseHelper';
|
||||||
|
|
||||||
|
const Layout = ({
|
||||||
|
children,
|
||||||
|
}: Readonly<{
|
||||||
|
children: React.ReactNode;
|
||||||
|
}>) => {
|
||||||
|
return <SuspenseHelper>{children}</SuspenseHelper>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Layout;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import SuspenseHelper from '@/components/helper/SuspenseHelper';
|
||||||
|
|
||||||
|
const Layout = ({
|
||||||
|
children,
|
||||||
|
}: Readonly<{
|
||||||
|
children: React.ReactNode;
|
||||||
|
}>) => {
|
||||||
|
return <SuspenseHelper>{children}</SuspenseHelper>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Layout;
|
||||||
@@ -6,22 +6,43 @@ type AuthStore = {
|
|||||||
isLoadingUser?: boolean;
|
isLoadingUser?: boolean;
|
||||||
setUser: (newUserData?: UserWithRoles) => void;
|
setUser: (newUserData?: UserWithRoles) => void;
|
||||||
setIsLoadingUser: (isLoading?: boolean) => void;
|
setIsLoadingUser: (isLoading?: boolean) => void;
|
||||||
|
permissionCheck: (permissionName: string) => boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
const useAuthStore = create<AuthStore>()((set) => ({
|
const useAuthStore = create<AuthStore>()((set, get) => ({
|
||||||
user: undefined,
|
user: undefined,
|
||||||
isLoadingUser: false,
|
isLoadingUser: false,
|
||||||
setUser: (newUserData) => set({ user: newUserData }),
|
setUser: (newUserData) => set({ user: newUserData }),
|
||||||
setIsLoadingUser: (isLoading) => set({ isLoadingUser: Boolean(isLoading) }),
|
setIsLoadingUser: (isLoading) => set({ isLoadingUser: Boolean(isLoading) }),
|
||||||
|
|
||||||
|
permissionCheck: (name) => {
|
||||||
|
const { user, isLoadingUser } = get();
|
||||||
|
|
||||||
|
if (!isLoadingUser && user) {
|
||||||
|
const isAllowed = user.roles.some((role) => {
|
||||||
|
const isPermissionNameAllowed = role.permissions.some(
|
||||||
|
(permission) => permission.name === name
|
||||||
|
);
|
||||||
|
|
||||||
|
return isPermissionNameAllowed;
|
||||||
|
});
|
||||||
|
|
||||||
|
return isAllowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const useAuth = () => {
|
export const useAuth = () => {
|
||||||
const { user, setUser, isLoadingUser, setIsLoadingUser } = useAuthStore();
|
const { user, setUser, isLoadingUser, setIsLoadingUser, permissionCheck } =
|
||||||
|
useAuthStore();
|
||||||
|
|
||||||
return {
|
return {
|
||||||
user,
|
user,
|
||||||
setUser,
|
setUser,
|
||||||
isLoadingUser,
|
isLoadingUser,
|
||||||
setIsLoadingUser,
|
setIsLoadingUser,
|
||||||
|
permissionCheck,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Vendored
+30
@@ -24,6 +24,36 @@ export type LogoutResponse = BaseApiResponse;
|
|||||||
|
|
||||||
export type GetMeResponse = BaseApiResponse<UserWithRoles>;
|
export type GetMeResponse = BaseApiResponse<UserWithRoles>;
|
||||||
|
|
||||||
|
export type Client = {
|
||||||
|
id: number;
|
||||||
|
name: stirng;
|
||||||
|
alias: string;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type Permission = {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
action: string;
|
||||||
|
client: Omit<Client, 'created_at' | 'updated_at'>;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type Role = {
|
||||||
|
id: number;
|
||||||
|
key: string;
|
||||||
|
name: string;
|
||||||
|
client: Omit<Client, 'created_at' | 'updated_at'>;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type RoleWithPermissions = Omit<Role, 'created_at' | 'updated_at'> & {
|
||||||
|
permissions: Omit<Permission, 'created_at' | 'updated_at'>[];
|
||||||
|
};
|
||||||
|
|
||||||
export type User = {
|
export type User = {
|
||||||
id: number;
|
id: number;
|
||||||
email: string;
|
email: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user