@mindline/sync 1.0.33 → 1.0.35

package/.vs/VSWorkspaceState.json

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

package/README.md

@@ -17,12 +17,17 @@ npm install @azure/msal-browser --save
 # 2.	Latest releases
 # 3.	API references
 # 4. Unit Test
-### `npm test`
+
+	npm test
 # 6. Publish
-### `npm login`
-username, password, OTP code required
-### `npm publish --access=public --otp=XXXXXX`
-### `npm publish --dry-run`
-publishes package
+
+username, password, OTP code required to publish package
+
+	npm login
+	npm version patch
+	npm publish --access=public --otp=XXXXXX
+	npm publish --dry-run
+
+
 # 7. Contribute
 TODO: Explain how other users and developers can contribute to make your code better.

package/hybridspa.ts

@@ -42,7 +42,8 @@ export const graphConfig = {
         "https://graph.microsoft.com/beta/tenantRelationships/findTenantInformationByTenantId",
     graphUsersEndpoint: "https://graph.microsoft.com/v1.0/users",
     // reader endpoint to trigger sync start
-    readerEndpoint: "https://dev-fn-reader-westus.azurewebsites.net/api/startSync/"
+    readerStartSyncEndpoint: "https://dev-fn-reader-westus.azurewebsites.net/api/startSync/",
+    readerApiEndpoint: "https://dev-fn-reader-westus.azurewebsites.net/api/lookup/"
 };
 // helper functions
 async function defineHeaders(
@@ -111,7 +112,6 @@ export async function adminDelete(
     let url: URL | null = null;
     if (user.oid !== user.mail) {
         url = new URL(graphConfig.adminEndpoint);
-        url.searchParams.append("userId", user.oid);
         url.searchParams.append("workspaceId", workspaceId);
     }
     // or of an incomplete admin?
@@ -413,13 +413,14 @@ export async function configPut(
         // if last character is } we need a comma first
         let needComma: boolean = configBody.slice(-1) === "}";
         if (needComma) configBody += ",";
-        // decide whethere to send source group values
+        // TODO: more sophisticated source tenant user filtering
         configBody += `{
-      "tenantId": "${tci.tid}",
-      "sourceGroupId": "${tci.sourceGroupId}",
-      "sourceGroupName": "${tci.sourceGroupName}",
-      "configurationTenantType": "${tci.configurationTenantType}"
-    }`;
+          "tenantId": "${tci.tid}",
+          "sourceGroupId": "${tci.sourceGroupId}",
+          "sourceGroupName": "${tci.sourceGroupName}",
+          "configurationTenantType": "${tci.configurationTenantType}",
+          "deltaToken": "${tci.deltaToken}"
+        }`;
     });
     configBody += `]}`;
     let options = { method: "PUT", headers: headers, body: configBody };
@@ -804,9 +805,8 @@ export async function workspacesGet(
     }
     // create workspaces endpoint
     let workspaceEndpoint: string = graphConfig.workspaceEndpoint;
-    // add email parameter to endpoint
+    // create workspace endpoint
     let url: URL = new URL(workspaceEndpoint);
-    url.searchParams.append("userEmail", user.mail);
     // create workspace headers
     const headers = await defineHeaders(instance, authorizedUser);
     // make workspace endpoint call
@@ -863,17 +863,22 @@ export async function readerPost(
         return result;
     }
     // create reader endpoint with config ID
-    let readerEndpoint: string = graphConfig.readerEndpoint + config.id;
+    //let readerEndpoint: string = graphConfig.readerStartSyncEndpoint + config.id;
+    let readerEndpoint: string = graphConfig.readerApiEndpoint + 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);
         debugger;
+        console.log("Attempting POST to /startSync: " + readerEndpoint);
         let response = await fetch(readerEndpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
             console.log(`Successful POST to /startSync: ${readerEndpoint}`);
+
+            let textResponse = await response.text();
+            textResponse = textResponse;
+
             return result;
         } else {
             result.error = await processErrors(response);

package/index.d.ts

@@ -63,10 +63,12 @@ declare module "@mindline/sync" {
   }
   export type TenantConfigTypeStrings = keyof typeof TenantConfigType;
   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
-    configurationTenantType: TenantConfigTypeStrings;
+      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
+      configurationTenantType: TenantConfigTypeStrings;
+      deltaToken: string;
+      filesWritten: number;
   }
   export class Config {
     id: string;
@@ -136,7 +138,7 @@ declare module "@mindline/sync" {
     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;
-    test(instance: IPublicClientApplication, authorizedUser: User|undefined, config: Config|null|undefined): void;
+    startSync(instance: IPublicClientApplication, authorizedUser: User|null|undefined, config: Config|null|undefined): void;
   }
   export class TenantNode {
     expanded: boolean;