Move Delete Container call to use ARM when logged in with AAD (#110)

src/Common/CosmosClient.ts

@@ -2,7 +2,7 @@ import * as Cosmos from "@azure/cosmos";
 import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos";
 import { DatabaseAccount } from "../Contracts/DataModels";
 import { HttpHeaders, EmulatorMasterKey } from "./Constants";
-import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import { config, Platform } from "../Config";
 

src/Common/DataAccessUtilityBase.ts

@@ -377,16 +377,6 @@ export function deleteConflict(
   );
 }
 
-export function deleteCollection(collection: ViewModels.Collection, options: any): Q.Promise<any> {
-  return Q(
-    CosmosClient.client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .delete()
-      .then(() => refreshCachedResources())
-  );
-}
-
 export function deleteDatabase(database: ViewModels.Database, options: any): Q.Promise<any> {
   return Q(
     CosmosClient.client()

src/Common/DocumentClientUtilityBase.ts

@@ -10,7 +10,7 @@ import * as Logger from "./Logger";
 import { sendMessage } from "./MessageHandler";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
-import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
 import ConflictId from "../Explorer/Tree/ConflictId";
@@ -730,39 +730,6 @@ export function deleteConflict(
   return deferred.promise;
 }
 
-export function deleteCollection(collection: ViewModels.Collection, options: any = {}): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting container ${collection.id()}`
-  );
-  DataAccessUtilityBase.deleteCollection(collection, options)
-    .then(
-      (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted container ${collection.id()}`
-        );
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting container ${collection.id()}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "DeleteCollection", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
 export function deleteDatabase(database: ViewModels.Database, options: any = {}): Q.Promise<any> {
   var deferred = Q.defer<any>();
 

src/Common/MongoProxyClient.ts

@@ -13,7 +13,7 @@ import { Constants as CosmosSDKConstants } from "@azure/cosmos";
 import { CosmosClient } from "./CosmosClient";
 import { sendMessage } from "./MessageHandler";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
 import { MinimalQueryIterator } from "./IteratorUtilities";
 import DocumentId from "../Explorer/Tree/DocumentId";

src/Common/QueriesClient.ts

@@ -8,7 +8,7 @@ import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/Notificat
 import { CosmosClient } from "./CosmosClient";
 import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as Logger from "./Logger";
-import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { QueryUtils } from "../Utils/QueryUtils";
 import Explorer from "../Explorer/Explorer";
 import {

src/Common/dataAccess/deleteCollection.test.ts

@@ -0,0 +1,13 @@
+jest.mock("../../Utils/arm/request");
+import { deleteCollection } from "./deleteCollection";
+import { armRequest } from "../../Utils/arm/request";
+import { AuthType } from "../../AuthType";
+
+describe("deleteCollection", () => {
+  it("should call ARM if logged in with AAD", async () => {
+    window.authType = AuthType.AAD;
+    await deleteCollection("database", "collection");
+    expect(armRequest).toHaveBeenCalled();
+  });
+  // TODO: Test non-AAD case
+});

src/Common/dataAccess/deleteCollection.ts

@@ -0,0 +1,31 @@
+import { CosmosClient } from "../CosmosClient";
+import { refreshCachedResources } from "../DataAccessUtilityBase";
+import { logConsoleProgress, logConsoleInfo, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { AuthType } from "../../AuthType";
+import { deleteSqlContainer } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
+
+export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
+  const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
+  try {
+    if (window.authType === AuthType.AAD) {
+      await deleteSqlContainer(
+        CosmosClient.subscriptionId(),
+        CosmosClient.resourceGroup(),
+        CosmosClient.databaseAccount().name,
+        databaseId,
+        collectionId
+      );
+    } else {
+      await CosmosClient.client()
+        .database(databaseId)
+        .container(collectionId)
+        .delete();
+    }
+  } catch (error) {
+    logConsoleError(`Error while deleting container ${collectionId}:\n ${JSON.stringify(error)}`);
+    throw error;
+  }
+  logConsoleInfo(`Successfully deleted container ${collectionId}`);
+  clearMessage();
+  await refreshCachedResources();
+}