@vocollege/app 0.0.58 → 0.0.59

package/src/modules/VoConfig.ts

@@ -15,9 +15,13 @@ 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: "",
@@ -28,6 +32,10 @@ class VoConfig {
     DOCS_BASE_URL: "",
     DOCS_ENDPOINT: "",
     DOCS_GRAPHQL: "",
+    DOCS_PUBLIC_DISKS: "",
+    DOCS_PRIVATE_DISKS: "",
+    AWS_BUCKET_VOFRONT_FILES: "",
+    AWS_BUCKET_VODOCS_FILES: "",
 
     BASE_URL: "",
     AUTH: "",
@@ -41,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

@@ -6,6 +6,7 @@ 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;
@@ -23,6 +24,10 @@ class VoDocs extends VoBase {
 
   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) {

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();

package/src/modules/VoHelpers.ts

@@ -1,4 +1,8 @@
 import crypto from "crypto-js";
+import he from "he";
+
+// Custom.
+import { GeneralObject } from "../global";
 
 export const base64Url = (string: crypto.lib.WordArray | String) => {
   return string
@@ -14,6 +18,7 @@ export const createRandomString = (num: number) => {
 
 export const localStorage = {
   set: (key: string, value: string) => {
+    if (typeof window === "undefined") return false;
     try {
       window.localStorage.setItem(key, value);
       return true;
@@ -23,6 +28,7 @@ export const localStorage = {
     }
   },
   get: (key: string) => {
+    if (typeof window === "undefined") return false;
     try {
       const item = window.localStorage.getItem(key);
       return item;
@@ -58,14 +64,15 @@ export const regexPatterns = {
   email: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
   stringNonDigit: /^[^0-9]+$/,
   password: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,}$/, // At least 8 characters, 1 uppercase, 1 lowercase and 1 digit.
-  cleanName: /(^[A-Za-z]{1,})(\w?)+$/,
+  cleanName: /(^[A-Za-z]{1,})(\w|-?)+$/,
   personalNumber: /^(\d{8})[-]\d{4}$/,
+  orgnr: /^(\d{6})[-]\d{4}$/,
 };
 
 type errorObjectType = {
   message: string;
   fields?: {
-    [key: string]: string;
+    [key: string]: any;
   };
 };
 
@@ -177,46 +184,251 @@ export const downloadFile = (url: string) => {
   }
 };
 
-// const makeSortString = (function () {
-//   var translate_re = /[öäåüÖÄÅÜ]/g;
-//   var translate: { [key: string]: any } = {
-//     å: "a",
-//     ä: "a",
-//     ö: "o",
-//     ü: "u",
-//     Å: "A",
-//     Ä: "A",
-//     Ö: "O",
-//     Ü: "U", // probably more to come
-//   };
-//   return function (s: any) {
-//     return s.replace(translate_re, function (match: any) {
-//       return translate[match];
-//     });
-//   };
-// })();
-
-// const formatError = (error: string | [any]) => {
-//   if (typeof error === "string") {
-//     return error;
-//   }
-//   if (error.length === 1) {
-//     return typeof error[0] === "object" ? error[0].message : error[0];
+export const orderByPosition = (a: any, b: any) => {
+  if (a.position < b.position) {
+    return -1;
+  }
+  if (a.position > b.position) {
+    return 1;
+  }
+  return 0;
+};
+
+export const orderByField = (a: any, b: any, field: string) => {
+  if (a[field] < b[field]) {
+    return -1;
+  }
+  if (a[field] > b[field]) {
+    return 1;
+  }
+  return 0;
+};
+
+export const shortenText = (
+  str: string,
+  limit = 30,
+  stripHtml = true,
+  addEllipsis = false
+) => {
+  let output = "";
+  if (stripHtml) {
+    output = str.replace(/(<([^>]+)>)/gi, "");
+    output = he.decode(output);
+  }
+  if (addEllipsis) {
+    output += "...";
+  }
+  return output.substring(0, limit).trim();
+};
+
+export const getImageContact = (item: any, width = 400, height = 400) => {
+  let entity = item.entity || item;
+  return entity.images && entity.images[0] && entity.images[0]?.url
+    ? `${entity.images[0]?.url}?d=${width}x${height}`
+    : "/images/avatar-user.png";
+};
+
+export const getImage = (
+  item: any,
+  width: number,
+  height: number,
+  field = "images"
+) => {
+  let entity =
+    (item.images && item.images.length > 0) || !item.entity
+      ? item
+      : item.entity;
+  return entity[field] && entity[field][0]
+    ? `${entity[field][0]?.url}?d=${width}x${height}`
+    : "/images/avatar-content.png";
+};
+
+export const getImageDescription = (item: any, field = "images") => {
+  let entity =
+    (item.images && item.images.length > 0) || !item.entity
+      ? item
+      : item.entity;
+  return entity[field] && entity[field][0]?.description;
+};
+
+export const getContactName = (item?: GeneralObject) => {
+  if (!item) {
+    return "";
+  }
+  let name = [];
+  if (item.firstname) {
+    name.push(item.firstname);
+  }
+  if (item.lastname) {
+    name.push(item.lastname);
+  }
+  if (name.length === 0) {
+    name.push(item.name);
+  }
+  return name.join(" ");
+};
+
+export const getUserString = (item?: GeneralObject) => {
+  if (!item) {
+    return "";
+  }
+  return `${getContactName(item)} | ${item.email}`;
+};
+
+export const parseState = (state: any, initialState: any) => {
+  let newState: GeneralObject = {};
+  for (const field in initialState) {
+    newState[field] = state[field];
+  }
+  return newState;
+};
+
+// This method is copied from
+// https://stackoverflow.com/questions/6393943/convert-javascript-string-in-dot-notation-into-an-object-reference
+//
+// @TODO Maybe this entire logic can be replaced by Array.reduce(),
+// something like this:
+// let data = is.split(".").reduce((o: any, i) => o && o[i], pbj);
+// data = value;
+//
+export const changeObj = (obj: any, is: any, value: any): {} => {
+  if (typeof is == "string") return changeObj(obj, is.split("."), value);
+  else if (is.length == 1 && value !== undefined) return (obj[is[0]] = value);
+  else if (is.length == 0) return obj;
+  else return changeObj(obj[is[0]], is.slice(1), value);
+};
+
+export const reducer = (state: any, action: any) => {
+  const { key, values } = action;
+  if (!key) {
+    return { ...state, ...values };
+  }
+  if (key === "loading") {
+    let i = state.loading.indexOf(values);
+    let newValues = [...state.loading];
+    if (i > -1) {
+      newValues.splice(i, 1);
+    } else {
+      newValues.push(values);
+    }
+    return { ...state, loading: newValues };
+  }
+  if (key.indexOf(".") > -1) {
+    changeObj(state, key, values);
+    return { ...state };
+  }
+  return { ...state, [key]: values };
+};
+
+export const getGroupLogotype = (
+  group: GeneralObject,
+  logo = "logo2",
+  output: GeneralObject[] = []
+) => {
+  if (group && Array.isArray(group[logo]) && group[logo].length > 0) {
+    output.push.apply(output, group[logo]);
+  } else if (group && group.parentGroups) {
+    return group.parentGroups.forEach((v: any) => {
+      return getGroupLogotype(v, logo, output);
+    });
+  }
+  return null;
+};
+
+// export const makeId = (length = 10) => {
+//   let result = "";
+//   let characters =
+//     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+//   let charactersLength = characters.length;
+//   for (var i = 0; i < length; i++) {
+//     result += characters.charAt(Math.floor(Math.random() * charactersLength));
 //   }
-//   return (
-//     <ul>
-//       {error.map((v) => (
-//         <li>{typeof error[0] === "object" ? error[0].message : error[0]}</li>
-//       ))}
-//     </ul>
-//   );
+//   return result;
 // };
 
-// export {
-//   base64Url,
-//   createRandomString,
-//   localStorage,
-//   encodeQueryData,
-//   regexPatterns,
-//   getError
-// };
+export const getObjValue = (obj: any, ...props: string[]): any => {
+  return (
+    obj &&
+    props.reduce(
+      (result, prop) => (result == null ? undefined : result[prop]),
+      obj
+    )
+  );
+};
+
+/**
+ * Convert an SVG into an image.
+ * @param url
+ * @param width
+ * @param height
+ * @param format
+ * @param quality
+ * @returns Promise
+ *
+ * @note Convert logic inpired by
+ * https://levelup.gitconnected.com/draw-an-svg-to-canvas-and-download-it-as-image-in-javascript-f7f7713cf81f
+ * https://medium.com/@benjamin.black/using-blob-from-svg-text-as-image-source-2a8947af7a8e
+ *
+ * In this method we could actually assign "url" directly to "image.src" and then
+ * extract an image with canvas, but Firefox doesn't support drawing an SVG into
+ * canvas if it misses width/height attributes. Read more here:
+ * https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=700533
+ */
+export const convertSvgToImage = (
+  url: string,
+  width: null | number = null,
+  height: null | number = null,
+  format = "image/png",
+  quality = 0.92
+) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      let response = await fetch(url);
+      let svg = await response.text();
+
+      let parser = new DOMParser();
+      let doc = parser.parseFromString(svg, "image/svg+xml");
+
+      let viewBox = doc.documentElement.getAttribute("viewBox")?.split(" ");
+
+      let canvas = document.createElement("canvas");
+      if (!width) {
+        canvas.width = viewBox && viewBox[2] ? parseInt(viewBox[2]) : 100;
+      } else {
+        canvas.width = width;
+      }
+      if (!height && !width) {
+        canvas.height = viewBox && viewBox[3] ? parseInt(viewBox[3]) : 100;
+      } else if (!height) {
+        canvas.height =
+          viewBox && viewBox[3]
+            ? (parseInt(viewBox[3]) / parseInt(viewBox[2])) * canvas.width
+            : 100;
+      } else {
+        canvas.height = height;
+      }
+
+      // These steps, to ensure that the SVG has width/height attributes
+      // are only required because of Firefox.
+      // Otherwise we could assign "url" directly to "image.src".
+      let inlineSVG = doc.getElementsByTagName("svg")[0];
+      inlineSVG.setAttribute("width", `${canvas.width}px`);
+      inlineSVG.setAttribute("height", `${canvas.height}px`);
+      let svg64 = btoa(new XMLSerializer().serializeToString(inlineSVG));
+      let image64 = "data:image/svg+xml;base64," + svg64;
+
+      let context = canvas.getContext("2d");
+      let image = new Image();
+
+      image.onload = () => {
+        context?.drawImage(image, 0, 0);
+        let result = canvas.toDataURL(format, quality);
+        resolve(result);
+      };
+      image.src = image64;
+    } catch (error) {
+      reject(error);
+    }
+  });
+};

package/src/modules/VoRouter.ts

@@ -1,5 +1,7 @@
+import Cookies from "js-cookie";
+
+// Custom.
 import VoConfig from "./VoConfig";
-import VoAuth from "./VoAuth";
 
 type RoutesType = {
   [key: string]: any;
@@ -24,6 +26,7 @@ class VoRouter {
     return params[arg];
   }
   isCurrentRouterProtected() {
+    if (typeof window === "undefined") return false;
     const currentPath = this.getPath(window.location.pathname, 0);
     // const routes = VoConfig.getConfigByKey('routes');
     const routes = this.getRoutes();
@@ -47,9 +50,13 @@ class VoRouter {
     const webUrl = [];
     if (VoConfig.get.AUTH_BASE_URL) {
       webUrl.push(VoConfig.get.AUTH_BASE_URL + "/logout");
-      if (VoConfig.get.BASE_URL) {
-        webUrl.push(`?redirect=${VoConfig.get.BASE_URL}`);
+      let redirectTo = Cookies.get("voapp_redirectTo") || VoConfig.get.BASE_URL;
+      if (redirectTo) {
+        webUrl.push(`?redirect=${redirectTo}`);
       }
+      // if (VoConfig.get.BASE_URL) {
+      //   webUrl.push(`?redirect=${VoConfig.get.BASE_URL}`);
+      // }
     }
     if (webUrl.length > 0) {
       window.location.href = webUrl.join("");

package/src/types.ts

@@ -1,38 +0,0 @@
-export type AuthStorageConfigType = {
-    STATE: string,
-    VERIFIER: string,
-    REFRESH_TOKEN: string,
-    ACCESS_TOKEN: string,
-    TOKEN_TYPE: string
-    EXPIRES_IN: string
-}
-export type AuthConfigType = {
-    BASE_URL: string,
-    CLIENT_ID?: string,
-    LOGIN?: string,
-    ENDPOINT?: string,
-    STORAGE?: AuthStorageConfigType
-}
-export type ApiConfigType = {
-    BASE_URL: string,
-    ENDPOINT?: string,
-    GRAPHQL?: string
-}
-export type AppConfigType = {
-    BASE_URL: string,
-    AUTH?: string,
-    HOME?: string,
-    LOGIN?: string
-}
-export type VoAppType = {
-    configure: Function,
-    config?: Function,
-    auth: any,
-    api: any
-}
-export type VoTokenType = {
-    token_type: string,
-    access_token: string,
-    refresh_token: string,
-    expires_in: string
-}