feat:Take user role from cookie #335

metrico · May 17, 2023 · 66f0b62 · 66f0b62
1 parent dfefc47
commit 66f0b62
Show file tree

Hide file tree

Showing 8 changed files with 212 additions and 95 deletions.
diff --git a/src/plugins/Clock/index.tsx b/src/plugins/Clock/index.tsx
@@ -40,7 +40,7 @@ const clockPlugin: Plugin = {
     Component: Clock,
     description: "A simple clock with date / time",
     active: false,
-    roles:['admin','user','guest']
+    roles:['admin','user','guest','superAdmin']
 };
 
 export default clockPlugin;
diff --git a/src/plugins/Plugins.tsx b/src/plugins/Plugins.tsx
@@ -155,7 +155,7 @@ export const PluginCards: React.FC<{
     section: string;
 }> = ({ components, section }) => {
 
-    const userType = useSelector((store:any)=>store.userType)
+    const userType = useSelector((store:any)=>store.currentUser.role)
 
     const filteredList = useMemo(()=>{
         return components?.filter((f:any)=> f.roles.includes(userType))
@@ -181,7 +181,7 @@ export const PluginCards: React.FC<{
 
 export default function Plugins() {
     const theme = useTheme();
-    const userType = useSelector((store:any)=>store.userType)
+    const userType = useSelector((store:any)=>store.currentUser.role)
 
     console.log(userType)
 

diff --git a/src/plugins/settingsmenu/MainMenu.tsx b/src/plugins/settingsmenu/MainMenu.tsx
@@ -19,7 +19,7 @@ import Avatar from "react-avatar";
 export default function MainMenu() {
     const showDs = useSelector((store: any) => store.showDataSourceSetting);
     const currentUser = useSelector((store:any) => store.currentUser);
-    const userType = useSelector((store: any) => store.userType);
+    const userType = useSelector((store: any) => store.currentUser.role);
     const dispatch = useDispatch();
 
     const theme = useTheme();

diff --git a/src/store/createInitialState.ts b/src/store/createInitialState.ts
@@ -153,7 +153,7 @@ export default function initialState() {
         isSubmit: urlState.isSubmit || false,
         isEmbed: urlState.isEmbed || false,
         userType:'admin',
-        currentUser: {name:'Qryn Admin', role:'admin', id:"OoH8zZt71U70W01LcgAQs"},
+        currentUser: {name:'Qryn Admin', role:'admin', id:"OoH8zZt71U70W01LcgAQs", selected:true},
         // dont mention queries // its obvious
 
         left: urlState["left"] || [

diff --git a/src/views/Main.tsx b/src/views/Main.tsx
@@ -32,7 +32,10 @@ export default function Main() {
 
     UpdateStateFromQueryParams();
 
-    const { cookiesAvailable, cookieAuth } = useCookiesAvailable(paramsMemo);
+    const { cookiesAvailable, cookieAuth, cookieUser } = useCookiesAvailable(paramsMemo);
+
+
+
     const { urlAvailable, url } = useUrlAvailable(paramsMemo);
     useEffect(() => {
         const onlyCookie = cookiesAvailable && !urlAvailable;

diff --git a/src/views/Main/helpers.ts b/src/views/Main/helpers.ts
@@ -1,7 +1,6 @@
 import axios, { AxiosError, AxiosResponse } from "axios";
 import { getDsHeaders } from "../../components/QueryBuilder/Operations/helpers";
 import setDataSources from "../DataSources/store/setDataSources";
-import { setUserType } from "./actions";
 import { setShowDataSourceSetting } from "./setShowDataSourceSetting";
 
 // updateDataSources:
@@ -28,24 +27,6 @@ export function updateDataSourcesWithUrl(
         let cookieDsData = "";
         if (dsData && dsData !== "") {
             try {
-                let userType = "";
-                let ut = dsData.split("&&");
-                if (ut[1] && typeof ut[1] === "string" && ut[1] !== "") {
-                    userType = ut[1];
-                } else {
-                    userType = "admin";
-                }
-
-                // urlDsData = atob(urlDsData);
-                // urlDsData = JSON.parse(urlDsData);
-
-                if (
-                    userType &&
-                    typeof userType === "string" &&
-                    userType !== ""
-                ) {
-                    dispatch(setUserType(userType));
-                }
                 if (typeof cookieDsData === "object" && cookieDsData["url"]) {
                     apiUrl = cookieDsData["url"];
                     haveUrl = true;

diff --git a/src/views/Main/hooks.tsx b/src/views/Main/hooks.tsx
@@ -1,12 +1,22 @@
 import { useMemo } from "react";
 import { useCookies } from "react-cookie";
 import DOMPurify from 'isomorphic-dompurify';
+import {useSelector, useDispatch} from 'react-redux';
+import { setCurrentUser } from "../User/actions";
+
+
 // useCookiesAvailable:
 
+
+
 export function useCookiesAvailable(urlParams: any) {
+
+    const dispatch = useDispatch()
     let cookieAuth = "";
     let cookiesAvailable = false;
 
+    const currentUser = useSelector((store:any) => store.currentUser)
+
     const hasCookie = useMemo(() => {
         return urlParams.has("cookie") || false;
     }, [urlParams]);
@@ -19,12 +29,29 @@ export function useCookiesAvailable(urlParams: any) {
     }, [urlParams, hasCookie]);
       // eslint-disable-next-line
     const [cookie, _] = useCookies([cookieParam]);
+ // eslint-disable-next-line
+    const [userCookie, __] = useCookies(['user-cookie'])
+
+
+
+    let userCookieParsed = currentUser
+
+
+    if(userCookie?.['user-cookie']) {
+        try {
+            userCookieParsed = atob(userCookie['user-cookie'])
+
+        }catch(e){console.log("could not parse user cookie")}
+
+    }
+
+
 
     if (cookie[cookieParam] && cookie[cookieParam] !== "") {
         cookieAuth = cookie[cookieParam];
         cookiesAvailable = true;
     }
-    return { cookieAuth, cookiesAvailable };
+    return { cookieAuth, cookiesAvailable, cookieUser: userCookieParsed };
 }
 
 // useUrlAvailable: