Merge pull request #30 from aerogear/VARIANT_DELETE_FIX

Fixed variant delete

README.md

@@ -1,7 +1,7 @@
 # UnifiedPush Server Admin Client
 
 ![Build](https://github.com/aerogear/unifiedpush-admin-client/workflows/build/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/github/aerogear/unifiedpush-admin-client/badge.svg)](https://coveralls.io/github/aerogear/unifiedpush-admin-client)
+[![Coverage Status](https://coveralls.io/repos/github/aerogear/unifiedpush-admin-client/badge.svg?branch=master)](https://coveralls.io/github/aerogear/unifiedpush-admin-client)
 
 The _UnifiedPush Server Admin_ library allows to admin the UPS by javascript or typescript code.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aerogear/unifiedpush-admin-client",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Client library used to admin UPS with code",
   "author": "AeroGear Team<aerogear@googlegroups.com>",
   "homepage": "http://aerogear.org",

src/variants/VariantsAdmin.ts

@@ -48,7 +48,9 @@ export class VariantsAdmin {
 
   async delete(api: AxiosInstance, appId: string, filter?: VariantFilter) {
     return Promise.all(
-      (await this.find(api, appId, filter)).map(variant => api.delete(`/applications/${appId}/${variant.variantID!}`))
+      (await this.find(api, appId, filter)).map(variant =>
+        api.delete(`/applications/${appId}/${variant.type}/${variant.variantID!}`).then(() => variant)
+      )
     );
   }
 }

test/UnifiedPushAdminClient.test.ts

@@ -24,6 +24,7 @@ afterAll(() => {
 });
 
 const TEST_APP_ID = '2:2';
+const TEST_VARIANT_ID = 'v-2:1';
 
 describe('UnifiedPushAdminClient', () => {
   const credentials: KeycloakCredentials = {
@@ -54,4 +55,20 @@ describe('UnifiedPushAdminClient', () => {
     );
     expect(variant).toEqual(TEST_NEW_VARIANT_CREATED);
   });
+
+  it('Should delete a varianta', async () => {
+    const variantsBefore = await new UnifiedPushAdminClient(BASE_URL, credentials).variants.find(TEST_APP_ID, {
+      variantID: TEST_VARIANT_ID,
+    });
+    expect(variantsBefore).toBeDefined();
+    expect(variantsBefore).toHaveLength(1);
+    await new UnifiedPushAdminClient(BASE_URL, credentials).variants.delete(TEST_APP_ID, {
+      variantID: TEST_VARIANT_ID,
+    });
+    const variantsAfter = await new UnifiedPushAdminClient(BASE_URL, credentials).variants.find(TEST_APP_ID, {
+      variantID: TEST_VARIANT_ID,
+    });
+    expect(variantsAfter).toBeDefined();
+    expect(variantsAfter).toHaveLength(0);
+  });
 });

test/mocks/nockMocks.ts

@@ -113,13 +113,13 @@ export const mockUps = (baseUrl = BASE_URL, auth = false) =>
       expect(requestBody.indexOf('name="certificate"')).not.toEqual(-1);
       return TEST_NEW_VARIANT_CREATED;
     })
-    .delete(/rest\/applications\/?[^\/]*\/?[^\/]*/)
+    .delete(/rest\/applications\/?[^\/]*\/?[^\/]*\/?[^\/]*/)
     // tslint:disable-next-line:only-arrow-functions
     .reply(200, function(uri, requestBody) {
-      const del = /rest\/applications\/?([^\/]*)\/?([^\/]*)/;
+      const del = /rest\/applications\/?([^\/]*)\/?([^\/]*)\/?([^\/]*)/;
       const params = del.exec(uri)!;
       const appid = params[1];
-      const varId = params[2];
+      const varId = params[3];
       const app = mockData.find(appDel => appDel.pushApplicationID === appid)!;
       const variants = app?.variants?.filter(variant => variant.variantID !== varId);