@mindline/sync 1.0.43 → 1.0.45

package/configs.json

@@ -5,6 +5,7 @@
     "name": "",
     "description": "",
     "tenants": [],
-    "isEnabled": true
+    "isEnabled": true,
+    "sel": true
   }
 ]

package/index.d.ts

@@ -1,5 +1,4 @@
 import { IPublicClientApplication } from "@azure/msal-browser";
-
 declare module "@mindline/sync" {
     export function sum(a: number, b: number): number;
     export function helloNpm(): string;
@@ -10,6 +9,14 @@ declare module "@mindline/sync" {
         description: string;
     }
     // admin
+    export class UserScope {
+        group: string;
+        value: string;
+        consented: boolean;
+        expanded: string;
+        static compareByValue(a: UserScope, b: UserScope): number;
+        static compareByGroup(a: UserScope, b: UserScope): number;
+    }
     export class User {
         oid: string;  // from AAD ID token
         name: string; // from AAD ID token
@@ -26,6 +33,7 @@ declare module "@mindline/sync" {
         loginHint: string;
         scopes: string[];
         authTS: Date;
+        sel: boolean; // selection state
         constructor();
     }
     // tenant (Azure AD tenant, AD domain, Google workspace)
@@ -51,6 +59,7 @@ declare module "@mindline/sync" {
         onboarded: string;  // have we onboarded this tenant? "true" or "false"
         authority: string;  // from AAD ID auth response
         workspaceIDs: string;
+        sel: boolean; // selection state
         constructor();
     }
     // config
@@ -80,6 +89,7 @@ declare module "@mindline/sync" {
         tenants: TenantConfigInfo[];
         isEnabled: boolean;
         workspaceIDs: string;
+        sel: boolean; // selection state
         constructor();
     }
     // class to group Users, Tenants, and Configs
@@ -89,9 +99,11 @@ declare module "@mindline/sync" {
         associatedUsers: string[];
         associatedTenants: string[];
         associatedConfigs: string[];
+        sel: boolean; // selection state
         constructor();
     }
     export class InitInfo {
+        tab: number;
         us: User[];
         ts: Tenant[];
         cs: Config[];

package/index.ts

@@ -24,6 +24,18 @@ export class Group {
     displayName: string;
     description: string;
 }
+export class UserScope {
+    group: string;
+    value: string;
+    consented: boolean;
+    expanded: string;
+    static compareByValue(a: UserScope, b: UserScope): number {
+        return a.value.localeCompare(b.value);
+    }
+    static compareByGroup(a: UserScope, b: UserScope): number {
+        return a.group.localeCompare(b.group);
+    }
+}
 export class User {
     oid: string;
     name: string;
@@ -40,6 +52,7 @@ export class User {
     loginHint: string; // to help sign out without prompt
     scopes: string[]; // to detect if incremental consent has happened
     authTS: Date; // timestamp user was authenticated
+    sel: boolean; // selection state
     constructor() {
         this.oid = "";
         this.name = "";
@@ -56,6 +69,7 @@ export class User {
         this.loginHint = "";
         this.scopes = new Array();
         this.authTS = new Date(0);
+        this.sel = false;
     }
 }
 export enum TenantType {
@@ -80,6 +94,7 @@ export class Tenant {
     onboarded: string;
     authority: string;
     workspaceIDs: string;
+    sel: boolean; // selection state
     constructor() {
         this.tid = "";
         this.name = "";
@@ -89,6 +104,7 @@ export class Tenant {
         this.onboarded = "false";
         this.authority = "";
         this.workspaceIDs = "";
+        this.sel = false;
     }
 }
 function getGraphEndpoint(authority: string): string {
@@ -137,6 +153,7 @@ export class Config {
     tenants: TenantConfigInfo[];
     isEnabled: boolean;
     workspaceIDs: string;
+    sel: boolean; // selection state
     constructor() {
         this.id = "";
         this.name = "";
@@ -144,6 +161,7 @@ export class Config {
         this.tenants = new Array();
         this.isEnabled = false;
         this.workspaceIDs = "";
+        this.sel = false;
     }
 }
 export class Workspace {
@@ -152,12 +170,14 @@ export class Workspace {
     associatedUsers: string[];
     associatedTenants: string[];
     associatedConfigs: string[];
+    sel: boolean; // selection state
     constructor() {
         this.id = "";
         this.name = "";
         this.associatedUsers = new Array();
         this.associatedTenants = new Array();
         this.associatedConfigs = new Array();
+        this.sel = false;
     }
 }
 // check for localStorage availability
@@ -188,6 +208,7 @@ function storageAvailable(type) {
     }
 }
 export class InitInfo {
+    tab: number;
     us: User[];
     ts: Tenant[];
     cs: Config[];
@@ -205,7 +226,9 @@ export class InitInfo {
                 let initInfoString: string = result;
                 let iiReadFromLocalStorage: InitInfo = JSON.parse(initInfoString);
                 if (iiReadFromLocalStorage.us.length !== 0) {
-                    if (bClearLocalStorage) { localStorage.removeItem("InitInfo"); }
+                    if (bClearLocalStorage) {
+                        localStorage.removeItem("InitInfo");
+                    }
                     else {
                         this.#initFromObjects(iiReadFromLocalStorage);
                         return;
@@ -213,12 +236,13 @@ export class InitInfo {
                 }
             }
         }
-        // if storage unavailable or we were just asked to clear, read from default files to enable usable UI
+        // if storage unavailable or we were just asked to clear, read defaults to enable usable UI
         var usersString = JSON.stringify(users);
         var tenantsString = JSON.stringify(tenants);
         var configsString = JSON.stringify(configs);
         var workspacesString = JSON.stringify(workspaces);
         try {
+            this.tab = 0;
             this.us = deserializeArray(User, usersString);
             this.ts = deserializeArray(Tenant, tenantsString);
             this.cs = deserializeArray(Config, configsString);
@@ -286,20 +310,88 @@ export class InitInfo {
         return true;
     }
     #initFromObjects(ii: InitInfo): void {
-        // user array is the only one that has a Date that must be re-created on every read
-        if (typeof ii.us === "undefined") this.us = new Array();
-        else this.us = ii.us.map((user: User) => { user.authTS = new Date(user.authTS); return user });
-        if (typeof ii.ts === "undefined") this.ts = new Array();
-        else this.ts = ii.ts;
-        if (typeof ii.cs === "undefined") this.cs = new Array();
-        else this.cs = ii.cs;
-        if (typeof ii.ws === "undefined") this.ws = new Array();
-        else this.ws = ii.ws;
+        this.tab = ii.tab;
+        if (typeof ii.us === "undefined") {
+            this.us = new Array<User>();
+        }
+        else {
+            this.us = ii.us.map((user: User) => {
+                let newuser: User = new User();
+                newuser.oid = user.oid;
+                newuser.name = user.name;
+                newuser.mail = user.mail;
+                newuser.authority = user.authority;
+                newuser.tid = user.tid;
+                newuser.companyName = user.companyName;
+                newuser.companyDomain = user.companyDomain;
+                newuser.associatedWorkspaces = user.associatedWorkspaces;
+                newuser.workspaceIDs = user.workspaceIDs;
+                newuser.session = user.session;
+                newuser.spacode = user.spacode;
+                newuser.accessToken = user.accessToken;
+                newuser.loginHint = user.loginHint;
+                newuser.scopes = user.scopes;
+                newuser.authTS = new Date(user.authTS);
+                newuser.sel = user.sel;
+                return newuser
+            });
+        }
+        if (typeof ii.ts === "undefined") {
+            this.ts = new Array<Tenant>();
+        }
+        else {
+            this.ts = ii.ts.map((tenant: Tenant) => {
+                let newtenant: Tenant = new Tenant();
+                newtenant.tid = tenant.tid;
+                newtenant.name = tenant.name;
+                newtenant.domain = tenant.domain;
+                newtenant.tenantType = tenant.tenantType;
+                newtenant.permissionType = tenant.permissionType;
+                newtenant.onboarded = tenant.onboarded;
+                newtenant.authority = tenant.authority;
+                newtenant.workspaceIDs = tenant.workspaceIDs;
+                newtenant.sel = tenant.sel;
+                return newtenant;
+            });
+        }
+        if (typeof ii.cs === "undefined") {
+            this.cs = new Array<Config>();
+        }
+        else {
+            this.cs = ii.cs.map((config: Config) => {
+                let newconfig: Config = new Config();
+                newconfig.id = config.id;
+                newconfig.workspaceId = config.workspaceId;
+                newconfig.name = config.name;
+                newconfig.description = config.description;
+                newconfig.tenants = config.tenants;
+                newconfig.isEnabled = config.isEnabled;
+                newconfig.workspaceIDs = config.workspaceIDs;
+                newconfig.sel = config.sel;
+                return newconfig;
+            });
+        }
+        if (typeof ii.ws === "undefined") {
+            this.ws = new Array<Workspace>();
+        }
+        else {
+            this.ws = ii.ws.map((workspace: Workspace) => {
+                let newworkspace: Workspace = new Workspace();
+                newworkspace.id = workspace.id;
+                newworkspace.name = workspace.name;
+                newworkspace.associatedUsers = workspace.associatedUsers;
+                newworkspace.associatedTenants = workspace.associatedTenants;
+                newworkspace.associatedConfigs = workspace.associatedConfigs;
+                newworkspace.sel = workspace.sel;
+                return newworkspace;
+            });
+        }
     }
 }
 export type TaskType = "initialization" |
     "authenticate user" |
     "reload React" |
+    "PUT tenant" | 
     "GET tenant details" |
     "POST config init" |
     "GET workspaces" |
@@ -1093,8 +1185,7 @@ export function signInIncrementally(user: User, scope: string): void {
     tenantURL += "MicrosoftIdentity/Account/Challenge";
     let url: URL = new URL(tenantURL);
     url.searchParams.append("redirectUri", window.location.origin);
-    let scopes = scope;
-    url.searchParams.append("scope", scopes);
+    url.searchParams.append("scope", scope);
     url.searchParams.append("domainHint", "organizations");
     url.searchParams.append("loginHint", user.mail);
     window.location.assign(url.href);
@@ -1376,7 +1467,7 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
     tenant.domain = user.tid;
     let bResult: boolean = await tenantUnauthenticatedLookup(tenant, debug);
     if (bResult) {
-        // success, we now know instance of this tenant
+        // success, we now know cloud instance where this tenant is provisioned
         user.authority = tenant.authority;
         // do we have a logged in user from the same authority as this newly proposed tenant?
         let loggedInUser: User | undefined = ii.us.find((u: User) => (u.session === "Sign Out" && u.authority === user.authority));
@@ -1395,12 +1486,18 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
                 result = await workspaceInfoGet(instance, authorizedUser, user, ii, debug);
                 tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
             }
-            if (result.result) result.error = version;
-            else console.log("@mindline/sync package version: " + version);
+            // if successful, return true result and the version in the result.error field
+            if (result.result) {
+                result.error = version;
+            }
+            // if failed, output version information to the log
+            else {
+                console.log("@mindline/sync package version: " + version);
+            }
             return result;
         }
         else {
-            result.error = `${user.mail} with insufficient privileges to lookup under authority: ${user.authority}.`;
+            result.error = `${user.mail} has insufficient privileges to lookup under authority: ${user.authority}.`;
             result.result = false;
             return result;
         }
@@ -1440,7 +1537,14 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 user = ii.us.at(dummyIndex);
-                user.associatedWorkspaces.length = 0;
+                // replace dummy User oid "1" with real oid in associatedTenants of all workspaces
+                ii.ws.map((w: Workspace) => {
+                    let idx: number = w.associatedUsers.findIndex((oid: string) => oid == "1");
+                    if (idx !== -1) {
+                        w.associatedUsers.splice(idx, 1);
+                        w.associatedUsers.push(item.userId);
+                    }
+                });
             }
             else {
                 // create and track new user
@@ -1472,6 +1576,14 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 tenant = ii.ts.at(dummyIndex);
+                // replace dummy Tenant id "1" with real id in associatedTenants of all workspaces
+                ii.ws.map((w: Workspace) => {
+                    let idx: number = w.associatedTenants.findIndex((tid: string) => tid == "1");
+                    if (idx !== -1) {
+                        w.associatedTenants.splice(idx, 1);
+                        w.associatedTenants.push(item.tenantId);
+                    }
+                });
             } else {
                 // create and track new tenant
                 tenant = new Tenant();
@@ -1510,6 +1622,14 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 config = ii.cs.at(dummyIndex);
+                // replace dummy Config id "1" with real id in associatedConfigs of all workspaces
+                ii.ws.map((w: Workspace) => {
+                    let idx: number = w.associatedConfigs.findIndex((id: string) => id == "1");
+                    if (idx !== -1) {
+                        w.associatedConfigs.splice(idx, 1);
+                        w.associatedConfigs.push(item.id);
+                    }
+                });
             } else {
                 // create and track new workspace
                 config = new Config();
@@ -1570,9 +1690,11 @@ async function workspaceInfoGet(instance: IPublicClientApplication, authorizedUs
                     workspace = ii.ws.at(wsIndex);
                 }
                 // clear associations as we are about to reset
-                workspace.associatedUsers.length = 0;
-                workspace.associatedTenants.length = 0;
-                workspace.associatedConfigs.length = 0;
+                // IN PROGRESS: do not clear so we can retain selection state
+                //workspace.associatedUsers.length = 0;
+                //workspace.associatedTenants.length = 0;
+                //workspace.associatedConfigs.length = 0;
+                // set id and name based on returned data
                 workspace.id = o.id;
                 workspace.name = o.name;
                 // parallel GET admins, tenants, configs associated with this workspace

package/package.json

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

package/tenants.json

@@ -6,6 +6,7 @@
     "tenantType": "",
     "permissionType": "",
     "onboarded": false,
-    "authority": ""
+    "authority": "",
+    "sel": true
   }
 ]

package/users.json

@@ -8,6 +8,7 @@
     "companyName": "",
     "companyDomain": "",
     "associatedWorkspaces": [ "1" ],
-    "session": "Sign In"
+    "session": "Sign In",
+    "sel": true
   }
 ]

package/workspaces.json

@@ -4,6 +4,7 @@
     "name": "",
     "associatedUsers": [ "1" ],
     "associatedTenants": [ "1" ],
-    "associatedConfigs": [ "1" ]
+    "associatedConfigs": [ "1" ],
+    "sel":  true
   }
 ]