@vocollege/app 0.0.58 → 0.0.59

package/src/modules/VoApi/queries/search.ts

@@ -5,8 +5,16 @@ export const SEARCH_CONTENT = gql`
     $search: String!
     $types: [String]
     $primaryField: String
+    $limit: Int
+    $entity: Boolean
   ) {
-    searchContent(search: $search, types: $types, primaryField: $primaryField) {
+    searchContent(
+      search: $search
+      types: $types
+      primaryField: $primaryField
+      limit: $limit
+      entity: $entity
+    ) {
       id
       title
       type
@@ -19,3 +27,92 @@ export const SEARCH_CONTENT = gql`
     }
   }
 `;
+
+export const SEARCH_USER = gql`
+  query SearchUser(
+    $search: String!
+    $roles: [String]
+    $limit: Int
+    $entity: Boolean
+  ) {
+    searchUser(search: $search, roles: $roles, limit: $limit, entity: $entity) {
+      id
+      name
+      email
+      firstname
+      lastname
+      type
+    }
+  }
+`;
+
+export const SEARCH_GROUP = gql`
+  query SearchGroup($categories: [String], $search: String!, $limit: Int) {
+    searchGroup(categories: $categories, search: $search, limit: $limit) {
+      id
+      name
+      title
+      category
+      certified
+      type
+      logo {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
+      logo2 {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
+      parentGroups {
+        id
+        name
+        title
+        logo {
+          id
+          title
+          filename
+          filesize
+          filetype
+          url
+        }
+        logo2 {
+          id
+          title
+          filename
+          filesize
+          filetype
+          url
+        }
+        parentGroups {
+          id
+          name
+          title
+          logo {
+            id
+            title
+            filename
+            filesize
+            filetype
+            url
+          }
+          logo2 {
+            id
+            title
+            filename
+            filesize
+            filetype
+            url
+          }
+        }
+      }
+    }
+  }
+`;

package/src/modules/VoApi/queries/sections.ts

@@ -35,7 +35,7 @@ export const GET_SECTIONS = gql`
     $search: String
     $page: Int
     $limit: Int
-    $orderBy: [GetSectionsOrderByOrderByClause]
+    $orderBy: [GetSectionsOrderByClause]
   ) {
     sections(search: $search, page: $page, limit: $limit, orderBy: $orderBy) {
       paginatorInfo {

package/src/modules/VoApi/queries/users.ts

@@ -12,13 +12,16 @@ export const GET_USER = gql`
       personal_number
       address1
       address2
-      zip
-      county
+      postalcode
+      town
       country
       phone1
       profession
       status
+      gdpr
       description
+      updated_at
+      created_at
       images {
         id
         title
@@ -27,18 +30,21 @@ export const GET_USER = gql`
         filetype
         url
       }
-      updated_at
-      created_at
-      groups {
+      roles {
         id
-        title
+        label
         type
       }
-      roles {
+      groupRoles {
         id
         label
         type
       }
+      groups {
+        id
+        title
+        type
+      }
     }
   }
 `;
@@ -62,7 +68,7 @@ export const GET_USERS = gql`
     $search: String
     $page: Int
     $limit: Int
-    $orderBy: [GetUsersOrderByOrderByClause]
+    $orderBy: [GetUsersOrderByClause]
   ) {
     users(search: $search, page: $page, limit: $limit, orderBy: $orderBy) {
       paginatorInfo {
@@ -76,6 +82,66 @@ export const GET_USERS = gql`
         email
         active
         status
+        updated_at
+        created_at
+        roles {
+          id
+          label
+          type
+        }
+        groupRoles {
+          id
+          label
+          type
+        }
+        groups {
+          id
+          name
+          title
+        }
+        validig {
+          id
+        }
+      }
+    }
+  }
+`;
+
+export const GET_ACCOUNT = gql`
+  query Account($id: ID!) {
+    user(id: $id) {
+      id
+      name
+      email
+      firstname
+      lastname
+      active
+      personal_number
+      address1
+      address2
+      postalcode
+      town
+      country
+      phone1
+      profession
+      status
+      description
+      workplace
+      gdpr
+      images {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
+    }
+    userSettings {
+      publicDefaultPortfolio {
+        id
+        name
+        disk
       }
     }
   }

package/src/modules/VoApi/queries/vodocs.ts

@@ -5,12 +5,13 @@ export const GET_PORTFOLIO = gql`
     portfolio(id: $id) {
       id
       disk
+      status
       name
-      disk
       title
       description
       created_at
       updated_at
+      type
     }
   }
 `;
@@ -20,7 +21,7 @@ export const GET_PORTFOLIOS = gql`
     $search: String
     $page: Int
     $limit: Int
-    $orderBy: [GetPortfoliosOrderByOrderByClause]
+    $orderBy: [GetPortfoliosOrderByClause]
   ) {
     portfolios(search: $search, page: $page, limit: $limit, orderBy: $orderBy) {
       # paginatorInfo {
@@ -31,12 +32,13 @@ export const GET_PORTFOLIOS = gql`
       data {
         id
         disk
+        status
         name
-        disk
         title
         description
         created_at
         updated_at
+        type
       }
     }
   }
@@ -49,7 +51,7 @@ export const GET_FOLDER_ELEMENTS = gql`
     $search: String
     $page: Int
     $limit: Int
-    $orderBy: [GetFolderElementsOrderByOrderByClause]
+    $orderBy: [GetFolderElementsOrderByClause]
     $filetypes: [String]
   ) {
     folderElements(
@@ -97,6 +99,7 @@ export const GET_FOLDER_ELEMENTS = gql`
           description
           created_at
           updated_at
+          type
         }
         ... on File {
           id
@@ -112,6 +115,7 @@ export const GET_FOLDER_ELEMENTS = gql`
           updated_at
           url
           previewUrl
+          type
         }
       }
     }

package/src/modules/VoApi/queries/vogroups.ts

@@ -11,6 +11,7 @@ export const GET_GROUP = gql`
       category
       docs
       website
+      educator_category
       certified
       status
       url
@@ -30,26 +31,51 @@ export const GET_GROUP = gql`
         filetype
         url
       }
-      # images {
-      #   id
-      #   title
-      #   filename
-      #   filesize
-      #   filetype
-      #   url
-      # }
+      logo2 {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
+      logo3 {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
       users {
         id
         name
         email
         firstname
         lastname
+        type
+        groupRoles {
+          id
+          label
+          type
+        }
       }
       contacts {
         id
         title
         type
       }
+      vopage
+      front_title
+      front_body
+      images {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
     }
     allGroups(categories: $categories) {
       id
@@ -59,10 +85,11 @@ export const GET_GROUP = gql`
 `;
 
 export const GET_AVAILABLE_GROUPS = gql`
-  query Group($categories: [String]) {
-    allGroups(categories: $categories) {
+  query Group($categories: [String], $byPassMembership: Boolean) {
+    allGroups(categories: $categories, byPassMembership: $byPassMembership) {
       id
       title
+      category
     }
   }
 `;
@@ -72,7 +99,7 @@ export const GET_GROUPS = gql`
     $search: String
     $page: Int
     $limit: Int
-    $orderBy: [GetGroupsOrderByOrderByClause]
+    $orderBy: [GetGroupsOrderByClause]
   ) {
     groups(search: $search, page: $page, limit: $limit, orderBy: $orderBy) {
       paginatorInfo {
@@ -84,7 +111,9 @@ export const GET_GROUPS = gql`
         id
         name
         title
+        category
         status
+        vopage
         created_at
         updated_at
       }

package/src/modules/VoApp.ts

@@ -1,12 +1,29 @@
-import VoApi from './VoApi';
-import VoConfig from './VoConfig';
-import VoRouter from './VoRouter';
+import VoApi from "./VoApi";
+import VoConfig from "./VoConfig";
+import VoRouter from "./VoRouter";
+import { localStorage } from "./VoHelpers";
+import { toast } from "react-toastify";
+import I18n from "./Services/I18n";
 
 class VoApp {
-    configure(config: any, routes: any) {
-        VoConfig.setConfig(config);
-        VoRouter.setRoutes(routes);
-        VoApi.init();
+  configure(config: any, routes: any) {
+    VoConfig.setConfig(config);
+    VoRouter.setRoutes(routes);
+    VoApi.init();
+  }
+  checkVersion() {
+    let storedVersion: any = localStorage.get("vo_app_version");
+    if (storedVersion) {
+      storedVersion = parseFloat(storedVersion);
     }
+    let currentVersion = parseFloat(VoConfig.get.APP_VERSION);
+    if (currentVersion && currentVersion !== storedVersion) {
+      toast.warning(I18n.get.messages.newVersionAvailable, {
+        autoClose: false,
+      });
+      localStorage.set("vo_app_version", `${currentVersion}`);
+      window.location.reload();
+    }
+  }
 }
-export default new VoApp();
+export default new VoApp();

package/src/modules/VoAuth.ts

@@ -7,7 +7,9 @@ import VoBase from "./VoBase";
 import VoApi from "./VoApi";
 import VoRouter from "./VoRouter";
 import VoConfig from "./VoConfig";
-import { VoTokenType } from "../types";
+import { VoTokenType } from "../global";
+import VoGroups from "./VoGroups";
+import JsCookies from "js-cookie";
 
 class VoAuth extends VoBase {
   state: string;
@@ -15,6 +17,7 @@ class VoAuth extends VoBase {
   challenge: string;
   user: any = null;
   ability: AnyMongoAbility;
+  globalAbility: AnyMongoAbility;
 
   constructor(key: string) {
     super(key);
@@ -22,6 +25,7 @@ class VoAuth extends VoBase {
     this.verifier = "";
     this.challenge = "";
     this.ability = new Ability();
+    this.globalAbility = new Ability();
   }
 
   get getAppLoginUrl() {
@@ -45,25 +49,39 @@ class VoAuth extends VoBase {
       const code = urlParams.get("code");
       const state = urlParams.get("state");
       const initiatedAuth = this.getInitiatedAuth();
-      if (code && state && state === initiatedAuth.state) {
-        let params = {
-          grant_type: "authorization_code",
-          client_id: VoConfig.get.AUTH_CLIENT_ID,
-          redirect_uri: this.getAuthUrl,
-          code_verifier: initiatedAuth.verifier,
-          code,
-        };
-        const url = this.getUrl + "/token";
-        const response = await axios.post(url, params);
-        let state = VoConfig.get.AUTH_STORAGE_STATE || "";
-        Helpers.localStorage.remove(state);
-        let verifier = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
-        Helpers.localStorage.remove(verifier);
-        this.setSession(response.data);
-        await this.loadUser(true);
-        resolve(true);
-      } else {
-        reject("Authorization failed");
+      try {
+        if (code && state && state === initiatedAuth.state) {
+          let params = {
+            grant_type: "authorization_code",
+            client_id: VoConfig.get.AUTH_CLIENT_ID,
+            redirect_uri: this.getAuthUrl,
+            code_verifier: initiatedAuth.verifier,
+            code,
+          };
+          const url = this.getUrl + "/token";
+          const response = await axios.post(url, params);
+          let state = VoConfig.get.AUTH_STORAGE_STATE || "";
+          // Helpers.localStorage.remove(state);
+          JsCookies.remove(state, {
+            domain: VoConfig.get.AUTH_DOMAIN,
+            sameSite: "Lax",
+          });
+
+          let verifier = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
+          // Helpers.localStorage.remove(verifier);
+          JsCookies.remove(verifier, {
+            domain: VoConfig.get.AUTH_DOMAIN,
+            sameSite: "Lax",
+          });
+
+          this.setSession(response.data);
+          await this.loadUser(true);
+          resolve(true);
+        } else {
+          reject("Authorization failed");
+        }
+      } catch (error) {
+        reject(error);
       }
     });
   }
@@ -82,26 +100,72 @@ class VoAuth extends VoBase {
 
   setSession(token: any) {
     const { token_type, access_token, refresh_token, expires_in } = token;
+
     let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-    Helpers.localStorage.set(refreshTokenKey, refresh_token);
+    // Helpers.localStorage.set(refreshTokenKey, refresh_token);
+    JsCookies.set(refreshTokenKey, refresh_token, {
+      expires: 20,
+      sameSite: "Lax",
+      domain: VoConfig.get.AUTH_DOMAIN,
+    });
+
     let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-    Helpers.localStorage.set(accessTokenKey, access_token);
+    // Helpers.localStorage.set(accessTokenKey, access_token);
+    JsCookies.set(accessTokenKey, access_token, {
+      expires: 20,
+      sameSite: "Lax",
+      domain: VoConfig.get.AUTH_DOMAIN,
+    });
+
     let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
-    Helpers.localStorage.set(tokenTypeKey, token_type);
+    // Helpers.localStorage.set(tokenTypeKey, token_type);
+    JsCookies.set(tokenTypeKey, token_type, {
+      expires: 20,
+      sameSite: "Lax",
+      domain: VoConfig.get.AUTH_DOMAIN,
+    });
+
     let expiresInKey = VoConfig.get.AUTH_STORAGE_EXPIRES_IN || "";
-    Helpers.localStorage.set(expiresInKey, expires_in);
+    // Helpers.localStorage.set(expiresInKey, expires_in);
+    JsCookies.set(expiresInKey, expires_in, {
+      expires: 20,
+      sameSite: "Lax",
+      domain: VoConfig.get.AUTH_DOMAIN,
+    });
+
     axios.defaults.headers.common["Authorization"] =
       token_type + " " + access_token;
+    let currentGroup = VoGroups.getCurrent(true);
+    axios.defaults.headers.common["VoGroup"] = currentGroup
+      ? currentGroup.id
+      : "";
   }
   resetSession() {
     let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
     Helpers.localStorage.remove(refreshTokenKey);
+    JsCookies.remove(refreshTokenKey, { domain: VoConfig.get.AUTH_DOMAIN });
+
     let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
     Helpers.localStorage.remove(accessTokenKey);
+    JsCookies.remove(accessTokenKey, {
+      domain: VoConfig.get.AUTH_DOMAIN,
+      sameSite: "Lax",
+    });
+
     let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
     Helpers.localStorage.remove(tokenTypeKey);
+    JsCookies.remove(tokenTypeKey, {
+      domain: VoConfig.get.AUTH_DOMAIN,
+      sameSite: "Lax",
+    });
+
     let expiresInKey = VoConfig.get.AUTH_STORAGE_EXPIRES_IN || "";
     Helpers.localStorage.remove(expiresInKey);
+    JsCookies.remove(expiresInKey, {
+      domain: VoConfig.get.AUTH_DOMAIN,
+      sameSite: "Lax",
+    });
+
     delete axios.defaults.headers.common["Authorization"];
   }
   async refreshToken() {
@@ -136,12 +200,7 @@ class VoAuth extends VoBase {
       if (token) {
         try {
           this.setSession(token);
-
-          // const response = await VoApi.getUser();
-          // this.user = response.data.data;
-          // this.ability.update(this.user.permissions);
           await this.loadUser(forceLoad);
-
           resolve(this.user);
         } catch (error) {
           reject(error);
@@ -162,6 +221,9 @@ class VoAuth extends VoBase {
           const response = await VoApi.getUser();
           this.user = response.data.data;
           this.ability.update(this.user.permissions);
+          if (VoGroups.getCurrent(true)) {
+            this.globalAbility.update(this.user.globalPermissions);
+          }
         }
         resolve(this.user);
       } catch (error) {
@@ -176,13 +238,21 @@ class VoAuth extends VoBase {
   getToken(): VoTokenType | void {
     try {
       let refreshTokenKey = VoConfig.get.AUTH_STORAGE_REFRESH_TOKEN || "";
-      const refreshToken = Helpers.localStorage.get(refreshTokenKey);
+      // const refreshToken = Helpers.localStorage.get(refreshTokenKey);
+      const refreshToken = JsCookies.get(refreshTokenKey);
+
       let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
-      const accessToken = Helpers.localStorage.get(accessTokenKey);
+      // const accessToken = Helpers.localStorage.get(accessTokenKey);
+      const accessToken = JsCookies.get(accessTokenKey);
+
       let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
-      const tokenType = Helpers.localStorage.get(tokenTypeKey);
+      // const tokenType = Helpers.localStorage.get(tokenTypeKey);
+      const tokenType = JsCookies.get(tokenTypeKey);
+
       let expiresInKey = VoConfig.get.AUTH_STORAGE_EXPIRES_IN || "";
-      const expiresIn = Helpers.localStorage.get(expiresInKey);
+      // const expiresIn = Helpers.localStorage.get(expiresInKey);
+      const expiresIn = JsCookies.get(expiresInKey);
+
       if (refreshToken && accessToken && tokenType && expiresIn) {
         return {
           refresh_token: refreshToken,
@@ -205,14 +275,37 @@ class VoAuth extends VoBase {
       let state = Helpers.createRandomString(40);
       let verifier = Helpers.createRandomString(128);
       let challenge = Helpers.base64Url(crypto.SHA256(verifier));
+
       let stateKey = VoConfig.get.AUTH_STORAGE_STATE || "";
-      Helpers.localStorage.set(stateKey, state);
+      Helpers.localStorage.remove(stateKey);
+      JsCookies.set(stateKey, state, {
+        expires: 1,
+        sameSite: "Lax",
+        domain: VoConfig.get.AUTH_DOMAIN,
+      });
+
       let verifierKey = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
-      Helpers.localStorage.set(verifierKey, verifier);
+      Helpers.localStorage.remove(verifierKey);
+      JsCookies.set(verifierKey, verifier, {
+        expires: 1,
+        sameSite: "Lax",
+        domain: VoConfig.get.AUTH_DOMAIN,
+      });
+
       let accessTokenKey = VoConfig.get.AUTH_STORAGE_ACCESS_TOKEN || "";
       Helpers.localStorage.remove(accessTokenKey);
+      JsCookies.remove(accessTokenKey, {
+        domain: VoConfig.get.AUTH_DOMAIN,
+        sameSite: "Lax",
+      });
+
       let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
       Helpers.localStorage.remove(tokenTypeKey);
+      JsCookies.remove(tokenTypeKey, {
+        domain: VoConfig.get.AUTH_DOMAIN,
+        sameSite: "Lax",
+      });
+
       return {
         state,
         challenge,
@@ -223,9 +316,13 @@ class VoAuth extends VoBase {
   }
   getInitiatedAuth(): { state: string; verifier: string } {
     let stateKey = VoConfig.get.AUTH_STORAGE_STATE || "";
-    const state = Helpers.localStorage.get(stateKey);
+    // const state = Helpers.localStorage.get(stateKey);
+    const state = JsCookies.get(stateKey);
+
     let verifierKey = VoConfig.get.AUTH_STORAGE_VERIFIER || "";
-    const verifier = Helpers.localStorage.get(verifierKey);
+    // const verifier = Helpers.localStorage.get(verifierKey);
+    const verifier = JsCookies.get(verifierKey);
+
     return {
       state: state || "",
       verifier: verifier || "",