@mindline/sync 1.0.38 → 1.0.40

package/.vs/VSWorkspaceState.json

@@ -2,6 +2,5 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\index.d.ts",
   "PreviewInSolutionExplorer": false
 }

package/hybridspa.ts

@@ -51,7 +51,8 @@ export const graphConfig = {
     authorityCNRegex: /^(https:\/\/login\.partner\.microsoftonline\.cn\/)([\dA-Fa-f]{8}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{12})\/oauth2\/authorize$/,
 };
 // helper functions
-async function defineHeaders(
+// TODO: this is where you want to trigger a re-authentication if token expires
+export async function defineHeaders(
     instance: IPublicClientApplication,
     user: User
 ): Promise<Headers> {
@@ -758,16 +759,8 @@ export async function tenantPut(
     let tenantEndpoint: string = graphConfig.tenantEndpoint;
     // create tenant headers
     const headers = await defineHeaders(instance, authorizedUser);
-    // be sure we send null and not "null" in body
-    let readAccessToken: string = tenant.readServicePrincipal
-        ? `"${tenant.readServicePrincipal}"`
-        : "null";
-    let writeAccessToken: string = tenant.writeServicePrincipal
-        ? `"${tenant.writeServicePrincipal}"`
-        : "null";
     // create tenant body
-    let tenantBody: string = `
-  {"tenantId": "${tenant.tid}", "readServicePrincipal": ${readAccessToken}, "writeServicePrincipal": ${writeAccessToken}}`;
+    let tenantBody: string = `{"tenantId": "${tenant.tid}"}`;
     let options = { method: "PUT", headers: headers, body: tenantBody };
     // make tenant endpoint call
     try {

package/index.d.ts

@@ -50,8 +50,6 @@ declare module "@mindline/sync" {
         permissionType: TenantPermissionTypeStrings; // read/write/notassigned
         onboarded: string;  // have we onboarded this tenant? "true" or "false"
         authority: string;  // from AAD ID auth response
-        readServicePrincipal: string; // from AAD consent
-        writeServicePrincipal: string; // from AAD consent
         workspaceIDs: string;
         constructor();
     }
@@ -160,12 +158,12 @@ declare module "@mindline/sync" {
         constructor(bClearLocalStorage: boolean);
         init(bClearLocalStorage: boolean): void;
         save(): void;
-        start(setMilestones): void;
-        unstart(setMilestones): void;
-        post(setMilestones): void;
-        read(setMilestones): void;
-        write(setMilestones): void;
-        #initFromObjects(milestones: Milestones): void;
+        start(setMilestones: (milestones: Milestone[]) => void): void;
+        unstart(setMilestones: (milestones: Milestone[]) => void): void;
+        post(setMilestones: (milestones: Milestone[]) => void): void;
+        read(setMilestones: (milestones: Milestone[]) => void): void;
+        write(setMilestones: (milestones: Milestone[]) => void): void;
+        #initFromObjects(milestones: Object[]): void;
     }
     export class BatchArray {
         tenantNodes: TenantNode[];
@@ -174,24 +172,24 @@ declare module "@mindline/sync" {
         pb_increment: number;
         pb_idle: number;
         pb_idleMax: number;
-        pb_timer;
+        pb_timer: NodeJS.Timer;
         milestoneArray: MilestoneArray;
         constructor(config: Config|null, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean);
         // populate tenantNodes based on config tenants
         init(config: Config|null|undefined, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean): void;
-        initializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void;
-        uninitializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void;
+        initializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void;
+        uninitializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void;
         initializeSignalR(
             config: Config | null | undefined,
             syncPortalGlobalState: InitInfo | null,
             batchIdArray: Array<Object>,
-            setRefreshDeltaTrigger,
-            setReadersTotal,
-            setReadersCurrent,
-            setWritersTotal,
-            setWritersCurrent,
-            setMilestones,
-            setConfigSyncResult,
+            setRefreshDeltaTrigger: (trigger: boolean) => void,
+            setReadersTotal: (readersTotal: number) => void,
+            setReadersCurrent: (readersCurrent: number) => void,
+            setWritersTotal: (writersTotal: number) => void,
+            setWritersCurrent: (writersCurrent: number) => void,
+            setMilestones: (milestones: Milestone[]) => void,
+            setConfigSyncResult: (result: string) => void,
             bClearLocalStorage: boolean): void;
         startSync(instance: IPublicClientApplication, authorizedUser: User | null | undefined, config: Config | null | undefined): APIResult;
     }
@@ -219,15 +217,14 @@ declare module "@mindline/sync" {
     //
     // Azure AD Graph API
     //
-    export function groupGet(tenant: Tenant, groupid: string): Promise<{group: string, error: string}>;
-    export function groupsGet(tenant: Tenant, groupSearchString: string): Promise<{groups: Group[], error: string}>;
+    export function groupsGet(instance: IPublicClientApplication, user: User | undefined, groupSearchString: string): Promise<{groups: Group[], error: string}>;
     export function signIn(user: User, tasks: TaskArray): void;
     export function signInIncrementally(user: User, scope: string): void;
     export function signOut(user: User): void;
     export function tenantRelationshipsGetByDomain(loggedInuser: User, tenant: Tenant, instance: IPublicClientApplication, debug: boolean): boolean;
     export function tenantRelationshipsGetById(user: User, ii: InitInfo, instance: IPublicClientApplication, tasks: TaskArray, debug: boolean): boolean;
     export function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean>;
-    export function usersGet(tenant: Tenant): { users: string[], error: string };
+    export function usersGet(instance: IPublicClientApplication, user: User | undefined): { users: string[], error: string };
     //
     // Mindline Config API
     //

package/index.ts

@@ -2,7 +2,7 @@
 import * as signalR from "@microsoft/signalr"
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
 import { deserializeArray, instanceToPlain, ClassTransformOptions } from 'class-transformer';
-import { adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, graphConfig, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
+import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, graphConfig, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
 import { version } from './package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
@@ -79,8 +79,6 @@ export class Tenant {
     permissionType: TenantPermissionTypeStrings;
     onboarded: string;
     authority: string;
-    readServicePrincipal: string;
-    writeServicePrincipal: string;
     workspaceIDs: string;
     constructor() {
         this.tid = "";
@@ -90,8 +88,6 @@ export class Tenant {
         this.permissionType = "notassigned";
         this.onboarded = "false";
         this.authority = "";
-        this.readServicePrincipal = "";
-        this.writeServicePrincipal = "";
         this.workspaceIDs = "";
     }
 }
@@ -518,7 +514,7 @@ export class MilestoneArray {
         }
     }
     // milestone tracking during a sync
-    start(setMilestones): void {
+    start(setMilestones: (milestones: Milestone[]) => void): void {
         // we should always have a milestone array and a first milestone
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
         let currentRun: number = Number(this.milestones[0].Run);
@@ -543,7 +539,7 @@ export class MilestoneArray {
         setMilestones(this.milestones);
         console.log(`Start milestone: ${this.milestones[0].Run}:${this.milestones[0].Start}`);
     }
-    unstart(setMilestones): void {
+    unstart(setMilestones: (milestones: Milestone[]) => void): void {
         // we should always have a milestone array and a first milestone
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
         let currentRun: number = Number(this.milestones[0].Run);
@@ -567,20 +563,20 @@ export class MilestoneArray {
         setMilestones(this.milestones);
         console.log(`Unstart removed first milestone: ${removedMilestone.Run}:${removedMilestone.Start}`);
     }
-    post(setMilestones): void {
+    post(setMilestones: (milestones: Milestone[]) => void): void {
         // update the post value of the first milestone
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
         this.milestones[0].post("");
         setMilestones(this.milestones);
         console.log(`POST milestone: ${this.milestones[0].Run}:${this.milestones[0].POST}`);
     }
-    read(setMilestones): void {
+    read(setMilestones: (milestones: Milestone[]) => void): void {
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
         this.milestones[0].read("");
         setMilestones(this.milestones);
         console.log(`Read milestone: ${this.milestones[0].Run}:${this.milestones[0].Read}`);
     }
-    write(setMilestones): void {
+    write(setMilestones: (milestones: Milestone[]) => void): void {
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
         this.milestones[0].write("");
         // while we have >10 complete milestones, remove the last
@@ -630,7 +626,7 @@ export class BatchArray {
     pb_increment: number;
     pb_idle: number;
     pb_idleMax: number;
-    pb_timer;
+    pb_timer: NodeJS.Timer;
     milestoneArray: MilestoneArray;
     constructor(
         config: Config | null,
@@ -642,7 +638,7 @@ export class BatchArray {
         this.pb_startTS = 0;
         this.pb_progress = 0;
         this.pb_increment = 0;
-        this.pb_timer = 0;
+        this.pb_timer = null;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
         this.milestoneArray = new MilestoneArray(false);
@@ -728,7 +724,7 @@ export class BatchArray {
             });
         }
     }
-    initializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void {
+    initializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void {
         this.pb_startTS = Date.now();
         this.pb_progress = 0;
         this.pb_increment = 1;
@@ -742,6 +738,7 @@ export class BatchArray {
             setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
             if (this.pb_idle >= 20) {
                 clearInterval(this.pb_timer);
+                this.pb_timer = null;
                 if (this.milestoneArray.milestones[0].Write == null) {
                     this.milestoneArray.write(setMilestones);
                 }
@@ -755,14 +752,14 @@ export class BatchArray {
         }, 1000);
         this.milestoneArray.start(setMilestones);
     }
-    uninitializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void {
+    uninitializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void {
         this.pb_startTS = 0;
         this.pb_progress = 0;
         setSyncProgress(this.pb_progress);
         setConfigSyncResult("sync failed to execute");
         this.pb_increment = 0;
         clearInterval(this.pb_timer);
-        this.pb_timer = 0;
+        this.pb_timer = null;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
         setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
@@ -772,13 +769,13 @@ export class BatchArray {
         config: Config | null | undefined,
         syncPortalGlobalState: InitInfo | null,
         batchIdArray: Array<Object>,
-        setRefreshDeltaTrigger,
-        setReadersTotal,
-        setReadersCurrent,
-        setWritersTotal,
-        setWritersCurrent,
-        setMilestones,
-        setConfigSyncResult,
+        setRefreshDeltaTrigger: (trigger: boolean) => void,
+        setReadersTotal: (readersTotal: number) => void,
+        setReadersCurrent: (readersCurrent: number) => void,
+        setWritersTotal: (writersTotal: number) => void,
+        setWritersCurrent: (writersCurrent: number) => void ,
+        setMilestones: (milestones: Milestone[]) => void,
+        setConfigSyncResult: (result: string) => void,
         bClearLocalStorage: boolean
     ): void {
         // we have just completed a successful POST to startSync
@@ -1025,48 +1022,14 @@ export class APIResult {
 //
 // Azure AD Graph API
 //
-//groupGet - GET /groups/{id}
-export async function groupGet(tenant: Tenant, groupid: string): Promise<{ group: string, error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { group: "", error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
-    let options = { method: "GET", headers: headers };
-    // make /groups endpoint call
-    try {
-        let groupsEndpoint = `${graphConfig.graphGroupsEndpoint}/${groupid}`;
-        let response = await fetch(groupsEndpoint, options);
-        let data = await response.json();
-        if (typeof data.error !== "undefined") {
-            return { group: "", error: `${data.error.code}: ${data.error.message}` };
-        }
-        return { group: data.value, error: `` };
-    }
-    catch (error: any) {
-        console.log(error);
-        return { group: "", error: `Exception: ${error}` };
-    }
-}
 //groupsGet - GET /groups
-export async function groupsGet(tenant: Tenant, groupSearchString: string): Promise<{ groups: Group[], error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { groups: [], error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
+export async function groupsGet(instance: IPublicClientApplication, user: User | undefined, groupSearchString: string): Promise<{ groups: Group[], error: string }> {
+    // need a logged in user to get graph users
+    if (user == null || user.spacode == "") {
+        return { groups: [], error: `500: invalid user passed to groupsGet` };
+    }
+    // create headers
+    const headers = await defineHeaders(instance, user);
     let options = { method: "GET", headers: headers };
     // make /groups endpoint call
     try {
@@ -1080,7 +1043,7 @@ export async function groupsGet(tenant: Tenant, groupSearchString: string): Prom
     }
     catch (error: any) {
         console.log(error);
-        return { group: "", error: `Exception: ${error}` };
+        return { groups: [], error: `Exception: ${error}` };
     }
 }
 export function signIn(user: User, tasks: TaskArray): void {
@@ -1294,18 +1257,13 @@ export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean
     return false; // failed, no need for UX to re-render
 }
 //usersGet - GET from AAD Users endpoint
-export async function usersGet(tenant: Tenant): Promise<{ users: string[], error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { users: [], error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
+export async function usersGet(instance: IPublicClientApplication, user: User | undefined): Promise<{ users: string[], error: string }> {
+    // need a logged in user to get graph users
+    if (user == null || user.spacode == "") {
+        return { users: [], error: `500: invalid user passed to groupsGet` };
+    }
+    // create headers
+    const headers = await defineHeaders(instance, user);
     let options = { method: "GET", headers: headers };
     // make /users endpoint call
     try {
@@ -1314,7 +1272,7 @@ export async function usersGet(tenant: Tenant): Promise<{ users: string[], error
         if (typeof data.error !== "undefined") {
             return { users: [], error: `${data.error.code}: ${data.error.message}` };
         }
-        let users = new Array<User>();
+        let users = new Array<string>();
         for (let user of data.value) {
             users.push(user.mail);
         }
@@ -1495,8 +1453,6 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
         const regexMatch = item.authority.match(regex);
         tenant.authority = regexMatch ? regexMatch[1] : item.authority;
 
-        tenant.readServicePrincipal = item.readServicePrincipal;
-        tenant.writeServicePrincipal = item.writeServicePrincipal;
         // ensure this workspace tracks this tenant
         let idx = workspace.associatedTenants.findIndex((t) => t === item.tenantId);
         if (idx == -1) workspace.associatedTenants.push(item.tenantId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "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,8 +6,6 @@
     "tenantType": "",
     "permissionType": "",
     "onboarded": false,
-    "authority": "",
-    "readServicePrincipal": "",
-    "writeServicePrincipal": ""
+    "authority": ""
   }
 ]

package/tenants2.json

@@ -4,53 +4,41 @@
     "name": "Mindline1",
     "domain": "mindline1.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "df9c2e0a-f6fe-43bb-a155-d51f66dffe0e",
     "name": "Mindline2",
     "domain": "mindline2.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "1",
     "name": "WhoIam",
     "domain": "whoiam.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "2",
     "name": "Grit Software",
     "domain": "gritsoftware.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "3",
     "name": "Google",
     "domain": "google.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "4",
     "name": "Trackman Golf",
     "domain": "trackman.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   }
 ]