@mindline/sync 1.0.49 → 1.0.50

package/hybridspa.ts

@@ -1,10 +1,11 @@
 //hybridspa.ts - calls to Mindline Config API
 import {
-    User,
-    Tenant,
+    APIResult,
     Config,
+    graphConfig,
+    Tenant,
     TenantConfigInfo,
-    APIResult
+    User
 } from "./index";
 import {
     IPublicClientApplication,
@@ -12,44 +13,6 @@ import {
 } from "@azure/msal-browser";
 import { deserializeArray } from "class-transformer";
 
-// add here endpoints for API services you would like to use.
-export const graphConfig = {
-    // config API endpoints
-    adminEndpoint:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/admin",
-    adminIncompleteEndpoint:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/incomplete-admin",
-    adminsEndpoint:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/admins",
-    configEndpoint:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/configuration",
-    configsEndpoint:
-        "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:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/tenants",
-    workspaceEndpoint:
-        "https://dev-configurationapi-westus.azurewebsites.net/api/v1/workspaces",
-    // graph API endpoints
-    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",
-    graphUsersEndpoint: "https://graph.microsoft.com/v1.0/users",
-    // 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
 // TODO: this is where you want to trigger a re-authentication if token expires
 export async function defineHeaders(
@@ -117,12 +80,12 @@ export async function adminDelete(
     // are we performing deletion of a full admin?
     let url: URL | null = null;
     if (user.oid !== user.mail) {
-        url = new URL(graphConfig.adminEndpoint);
+        url = new URL(graphConfig.adminEndpoint());
         url.searchParams.append("workspaceId", workspaceId);
     }
     // or of an incomplete admin?
     else if (user.mail !== "") {
-        url = new URL(graphConfig.adminIncompleteEndpoint);
+        url = new URL(graphConfig.adminIncompleteEndpoint());
         url.searchParams.append("email", user.mail);
         url.searchParams.append("workspaceId", workspaceId);
     }
@@ -168,9 +131,9 @@ export async function adminsGet(
         return result;
     }
     // create endpoint
-    let adminsEndpoint: string = graphConfig.adminsEndpoint;
+    let endpoint: string = graphConfig.adminsEndpoint();
     // add parameter to endpoint
-    let url: URL = new URL(adminsEndpoint);
+    let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
@@ -228,7 +191,7 @@ export async function adminPost(
         return result;
     }
     // create admin endpoint
-    let adminEndpoint: string = graphConfig.adminEndpoint;
+    let endpoint: string = graphConfig.adminEndpoint();
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
     // create admin body
@@ -240,8 +203,8 @@ export async function adminPost(
     let options = { method: "POST", headers: headers, body: adminBody };
     // make admin endpoint call
     try {
-        console.log("Attempting POST to /admin: " + adminEndpoint);
-        let response = await fetch(adminEndpoint, options);
+        console.log("Attempting POST to /admin: " + endpoint);
+        let response = await fetch(endpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
             console.log(`Successful POST to /admin: ${adminBody}`);
             return result;
@@ -277,7 +240,7 @@ export async function configDelete(
         return result;
     }
     let url: URL | null = null;
-    url = new URL(graphConfig.configEndpoint);
+    url = new URL(graphConfig.configEndpoint());
     url.searchParams.append("configurationId", config.id);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
@@ -323,7 +286,7 @@ export async function configPost(
         return result;
     }
     // create no parameter config endpoint
-    let configEndpoint: string = graphConfig.configEndpoint;
+    let endpoint: string = graphConfig.configEndpoint();
     // create config headers
     const headers = await defineHeaders(instance, authorizedUser);
     // create config body
@@ -357,8 +320,8 @@ export async function configPost(
     // make config endpoint call
     try {
         if (debug) debugger;
-        console.log("Attempting POST to /config: " + configEndpoint);
-        let response = await fetch(configEndpoint, options);
+        console.log("Attempting POST to /config: " + endpoint);
+        let response = await fetch(endpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
             let data = await response.json();
             config.id = data;
@@ -399,8 +362,8 @@ export async function configPut(
         return result;
     }
     // create parametrized config endpoint
-    let configEndpoint: string = graphConfig.configEndpoint;
-    let url: URL = new URL(configEndpoint);
+    let endpoint: string = graphConfig.configEndpoint();
+    let url: URL = new URL(endpoint);
     url.searchParams.append("configurationId", config.id);
     // create config headers
     const headers = await defineHeaders(instance, authorizedUser);
@@ -474,9 +437,9 @@ export async function configsGet(
         return result;
     }
     // create endpoint
-    let configsEndpoint: string = graphConfig.configsEndpoint;
+    let endpoint: string = graphConfig.configsEndpoint();
     // add parameter to endpoint
-    let url: URL = new URL(configsEndpoint);
+    let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
@@ -535,7 +498,7 @@ export async function initPost(
         return result;
     }
     // create init endpoint
-    let initEndpoint: string = graphConfig.initEndpoint;
+    let endpoint: string = graphConfig.initEndpoint();
     // create init headers
     const headers = await defineHeaders(instance, authorizedUser);
     // create init body
@@ -553,8 +516,8 @@ export async function initPost(
     // make init endpoint call
     try {
         if (debug) debugger;
-        console.log("Attempting POST to /configuration/init: " + initEndpoint);
-        let response = await fetch(initEndpoint, options);
+        console.log("Attempting POST to /configuration/init: " + endpoint);
+        let response = await fetch(endpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
             console.log(`Successful POST to /configuration/init: ${initBody}`);
             return result;
@@ -593,7 +556,7 @@ export async function tenantDelete(
         return result;
     }
     // create parametrized tenant endpoint
-    let url: URL = new URL(graphConfig.tenantEndpoint);
+    let url: URL = new URL(graphConfig.tenantEndpoint());
     url.searchParams.append("tenantId", tenant.tid);
     url.searchParams.append("workspaceId", workspaceId);
     // create headers
@@ -640,9 +603,9 @@ export async function tenantsGet(
         return result;
     }
     // create endpoint
-    let tenantsEndpoint: string = graphConfig.tenantsEndpoint;
+    let endpoint: string = graphConfig.tenantsEndpoint();
     // add parameter to endpoint
-    let url: URL = new URL(tenantsEndpoint);
+    let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
@@ -701,8 +664,8 @@ export async function tenantPost(
         return result;
     }
     // create parametrized tenant endpoint
-    let tenantEndpoint: string = graphConfig.tenantEndpoint;
-    let url: URL = new URL(tenantEndpoint);
+    let endpoint: string = graphConfig.tenantEndpoint();
+    let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceId);
     // create tenant headers
     const headers = await defineHeaders(instance, addingUser);
@@ -756,7 +719,7 @@ export async function tenantPut(
         return result;
     }
     // create tenant endpoint
-    let tenantEndpoint: string = graphConfig.tenantEndpoint;
+    let endpoint: string = graphConfig.tenantEndpoint();
     // create tenant headers
     const headers = await defineHeaders(instance, authorizedUser);
     // establish read and write service principals ("notassigned" is default")
@@ -782,14 +745,14 @@ export async function tenantPut(
     // make tenant endpoint call
     try {
         if (debug) debugger;
-        console.log(`Attempting PUT to ${tenantEndpoint}`);
-        let response = await fetch(tenantEndpoint, options);
+        console.log(`Attempting PUT to ${endpoint}`);
+        let response = await fetch(endpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
-            console.log(`Successful PUT to ${tenantEndpoint}`);
+            console.log(`Successful PUT to ${endpoint}`);
             return result;
         }
         else {
-            console.log(`Failed PUT to ${tenantEndpoint}: ${tenantBody}`);
+            console.log(`Failed PUT to ${endpoint}: ${tenantBody}`);
             result.error = await processErrors(response);
             console.log(result.error);
             result.status = 500;
@@ -821,9 +784,9 @@ export async function workspacesGet(
         return result;
     }
     // create workspaces endpoint
-    let workspaceEndpoint: string = graphConfig.workspaceEndpoint;
+    let endpoint: string = graphConfig.workspaceEndpoint();
     // create workspace endpoint
-    let url: URL = new URL(workspaceEndpoint);
+    let url: URL = new URL(endpoint);
     // create workspace headers
     const headers = await defineHeaders(instance, authorizedUser);
     // make workspace endpoint call
@@ -880,7 +843,7 @@ export async function readerPost(
         return result;
     }
     // create reader endpoint
-    let readerEndpoint: string = graphConfig.readerStartSyncEndpoint;
+    let readerEndpoint: string = graphConfig.readerStartSyncEndpoint();
     let url: URL = new URL(readerEndpoint);
     url.searchParams.append("configurationId", config.id);
     // create headers

package/index.d.ts

@@ -3,6 +3,37 @@ declare module "@mindline/sync" {
     export function sum(a: number, b: number): number;
     export function helloNpm(): string;
 
+    export class graphConfig {
+        static environmentTag: string = "dev";
+        // config API endpoints
+        static adminEndpoint(): string;
+        static adminIncompleteEndpoint(): string;
+        static adminsEndpoint(): string;
+        static configEndpoint(): string;
+        static configsEndpoint(): string;
+        static initEndpoint(): string;
+        static readerStartSyncEndpoint(): string;
+        static tenantEndpoint(): string;
+        static tenantsEndpoint(): string;
+        static workspaceEndpoint(): string;
+        // SignalR endpoint
+        static signalREndpoint(): string;
+        // graph API endpoints
+        static graphGroupsEndpoint: string = "https://graph.microsoft.com/v1.0/groups";
+        static graphMailEndpoint: string = "https://graph.microsoft.com/v1.0/me/messages";
+        static graphMeEndpoint: string = "https://graph.microsoft.com/v1.0/me";
+        static graphUsersEndpoint: string = "https://graph.microsoft.com/v1.0/users";
+        // sovereign cloud tenant info endpoints
+        static graphTenantByDomainPredicate: string = "beta/tenantRelationships/findTenantInformationByDomainName";
+        static graphTenantByIdPredicate: string = "beta/tenantRelationships/findTenantInformationByTenantId";
+        // authority values are based on the well-known OIDC auth endpoints
+        static authorityWW: string = "https://login.microsoftonline.com/";
+        static authorityWWRegex: RegExp = /^(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$/;
+        static authorityUS: string = "https://login.microsoftonline.us/";
+        static authorityUSRegex: RegExp = /^(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$/;
+        static authorityCN: string = "https://login.partner.microsoftonline.cn/";
+        static authorityCNRegex: RegExp = /^(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$/;
+    };
     export class Group {
         id: string;
         displayName: string;

package/index.ts

@@ -1,8 +1,8 @@
 //index.ts - published interface - AAD implementations, facade to Mindline Config API
 import * as signalR from "@microsoft/signalr"
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
-import { deserializeArray, instanceToPlain, ClassTransformOptions } from 'class-transformer';
-import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, graphConfig, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
+import { deserializeArray } from 'class-transformer';
+import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
 import { version } from './package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
@@ -19,6 +19,60 @@ export function sum(a: number, b: number): number {
 export function helloNpm(): string {
     return "hello NPM";
 }
+// main application exports
+export class graphConfig {
+    static environmentTag: string = "dev";
+    // config API endpoints
+    static adminEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/admin`
+    };
+    static adminIncompleteEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/incomplete-admin`;
+    };
+    static adminsEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/admins`;
+    }; 
+    static configEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configuration`;
+    };
+    static configsEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configurations`;
+    };
+    static initEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configuration/init`;
+    };
+    static readerStartSyncEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/startSync`;
+    };
+    static tenantEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/tenant`;
+    };
+    static tenantsEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/tenants`;
+    };
+    static workspaceEndpoint(): string {
+        return `https://${graphConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/workspaces`;
+    };
+    // SignalR endpoint
+    static signalREndpoint(): string {
+        return `https://${graphConfig.environmentTag}-signalrdispatcher-westus.azurewebsites.net/statsHub`;
+    };
+    // graph API endpoints
+    static graphGroupsEndpoint: string = "https://graph.microsoft.com/v1.0/groups";
+    static graphMailEndpoint: string = "https://graph.microsoft.com/v1.0/me/messages";
+    static graphMeEndpoint: string = "https://graph.microsoft.com/v1.0/me";
+    static graphUsersEndpoint: string = "https://graph.microsoft.com/v1.0/users";
+    // sovereign cloud tenant info endpoints
+    static graphTenantByDomainPredicate: string = "beta/tenantRelationships/findTenantInformationByDomainName";
+    static graphTenantByIdPredicate: string = "beta/tenantRelationships/findTenantInformationByTenantId";
+    // authority values are based on the well-known OIDC auth endpoints
+    static authorityWW: string = "https://login.microsoftonline.com/";
+    static authorityWWRegex: RegExp = /^(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$/;
+    static authorityUS: string = "https://login.microsoftonline.us/";
+    static authorityUSRegex: RegExp = /^(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$/;
+    static authorityCN: string = "https://login.partner.microsoftonline.cn/";
+    static authorityCNRegex: RegExp = /^(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$/;
+};
 export class Group {
     id: string;
     displayName: string;
@@ -818,7 +872,7 @@ export class BatchArray {
     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;
+        this.pb_increment = .25;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
         setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}/60]`);
@@ -1024,10 +1078,10 @@ export class BatchArray {
                     console.log(`Setting config sync result: "reading complete"`);
                     // trigger refresh delta tokens
                     setRefreshDeltaTrigger(true);
-                    // change to % per second to complete in 7x as long as it took to get here
+                    // change to % per second to complete in 12x as long as it took to get here
                     let readTS = Date.now();
                     let secsElapsed = (readTS - this.pb_startTS) / 1000;
-                    let expectedPercentDone = 7;
+                    let expectedPercentDone = 8.5;
                     let expectedPercentPerSecond = secsElapsed / expectedPercentDone;
                     this.pb_increment = expectedPercentPerSecond;
                     console.log(`Setting increment: ${this.pb_increment}% per second`);
@@ -1052,10 +1106,12 @@ export class BatchArray {
         }
         // start SignalR connection based on each batchId
         batchIdArray.map((batchPair: Object) => {
-            const endpointUrl = `https://dev-signalrdispatcher-westus.azurewebsites.net/statsHub?statsId=${batchPair.BatchId}`;
-            console.log(`Creating SignalR Hub for TID: ${batchPair.SourceId} ${endpointUrl}`);
+            const endpoint: string = graphConfig.signalREndpoint();
+            let endpointUrl: URL = new URL(endpoint);
+            endpointUrl.searchParams.append("statsId", batchPair.BatchId);
+            console.log(`Creating SignalR Hub for TID: ${batchPair.SourceId} ${endpointUrl.href}`);
             const connection: signalR.HubConnection = new signalR.HubConnectionBuilder()
-                .withUrl(endpointUrl)
+                .withUrl(endpointUrl.href)
                 .withAutomaticReconnect()
                 .configureLogging(signalR.LogLevel.Information)
                 .build();

package/package.json

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