@mindline/sync 1.0.36 → 1.0.38

package/.vs/VSWorkspaceState.json

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

package/hybridspa.ts

@@ -3,6 +3,7 @@ import {
     User,
     Tenant,
     Config,
+    TenantConfigInfo,
     APIResult
 } from "./index";
 import {
@@ -26,6 +27,7 @@ export const graphConfig = {
         "https://dev-configurationapi-westus.azurewebsites.net/api/v1/configurations",
     initEndpoint:
         "https://dev-configurationapi-westus.azurewebsites.net/api/v1/configuration/init",
+    readerStartSyncEndpoint: "https://dev-configurationapi-westus.azurewebsites.net/api/v1/startSync",
     tenantEndpoint:
         "https://dev-configurationapi-westus.azurewebsites.net/api/v1/tenant",
     tenantsEndpoint:
@@ -36,14 +38,17 @@ export const graphConfig = {
     graphGroupsEndpoint: "https://graph.microsoft.com/v1.0/groups",
     graphMailEndpoint: "https://graph.microsoft.com/v1.0/me/messages",
     graphMeEndpoint: "https://graph.microsoft.com/v1.0/me",
-    graphTenantByDomainEndpoint:
-        "https://graph.microsoft.com/beta/tenantRelationships/findTenantInformationByDomainName",
-    graphTenantByIdEndpoint:
-        "https://graph.microsoft.com/beta/tenantRelationships/findTenantInformationByTenantId",
     graphUsersEndpoint: "https://graph.microsoft.com/v1.0/users",
-    // reader endpoint to trigger sync start
-    readerStartSyncEndpoint: "https://dev-fn-reader-westus.azurewebsites.net/api/startSync/",
-    readerApiEndpoint: "https://dev-fn-reader-westus.azurewebsites.net/api/lookup/"
+    // sovereign cloud tenant info endpoints
+    graphTenantByDomainPredicate: "beta/tenantRelationships/findTenantInformationByDomainName",
+    graphTenantByIdPredicate:     "beta/tenantRelationships/findTenantInformationByTenantId",
+    // authority values are based on the well-known OIDC auth endpoints
+    authorityWW: "https://login.microsoftonline.com/",
+    authorityWWRegex: /^(https:\/\/login\.microsoftonline\.(?:us|com)\/)([\dA-Fa-f]{8}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{12})\/oauth2\/authorize$/,
+    authorityUS: "https://login.microsoftonline.us/",
+    authorityUSRegex: /^(https:\/\/login\.microsoftonline\.(?:us|com)\/)([\dA-Fa-f]{8}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{12})\/oauth2\/authorize$/,
+    authorityCN: "https://login.partner.microsoftonline.cn/",
+    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(
@@ -128,7 +133,7 @@ export async function adminDelete(
         console.log("Attempting DELETE from /admin: " + url!.href);
         let response = await fetch(url!.href, options);
         if (response.status === 200 && response.statusText === "OK") {
-            console.log(`Successful DELETE from //admin: ${url!.href}`);
+            console.log(`Successful DELETE from /admin: ${url!.href}`);
             return result;
         } else {
             result.error = await processErrors(response);
@@ -215,20 +220,9 @@ export async function adminPost(
     workspaceId: string
 ): Promise<APIResult> {
     let result: APIResult = new APIResult();
-    if (
-        user.mail == null ||
-        user.mail === "" ||
-        user.authority == null ||
-        user.authority === "" ||
-        user.tid == null ||
-        user.tid === "" ||
-        user.companyName == null ||
-        user.companyName === "" ||
-        user.companyDomain == null ||
-        user.companyDomain === ""
-    ) {
+    if (user.mail == "" || user.authority == "" || user.tid === "") {
         result.result = false;
-        result.error = "configPost: invalid config ID";
+        result.error = "adminPost: invalid argument";
         result.status = 500;
         return result;
     }
@@ -340,13 +334,20 @@ export async function configPost(
       "isEnabled": ${config.isEnabled},
       "tenants": [`;
     config.tenants.map((tci) => {
+        // be sure we send null and not "null" in body
+        let sourceGroupId: string = tci.sourceGroupId != "" ? `"${tci.sourceGroupId}"` : "null";
+        let sourceGroupName: string = tci.sourceGroupName != "" ? `"${tci.sourceGroupName}"` : "null";
+        let targetGroupId: string = tci.targetGroupId != "" ? `"${tci.targetGroupId}"` : "null";
+        let targetGroupName: string = tci.targetGroupName != "" ? `"${tci.targetGroupName}"` : "null";
         // if last character is } we need a comma first
         let needComma: boolean = configBody.slice(-1) === "}";
         if (needComma) configBody += ",";
         configBody += `{
         "tenantId": "${tci.tid}",
-        "sourceGroupId": "${tci.sourceGroupId}",
-        "sourceGroupName": "${tci.sourceGroupName}",
+        "sourceGroupId": ${sourceGroupId},
+        "sourceGroupName": ${sourceGroupName},
+        "targetGroupId": ${targetGroupId},
+        "targetGroupName": ${targetGroupName},
         "configurationTenantType": "${tci.configurationTenantType}"
       }`;
     });
@@ -409,15 +410,21 @@ export async function configPut(
       "description": "${config.description}",
       "isEnabled": ${config.isEnabled},
       "tenants": [`;
-    config.tenants.map((tci) => {
+    config.tenants.map((tci: TenantConfigInfo) => {
         // if last character is } we need a comma first
         let needComma: boolean = configBody.slice(-1) === "}";
         if (needComma) configBody += ",";
-        // TODO: more sophisticated source tenant user filtering
+        // be sure we send null and not "null" in body
+        let sourceGroupId: string = tci.sourceGroupId != "" ? `"${tci.sourceGroupId}"` : "null";
+        let sourceGroupName: string = tci.sourceGroupName != "" ? `"${tci.sourceGroupName}"` : "null";
+        let targetGroupId: string = tci.targetGroupId != "" ? `"${tci.targetGroupId}"` : "null";
+        let targetGroupName: string = tci.targetGroupName != "" ? `"${tci.targetGroupName}"` : "null";
         configBody += `{
           "tenantId": "${tci.tid}",
-          "sourceGroupId": "${tci.sourceGroupId}",
-          "sourceGroupName": "${tci.sourceGroupName}",
+          "sourceGroupId": ${sourceGroupId},
+          "sourceGroupName": ${sourceGroupName},
+          "targetGroupId": ${targetGroupId},
+          "targetGroupName": ${targetGroupName},
           "configurationTenantType": "${tci.configurationTenantType}",
           "deltaToken": "${tci.deltaToken}"
         }`;
@@ -862,21 +869,21 @@ export async function readerPost(
         result.status = 500;
         return result;
     }
-    // create reader endpoint with config ID
-    let readerEndpoint: string = graphConfig.readerStartSyncEndpoint + config.id;
+    // create reader endpoint
+    let readerEndpoint: string = graphConfig.readerStartSyncEndpoint;
+    let url: URL = new URL(readerEndpoint);
+    url.searchParams.append("configurationId", config.id);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
     // make reader endpoint call
     let options = { method: "POST", headers: headers };
     try {
-        console.log("Attempting POST to /startSync: " + readerEndpoint);
-        let response = await fetch(readerEndpoint, options);
+        console.log("Attempting POST to /startSync: " + url.href);
+        let response = await fetch(url.href, options);
         if (response.status === 200 && response.statusText === "OK") {
             console.log(`Successful POST to /startSync: ${readerEndpoint}`);
-
-            let textResponse = await response.text();
-            textResponse = textResponse;
-
+            let jsonResponse = await response.json();
+            result.array = JSON.parse(jsonResponse.PayloadStr);
             return result;
         } else {
             result.error = await processErrors(response);

package/index.d.ts

@@ -65,11 +65,14 @@ declare module "@mindline/sync" {
     export class TenantConfigInfo {
         tid: string;              // tenant identifier
         sourceGroupId: string;    // source group - we can configure source group for reading
-        sourceGroupName: string;  // source group - we can configure source group for reading
+        sourceGroupName: string;  // 
+        targetGroupId: string;    // target group - we can configure target group for writing
+        targetGroupName: string;  // 
         configurationTenantType: TenantConfigTypeStrings;
         deltaToken: string;
-        filesWritten: number;
+        usersWritten: number;
         configId: string;
+        batchId: string;
     }
     export class Config {
         id: string;
@@ -134,18 +137,70 @@ declare module "@mindline/sync" {
         setEnd(endDate: Date): void;
         setStart(startDate: Date): void;
     }
+    export class Milestone {
+        Run: number;
+        Start: Date;
+        startDisplay: string;
+        POST: Date;
+        postDisplay: string;
+        Read: Date;
+        readDisplay: string;
+        Write: Date;
+        writeDisplay: string;
+        Duration: Date;
+        durationDisplay: string;
+        constructor(run: number);
+        start(start: string): void;
+        post(post: string): void;
+        read(read: string): void;
+        write(write: string): void;
+    }
+    export class MilestoneArray {
+        milestones: Milestone[];
+        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;
+    }
     export class BatchArray {
         tenantNodes: TenantNode[];
+        pb_startTS: number;
+        pb_progress: number;
+        pb_increment: number;
+        pb_idle: number;
+        pb_idleMax: number;
+        pb_timer;
+        milestoneArray: MilestoneArray;
         constructor(config: Config|null, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean);
         // populate tenantNodes based on config tenants
-        init(config: Config|null, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean): void;
-        startSync(instance: IPublicClientApplication, authorizedUser: User|null|undefined, config: Config|null|undefined): void;
+        init(config: Config|null|undefined, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean): void;
+        initializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void;
+        uninitializeProgressBar(setSyncProgress, setConfigSyncResult, setIdleText, setMilestones): void;
+        initializeSignalR(
+            config: Config | null | undefined,
+            syncPortalGlobalState: InitInfo | null,
+            batchIdArray: Array<Object>,
+            setRefreshDeltaTrigger,
+            setReadersTotal,
+            setReadersCurrent,
+            setWritersTotal,
+            setWritersCurrent,
+            setMilestones,
+            setConfigSyncResult,
+            bClearLocalStorage: boolean): void;
+        startSync(instance: IPublicClientApplication, authorizedUser: User | null | undefined, config: Config | null | undefined): APIResult;
     }
     export class TenantNode {
         expanded: boolean;
         status: string;
         name: string;
         tid: string;
+        batchId: string;
         total: number;
         read: number;
         written: number;
@@ -158,6 +213,7 @@ declare module "@mindline/sync" {
         result: boolean;
         status: number;
         error: string;
+        array: Array<Object> | null;
         constructor();
     }  
     //
@@ -170,7 +226,8 @@ declare module "@mindline/sync" {
     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 usersGet(tenant: Tenant): {users: string[], error: string};
+    export function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean>;
+    export function usersGet(tenant: Tenant): { users: string[], error: string };
     //
     // Mindline Config API
     //