@vocollege/app 0.0.56 → 0.0.59

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() {
@@ -121,6 +185,8 @@ class VoAuth extends VoBase {
           this.setSession(response.data);
         }
         return this.getToken();
+      } else {
+        throw new Error("Refresh token not found");
       }
     } catch (error) {
       this.resetSession();
@@ -134,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);
@@ -160,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) {
@@ -174,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,
@@ -203,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,
@@ -221,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 || "",

package/src/modules/VoConfig.ts

@@ -15,17 +15,27 @@ class VoConfig {
   // }
 
   config: VoConfigType = {
+    APP_VERSION: "",
+
     API_BASE_URL: "",
     API_ENDPOINT: "",
     API_GRAPHQL: "",
+    API_SUBSCRIPTIONS_BASE_URL: "",
+    API_GRAPHQL_SUBSCRIPTIONS: "",
 
     AUTH_CLIENT_ID: "",
     AUTH_BASE_URL: "",
     AUTH_ENDPOINT: "",
 
+    ADMIN_BASE_URL: "",
+
     DOCS_BASE_URL: "",
     DOCS_ENDPOINT: "",
     DOCS_GRAPHQL: "",
+    DOCS_PUBLIC_DISKS: "",
+    DOCS_PRIVATE_DISKS: "",
+    AWS_BUCKET_VOFRONT_FILES: "",
+    AWS_BUCKET_VODOCS_FILES: "",
 
     BASE_URL: "",
     AUTH: "",
@@ -39,6 +49,9 @@ class VoConfig {
     AUTH_STORAGE_ACCESS_TOKEN: "voapp_accesstoken",
     AUTH_STORAGE_TOKEN_TYPE: "voapp_tokentype",
     AUTH_STORAGE_EXPIRES_IN: "voapp_expiresin",
+    AUTH_DOMAIN: ".vo-college.se",
+
+    CURRENT_GROUP: "vo_group",
   };
 
   setConfig(config: VoConfigType) {

package/src/modules/VoDocs/VoDocs.ts

@@ -1,66 +1,39 @@
 // Vendors.
-import axios from 'axios';
+import axios from "axios";
 
 // Custom.
-import GraphClient from '../VoApi/GraphClient';
-import VoBase from '../VoBase';
-import VoAuth from '../VoAuth';
-import VoConfig from '../VoConfig';
+import GraphClient from "../VoApi/GraphClient";
+import VoBase from "../VoBase";
+// import VoAuth from '../VoAuth';
+import VoConfig from "../VoConfig";
+import VoGroups from "../VoGroups";
 
 class VoDocs extends VoBase {
-
-    graphqlClient: any
-
-    init() {
-        this.graphqlClient = GraphClient.createGraphClient(this.getGraphqlUrl, true);
-    }
-
-    get getGraphqlUrl() {
-        return VoConfig.get.DOCS_BASE_URL + '' + VoConfig.get.DOCS_GRAPHQL;
-    }
-
-    async getTemporaryFileUrl(id: string) {
-        try {
-            const url = `${this.getUrl}/docs/download/${id}`;
-            return axios.get(url);
-        } catch(error) {
-            throw error;
-        }
+  graphqlClient: any;
+
+  init() {
+    this.graphqlClient = GraphClient.createGraphClient(
+      this.getGraphqlUrl,
+      true
+    );
+  }
+
+  get getGraphqlUrl() {
+    return VoConfig.get.DOCS_BASE_URL + "" + VoConfig.get.DOCS_GRAPHQL;
+  }
+
+  async getTemporaryFileUrl(id: string) {
+    try {
+      let currentGroup = VoGroups.getCurrent(true);
+      axios.defaults.headers.common["VoGroup"] = currentGroup
+        ? currentGroup.id
+        : "";
+      const url = `${this.getUrl}/docs/download/${id}`;
+      return axios.get(url);
+    } catch (error) {
+      throw error;
     }
-
-    async downloadFile(id: string) {
-        try {
-
-            let elId = `file-${id}`;
-
-            // Ensure that an old element is not left in the DOM.
-            let el = document.getElementById(elId);
-            if (el !== null && el.parentNode) {
-                el.parentNode.removeChild(el);
-            }
-
-            // Retrieve the temporary download URL.
-            let fileUrl = await this.getTemporaryFileUrl(id);
-            if (fileUrl.data) {
-                let anchor = document.createElement('a');
-                anchor.id = elId;
-                anchor.href = fileUrl.data;
-                anchor.download = fileUrl.data;
-                document.body.appendChild(anchor);
-                anchor.click();
-                setTimeout(() => {
-                    if (anchor.parentNode) {
-                        anchor.parentNode.removeChild(anchor);
-                    }
-                }, 500);
-            } else {
-                throw "No file was found";
-            }
-        } catch (error) {
-            throw error;
-        }
-    }
-
+  }
 }
 
-export default new VoDocs('docs');
+export default new VoDocs("docs");

package/src/modules/VoGroups.ts

@@ -0,0 +1,33 @@
+import { localStorage } from "./VoHelpers";
+import VoConfig from "./VoConfig";
+import { GeneralObject } from "../global";
+
+class VoGroups {
+  getCurrent(getFromDomain = false): null | GeneralObject {
+    const group: any = localStorage.get(VoConfig.get.CURRENT_GROUP);
+    if (group) {
+      return JSON.parse(group);
+    }
+    if (getFromDomain) {
+      let groupName = this.getGroupNameFromDomain(window.location.host);
+      if (groupName && groupName !== "") {
+        return { id: groupName };
+      }
+    }
+    return null;
+  }
+  getGroupNameFromDomain(host: string) {
+    let subdomain = host?.split(".")[0];
+    let localIndex = subdomain?.indexOf("local");
+    if (localIndex !== undefined && localIndex > -1) {
+      let hyphenIndex = subdomain?.indexOf("-") || 0;
+      subdomain = subdomain?.substring(hyphenIndex + 1);
+    }
+    if (subdomain === "admin") {
+      return null;
+    }
+    return subdomain;
+  }
+}
+
+export default new VoGroups();