From 89e71d7c16d95fd7cc9634d46e0db1d77e6fcae6 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 9 Jul 2018 16:27:03 -0400
Subject: [PATCH] fix org api paths

---
 src/abstractions/api.service.ts | 12 ++++++------
 src/services/api.service.ts     | 25 +++++++++++++------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/abstractions/api.service.ts b/src/abstractions/api.service.ts
index ce9e0a0c478..82385569925 100644
--- a/src/abstractions/api.service.ts
+++ b/src/abstractions/api.service.ts
@@ -125,16 +125,16 @@ export abstract class ApiService {
     getCollectionDetails: (organizationId: string, id: string) => Promise<CollectionGroupDetailsResponse>;
     getCollections: (organizationId: string) => Promise<ListResponse<CollectionResponse>>;
     getCollectionUsers: (organizationId: string, id: string) => Promise<ListResponse<CollectionUserResponse>>;
-    postCollection: (request: CollectionRequest) => Promise<CollectionResponse>;
-    putCollection: (id: string, request: CollectionRequest) => Promise<CollectionResponse>;
-    deleteCollection: (id: string) => Promise<any>;
+    postCollection: (organizationId: string, request: CollectionRequest) => Promise<CollectionResponse>;
+    putCollection: (organizationId: string, id: string, request: CollectionRequest) => Promise<CollectionResponse>;
+    deleteCollection: (organizationId: string, id: string) => Promise<any>;
 
     getGroupDetails: (organizationId: string, id: string) => Promise<GroupDetailsResponse>;
     getGroups: (organizationId: string) => Promise<ListResponse<GroupResponse>>;
     getGroupUsers: (organizationId: string, id: string) => Promise<ListResponse<GroupUserResponse>>;
-    postGroup: (request: GroupRequest) => Promise<GroupResponse>;
-    putGroup: (id: string, request: GroupRequest) => Promise<GroupResponse>;
-    deleteGroup: (id: string) => Promise<any>;
+    postGroup: (organizationId: string, request: GroupRequest) => Promise<GroupResponse>;
+    putGroup: (organizationId: string, id: string, request: GroupRequest) => Promise<GroupResponse>;
+    deleteGroup: (organizationId: string, id: string) => Promise<any>;
 
     getOrganizationUsers: (organizationId: string) => Promise<ListResponse<OrganizationUserUserDetailsResponse>>;
 
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 7467cd0d07e..1452ea17be4 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -383,18 +383,19 @@ export class ApiService implements ApiServiceAbstraction {
         return new ListResponse(r, CollectionUserResponse);
     }
 
-    async postCollection(request: CollectionRequest): Promise<CollectionResponse> {
-        const r = await this.send('POST', '/collections', request, true, true);
+    async postCollection(organizationId: string, request: CollectionRequest): Promise<CollectionResponse> {
+        const r = await this.send('POST', '/organizations/' + organizationId + '/collections', request, true, true);
         return new CollectionResponse(r);
     }
 
-    async putCollection(id: string, request: CollectionRequest): Promise<CollectionResponse> {
-        const r = await this.send('PUT', '/collections/' + id, request, true, true);
+    async putCollection(organizationId: string, id: string, request: CollectionRequest): Promise<CollectionResponse> {
+        const r = await this.send('PUT', '/organizations/' + organizationId + '/collections/' + id,
+            request, true, true);
         return new CollectionResponse(r);
     }
 
-    deleteCollection(id: string): Promise<any> {
-        return this.send('DELETE', '/collections/' + id, null, true, false);
+    deleteCollection(organizationId: string, id: string): Promise<any> {
+        return this.send('DELETE', '/organizations/' + organizationId + '/collections/' + id, null, true, false);
     }
 
     // Groups APIs
@@ -416,18 +417,18 @@ export class ApiService implements ApiServiceAbstraction {
         return new ListResponse(r, GroupUserResponse);
     }
 
-    async postGroup(request: GroupRequest): Promise<GroupResponse> {
-        const r = await this.send('POST', '/groups', request, true, true);
+    async postGroup(organizationId: string, request: GroupRequest): Promise<GroupResponse> {
+        const r = await this.send('POST', '/organizations/' + organizationId + '/groups', request, true, true);
         return new GroupResponse(r);
     }
 
-    async putGroup(id: string, request: GroupRequest): Promise<GroupResponse> {
-        const r = await this.send('PUT', '/groups/' + id, request, true, true);
+    async putGroup(organizationId: string, id: string, request: GroupRequest): Promise<GroupResponse> {
+        const r = await this.send('PUT', '/organizations/' + organizationId + '/groups/' + id, request, true, true);
         return new GroupResponse(r);
     }
 
-    deleteGroup(id: string): Promise<any> {
-        return this.send('DELETE', '/groups/' + id, null, true, false);
+    deleteGroup(organizationId: string, id: string): Promise<any> {
+        return this.send('DELETE', '/organizations/' + organizationId + '/groups/' + id, null, true, false);
     }
 
     // Organization User APIs