@mindline/sync 1.0.14 → 1.0.16

package/index.js

@@ -8,7 +8,7 @@ export function helloNpm() {
   return "hello NPM";
 }
 
-const FILTER_FIELD = "WorkspaceIDs";
+const FILTER_FIELD = "workspaceIDs";
 
 export class User {
   constructor(){
@@ -20,6 +20,8 @@ export class User {
     this.companyName = "";
     this.companyDomain = "";
     this.associatedWorkspaces = {};
+    this.workspaceIDs = "";
+    this.session = "";
   }
 }
 
@@ -32,6 +34,7 @@ export class Target {
     this.authority = "";
     this.readServicePrincipal = "";
     this.writeServicePrincipal = "";
+    this.workspaceIDs = "";
   }
 }
 
@@ -42,6 +45,7 @@ export class Config {
     this.description = "";
     this.targetConfigs = {};
     this.enabled = false;
+    this.workspaceIDs = "";
   }
 }
 
@@ -55,14 +59,14 @@ export class Workspace {
   }
 }
 
-export class PortalConfigInfo {
+export class InitInfo {
   constructor() {
     this.us = {};
     this.ts = {};
     this.cs = {};
     this.ws = {};
   }
-  tagWithWorkspaces() {
+  initWorkspaceIDs() {
     // for each Workspace tag associated User, Target, Config with Workspace.id
     for (let workspace of this.ws) {
       // find matching Users to tag with this workspace
@@ -70,21 +74,10 @@ export class PortalConfigInfo {
         let user = this.us.find((currentUser) => currentUser.oid === userID);
         if (user !== undefined) {
           // we found the user
-          if (user[FILTER_FIELD] === undefined) {
-            // the user does not have the filter field yet
-            try {
-              user[FILTER_FIELD] = workspace.id;
-            } catch (e) {
-              debugger;
-              return false;
-            }
-          } else {
-            // the user does have the filter field
-            user[FILTER_FIELD] += ", ";
-            user[FILTER_FIELD] += workspace.id;
-          }
+          user[FILTER_FIELD] += workspace.id;
+          user[FILTER_FIELD] += " ";
         } else {
-          // we should not have PCI that does not have Workspace component objects
+          // we should not have InitInfo missing Workspace components
           debugger;
           return false;
         }
@@ -96,21 +89,10 @@ export class PortalConfigInfo {
         );
         if (target !== undefined) {
           // we found the target
-          if (target[FILTER_FIELD] === undefined) {
-            // the target does not have the filter field yet
-            try {
-              target[FILTER_FIELD] = workspace.id;
-            } catch (e) {
-              debugger;
-              return false;
-            }
-          } else {
-            // the target does have the filter field
-            target[FILTER_FIELD] += ", ";
-            target[FILTER_FIELD] += workspace.id;
-          }
+          target[FILTER_FIELD] += workspace.id;
+          target[FILTER_FIELD] += " ";
         } else {
-          // we should not have PCI that does not have Workspace component objects
+          // we should not have InitInfo missing Workspace components
           debugger;
           return false;
         }
@@ -122,21 +104,10 @@ export class PortalConfigInfo {
         );
         if (config !== undefined) {
           // we found the config
-          if (config[FILTER_FIELD] === undefined) {
-            // the config does not have the filter field yet
-            try {
-              config[FILTER_FIELD] = workspace.id;
-            } catch (e) {
-              debugger;
-              return false;
-            }
-          } else {
-            // the config does have the filter field
-            config[FILTER_FIELD] += ", ";
-            config[FILTER_FIELD] += workspace.id;
-          }
+          config[FILTER_FIELD] += workspace.id;
+          config[FILTER_FIELD] += " ";
         } else {
-          // we should not have PCI that does not have Workspace component objects
+          // we should not have InitInfo missing Workspace components
           debugger;
           return false;
         }
@@ -153,7 +124,7 @@ import configs from "./configs.json";
 import workspaces from "./workspaces.json";
 
 // retrieve Workspace(s), User(s), Target(s), Config(s) given logged in user
-export function InitPortal(user, portalConfigInfo)
+export function InitGet(user, ii)
 {
   debugger;
   // for now, just get hardcoded data from JSON
@@ -162,11 +133,11 @@ export function InitPortal(user, portalConfigInfo)
   var configsString = JSON.stringify(configs);
   var workspacesString = JSON.stringify(workspaces);
   try {
-    portalConfigInfo.us = deserializeArray(User, usersString); 
-    portalConfigInfo.ts = deserializeArray(Target, targetsString);
-    portalConfigInfo.cs = deserializeArray(Config, configsString);
-    portalConfigInfo.ws = deserializeArray(Workspace, workspacesString);
-    portalConfigInfo.tagWithWorkspaces();
+    ii.us = deserializeArray(User, usersString); 
+    ii.ts = deserializeArray(Target, targetsString);
+    ii.cs = deserializeArray(Config, configsString);
+    ii.ws = deserializeArray(Workspace, workspacesString);
+    if(!ii.initWorkspaceIDs()) return false;
     debugger;
   } catch (e) {
     debugger;

package/index.test.js

@@ -1,4 +1,4 @@
-import {sum, User, PortalConfigInfo, InitPortal } from "./index.js";
+import {sum, User, InitInfo, InitGet } from "./index.js";
 import {test, expect} from "vitest";
 
 test("adds 1 + 2 to equal 3", () => {
@@ -6,7 +6,7 @@ test("adds 1 + 2 to equal 3", () => {
 });
 test("loads config based on a user and expects function to return true", () => {
   let u = new User();
-  let pci = new PortalConfigInfo();
-  expect(InitPortal(u, pci)).toBe(true);
-  expect(pci.us.length).toBe(2);
+  let ii = new InitInfo();
+  expect(InitGet(u, ii)).toBe(true);
+  expect(ii.us.length).toBe(6);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",
   "exports": "./index.js",
   "scripts": {

package/sync.d.ts

@@ -12,6 +12,8 @@ declare module "@mindline/sync" {
     companyName: string;    // findTenantInformationByTenantId TODO: process changes to company name
     companyDomain: string;  // findTenantInformationByTenantId TODO: process changes to company name
     associatedWorkspaces: string[];
+    workspaceIDs: string;
+    session: string;
   }
 
   // target (Azure AD tenant, AD domain, Google workspace)
@@ -24,6 +26,7 @@ declare module "@mindline/sync" {
     authority: string;  // from AAD ID auth response
     readServicePrincipal: string; // from AAD consent
     writeServicePrincipal: string; // from AAD consent
+    workspaceIDs: string;
   }
 
   // config
@@ -38,6 +41,7 @@ declare module "@mindline/sync" {
     description: string;
     targetConfigs: TargetConfigInfo[];
     enabled: boolean;
+    workspaceIDs: string;
   }
 
   // class to group Users, Tenants, and Configs
@@ -49,7 +53,7 @@ declare module "@mindline/sync" {
     associatedConfigs: string[];
   }
 
-  export class PortalConfigInfo {
+  export class InitInfo {
     us: User[];
     ts: Target[];
     cs: Config[];
@@ -57,7 +61,7 @@ declare module "@mindline/sync" {
     tagWithWorkspaces(): boolean;
   }
 
-  export function InitPortal(u: User, pci: PortalConfigInfo): boolean;
+  export function InitGet(u: User, ii: InitInfo): boolean;
   export function AddTarget(): boolean;
   export function CompleteTarget(): boolean;
   export function AddUser(): boolean;

package/users.json

@@ -7,7 +7,8 @@
     "tid": "7f4567b8-f9a9-4ad3-9cb5-ef16a80e5744",
     "companyName": "Mindline1",
     "companyDomain": "mindline1.onmicrosoft.com",
-    "associatedWorkspaces": [ "1", "2", "3" ]
+    "associatedWorkspaces": [ "1", "2", "3" ],
+    "session": "Sign In"
   },
   {
     "oid": "e5a42d0c-4fa5-4a65-8d9b-90f989ecae9b",
@@ -17,7 +18,8 @@
     "tid": "df9c2e0a-f6fe-43bb-a155-d51f66dffe0e",
     "companyName": "Mindline2",
     "companyDomain": "mindline2.onmicrosoft.com",
-    "associatedWorkspaces": [ "1" ]
+    "associatedWorkspaces": [ "1" ],
+    "session": "Sign In"
   },
   {
     "oid": "1",
@@ -27,7 +29,8 @@
     "tid": "1",
     "companyName": "WhoIAm",
     "companyDomain": "whoiam.onmicrosoft.com",
-    "associatedWorkspaces": [ "2" ]
+    "associatedWorkspaces": [ "2" ],
+    "session": "Sign In"
   },
   {
     "oid": "2",
@@ -37,7 +40,8 @@
     "tid": "2",
     "companyName": "Grit Sofware",
     "companyDomain": "gritsoftware.onmicrosoft.com",
-    "associatedWorkspaces": [ "2" ]
+    "associatedWorkspaces": [ "2" ],
+    "session": "Sign In"
   },
   {
     "oid": "3",
@@ -47,7 +51,8 @@
     "tid": "3",
     "companyName": "Google",
     "companyDomain": "google.onmicrosoft.com",
-    "associatedWorkspaces": [ "3" ]
+    "associatedWorkspaces": [ "3" ],
+    "session": "Sign In"
   },
   {
     "oid": "4",
@@ -57,6 +62,7 @@
     "tid": "4",
     "companyName": "Trackman Golf",
     "companyDomain": "trackman.onmicrosoft.com",
-    "associatedWorkspaces": [ "3" ]
+    "associatedWorkspaces": [ "3" ],
+    "session": "Sign In"
   }
 ]

package/syncConfigs.json

@@ -1,26 +0,0 @@
-[
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e9",
-    "name": "ProdSync",
-    "tenantCount": "2",
-    "description": "Production Mindline Sync Configuration."
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e9",
-    "name": "TestSync",
-    "tenantCount": "2",
-    "description": "Test Mindline Sync Configuration."
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e8",
-    "name": "ProdSync",
-    "tenantCount": "2",
-    "description": "Automated sync of users from Subsidiary Y to Customer X."
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e8",
-    "name": "TestSync",
-    "tenantCount": "2",
-    "description": "Test automated sync of users from Subsidiary Y to Customer X."
-  }
-]

package/syncTenants.json

@@ -1,34 +0,0 @@
-[
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e9",
-    "name": "Mindline1",
-    "direction": "Outbound",
-    "readServicePrincipal": "1234",
-    "writeServicePrincipal": "N/A",
-    "session": "Off"
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e9",
-    "name": "Mindline2",
-    "direction": "Inbound",
-    "readServicePrincipal": "9101",
-    "writeServicePrincipal": "1121",
-    "session": "Off"
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e8",
-    "name": "Customer X",
-    "direction": "Inbound",
-    "readServicePrincipal": "1234",
-    "writeServicePrincipal": "5678",
-    "session": "Off"
-  },
-  {
-    "virtualTenantID": "85132631-cac3-4708-86b9-b4019f2132e8",
-    "name": "Subisidiary Y",
-    "direction": "Outbound",
-    "readServicePrincipal": "9101",
-    "writeServicePrincipal": "N/A",
-    "session": "Off"
-  }
-]

package/virtualTenants.json

@@ -1,16 +0,0 @@
-[
-  {
-    "tenantID": "85132631-cac3-4708-86b9-b4019f2132e9",
-    "name": "Mindline",
-    "domain": "bellevuearvindhotmail.onmicrosoft.com",
-    "description": "Mindline virtual tenant.",
-    "session": "Off"
-  },
-  {
-    "tenantID": "85132631-cac3-4708-86b9-b4019f2132e8",
-    "name": "virttenant",
-    "domain": "virttenant.onmicrosoft.com",
-    "description": "Prod virtual tenant for CustomerX.",
-    "session": "Off"
-  }
-]