Merge pull request #42 from ctrl-hub/update-group-model-and-service

Update group model and service

Author: jgreaves8

dist/index.js

@@ -360,11 +360,11 @@ class Group extends BaseModel {
     super(data);
     this.name = data?.attributes?.name ?? data?.name ?? "";
     this.description = data?.attributes?.description ?? data?.description ?? "";
-    this.bindings = data?.attributes?.bindings ?? [];
+    this.bindings = data?.attributes?.bindings ?? data?.bindings ?? [];
   }
   jsonApiMapping() {
     return {
-      attributes: ["name", "description"],
+      attributes: ["name", "description", "bindings"],
       relationships: {}
     };
   }
@@ -1618,19 +1618,6 @@ class GroupsService extends BaseService {
   constructor(client) {
     super(client, "/v3/orgs/:orgId/iam/groups");
   }
-  async deleteBinding(groupId, bindingId) {
-    let deleteEndpoint = this.endpoint + "/" + groupId + "/bindings/" + bindingId;
-    return await this.client.makeDeleteRequest(deleteEndpoint);
-  }
-  async createBinding(groupId, body) {
-    let createBindingEndpoint = this.endpoint + "/" + groupId + "/bindings";
-    return await this.client.makePostRequest(createBindingEndpoint, {
-      data: {
-        type: "bindings",
-        attributes: JSON.parse(body)
-      }
-    });
-  }
 }
 
 // src/services/VehiclesService.ts

dist/models/Group.d.ts

@@ -9,6 +9,7 @@ type Binding = {
         rules: {
             type: string;
             operator: string;
+            key: string;
             value: string;
         }[];
     };

dist/models/Group.js

@@ -9,11 +9,11 @@ export class Group extends BaseModel {
         super(data);
         this.name = data?.attributes?.name ?? data?.name ?? '';
         this.description = data?.attributes?.description ?? data?.description ?? '';
-        this.bindings = data?.attributes?.bindings ?? [];
+        this.bindings = data?.attributes?.bindings ?? data?.bindings ?? [];
     }
     jsonApiMapping() {
         return {
-            attributes: ['name', 'description'],
+            attributes: ['name', 'description', 'bindings'],
             relationships: {},
         };
     }

dist/services/GroupService.d.ts

@@ -3,6 +3,4 @@ import { Client } from "../Client";
 import { Group } from "../models/Group";
 export declare class GroupsService extends BaseService<Group> {
     constructor(client: Client);
-    deleteBinding(groupId: string, bindingId: string): Promise<any>;
-    createBinding(groupId: string, body: string): Promise<any>;
 }

dist/services/GroupService.js

@@ -5,17 +5,4 @@ export class GroupsService extends BaseService {
     constructor(client) {
         super(client, "/v3/orgs/:orgId/iam/groups");
     }
-    async deleteBinding(groupId, bindingId) {
-        let deleteEndpoint = this.endpoint + '/' + groupId + '/bindings/' + bindingId;
-        return await this.client.makeDeleteRequest(deleteEndpoint);
-    }
-    async createBinding(groupId, body) {
-        let createBindingEndpoint = this.endpoint + '/' + groupId + '/bindings';
-        return await this.client.makePostRequest(createBindingEndpoint, {
-            data: {
-                type: 'bindings',
-                attributes: JSON.parse(body)
-            }
-        });
-    }
 }