Merge f24cab1 into bc6556c

src/UnifiedPushAdminClient.ts

@@ -93,5 +93,12 @@ export class UnifiedPushAdminClient {
      */
     create: async (appId: string, variant: Variant): Promise<Variant> =>
       this.variantsAdmin.create(await this.auth(), appId, variant),
+    /**
+     * Delete a variant by its Id
+     * @param appId the id of the app this variant is associated with
+     * @param filter filter to be used to filter the variants.
+     */
+    delete: async (appId: string, filter?: VariantFilter) =>
+      this.variantsAdmin.delete(await this.auth(), appId, filter),
   };
 }

src/variants/VariantsAdmin.ts

@@ -45,4 +45,10 @@ export class VariantsAdmin {
     }
     return (await api.post(`/applications/${appId}/${variant.type}`, variant)).data as Variant;
   }
+
+  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!}`))
+    );
+  }
 }

test/mocks/nockMocks.ts

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

test/variants/VariantsAdmin.test.ts

@@ -77,4 +77,13 @@ describe('Variants Admin', () => {
     expect(variant).toEqual(TEST_NEW_VARIANT_CREATED);
     jest.restoreAllMocks();
   });
+
+  it('Should delete a variant', async () => {
+    await variantAdmin.delete(api, TEST_APP_ID, {
+      variantID: 'v-2:2',
+    });
+    const appDel = mockData.find(appDel => appDel.pushApplicationID === TEST_APP_ID)!;
+    const varDel = appDel.variants!.find(variant => variant.variantID === 'v-2:2');
+    expect(appDel.variants).not.toContain(varDel);
+  });
 });