From 1ce50bbb04326af9bb2bd189c8f0163ba425ec9b Mon Sep 17 00:00:00 2001
From: Gonzalo Avalos Ribas <gonzaloavalosribas@Gonzalos-MacBook-Pro.local>
Date: Thu, 16 Nov 2023 15:10:47 -0300
Subject: [PATCH] Merge

---
 docs/jupiterone.md     |  2 +-
 src/client/index.ts    | 22 +++++++++++----------
 src/client/types.ts    | 31 +++++++++---------------------
 src/steps/constants.ts | 35 ++++++++++++++++++----------------
 src/steps/profiles.ts  | 43 +++++++++++++++++-------------------------
 5 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/docs/jupiterone.md b/docs/jupiterone.md
index 0e94ca3..7424bcd 100644
--- a/docs/jupiterone.md
+++ b/docs/jupiterone.md
@@ -113,7 +113,7 @@ The following relationships are created:
 | `airwatch_account`    | **MANAGES**           | `user_endpoint`       |
 | `airwatch_group`      | **HAS**               | `airwatch_group`      |
 | `airwatch_group`      | **HAS**               | `airwatch_user`       |
-| `user_endpoint`       | **IMPLEMENTS**        | `airwatch_profile`    |
+| `user_endpoint`       | **INSTALLED**         | `airwatch_profile`    |
 | `user_endpoint`       | **HAS**               | `device_user`         |
 
 <!--
diff --git a/src/client/index.ts b/src/client/index.ts
index 8ead627..433a692 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -14,10 +14,10 @@ import {
   AirWatchOrganizationGroup,
   AirWatchOrganizationGroupChild,
   AirWatchOrganizationGroupsResponse,
-  AirwatchDeviceProfileResponse,
   AirwatchProfile,
   AirwatchProfileDetails,
   AirwatchProfileResponse,
+  DevicesForProfile,
   ResourceIteratee,
 } from './types';
 
@@ -174,15 +174,17 @@ export default class AirWatchClient {
       await iteratee(profile);
     }
   }
-  public async fetchProfilesOfDevice(
-    deviceId: string,
-  ): Promise<AirwatchDeviceProfileResponse> {
-    const response: AirwatchDeviceProfileResponse = await this.makeRequest(
-      `/mdm/devices/${deviceId}/profiles`,
-      'GET',
-      undefined,
-      '1',
-    );
+
+  public async fetchDevicesForProfile(
+    profileUuid: string,
+  ): Promise<DevicesForProfile> {
+    const response: DevicesForProfile =
+      await this.makeRequest<DevicesForProfile>(
+        `/mdm/profiles/${profileUuid}/devices`,
+        'GET',
+        undefined,
+        '1',
+      );
     return response;
   }
 
diff --git a/src/client/types.ts b/src/client/types.ts
index ec31dd6..052cb82 100644
--- a/src/client/types.ts
+++ b/src/client/types.ts
@@ -143,33 +143,20 @@ export interface ConfiguredPayload {
   name: string;
   display_key: string;
 }
-export interface AirwatchDeviceProfileResponse {
-  DeviceId: DeviceID;
-  DeviceProfiles: DeviceProfile[];
-  Page: number;
-  PageSize: number;
-  Total: number;
-}
 
-export interface DeviceID {
-  Name: string;
-  Uuid: string;
+export interface DevicesForProfile {
+  profileAssignedDevices: ProfileAssignedDevice[];
+  AdditionalInfo: AdditionalInfo;
+  TotalResults: number;
 }
 
-export interface DeviceProfile {
-  Status: number;
-  Name: string;
-  Description: string;
-  LocationGroupId: object;
-  CurrentVersion: number;
-  AssignmentType: number;
-  InstalledProfileVersion: number;
-  Id: ID;
-  Uuid: string;
+export interface AdditionalInfo {
+  Links: any[];
 }
 
-export interface ID {
-  Value: number;
+export interface ProfileAssignedDevice {
+  Links: any[];
+  uuid: string;
 }
 
 export interface AirwatchProfileDetails {
diff --git a/src/steps/constants.ts b/src/steps/constants.ts
index a4b08e0..695dfa0 100644
--- a/src/steps/constants.ts
+++ b/src/steps/constants.ts
@@ -30,11 +30,12 @@ export const PROFILE_ENTITY_CLASS = ['Configuration'];
 
 export const ACCOUNT_ORGANIZATION_GROUP_RELATIONSHIP_CLASS =
   RelationshipClass.HAS;
-export const ACCOUNT_ORGANIZATION_GROUP_RELATIONSHIP_TYPE = generateRelationshipType(
-  ACCOUNT_ORGANIZATION_GROUP_RELATIONSHIP_CLASS,
-  ACCOUNT_ENTITY_TYPE,
-  ORGANIZATION_GROUP_ENTITY_TYPE,
-);
+export const ACCOUNT_ORGANIZATION_GROUP_RELATIONSHIP_TYPE =
+  generateRelationshipType(
+    ACCOUNT_ORGANIZATION_GROUP_RELATIONSHIP_CLASS,
+    ACCOUNT_ENTITY_TYPE,
+    ORGANIZATION_GROUP_ENTITY_TYPE,
+  );
 
 export const ACCOUNT_DEVICE_RELATIONSHIP_CLASS = RelationshipClass.MANAGES;
 export const ACCOUNT_DEVICE_RELATIONSHIP_TYPE = generateRelationshipType(
@@ -45,11 +46,12 @@ export const ACCOUNT_DEVICE_RELATIONSHIP_TYPE = generateRelationshipType(
 
 export const ORGANIZATION_GROUP_ADMIN_RELATIONSHIP_CLASS =
   RelationshipClass.HAS;
-export const ORGANIZATION_GROUP_ADMIN_RELATIONSHIP_TYPE = generateRelationshipType(
-  ORGANIZATION_GROUP_ADMIN_RELATIONSHIP_CLASS,
-  ORGANIZATION_GROUP_ENTITY_TYPE,
-  ADMIN_ENTITY_TYPE,
-);
+export const ORGANIZATION_GROUP_ADMIN_RELATIONSHIP_TYPE =
+  generateRelationshipType(
+    ORGANIZATION_GROUP_ADMIN_RELATIONSHIP_CLASS,
+    ORGANIZATION_GROUP_ENTITY_TYPE,
+    ADMIN_ENTITY_TYPE,
+  );
 
 export const ORGANIZATION_GROUP_RELATIONSHIP_CLASS = RelationshipClass.HAS;
 export const ORGANIZATION_GROUP_RELATIONSHIP_TYPE = generateRelationshipType(
@@ -60,13 +62,14 @@ export const ORGANIZATION_GROUP_RELATIONSHIP_TYPE = generateRelationshipType(
 
 export const USER_ENDPOINT_DEVICE_USER_RELATIONSHIP_CLASS =
   RelationshipClass.HAS;
-export const USER_ENDPOINT_DEVICE_USER_RELATIONSHIP_TYPE = generateRelationshipType(
-  USER_ENDPOINT_DEVICE_USER_RELATIONSHIP_CLASS,
-  DEVICE_ENTITY_TYPE,
-  DEVICE_USER_ENTITY_TYPE,
-);
+export const USER_ENDPOINT_DEVICE_USER_RELATIONSHIP_TYPE =
+  generateRelationshipType(
+    USER_ENDPOINT_DEVICE_USER_RELATIONSHIP_CLASS,
+    DEVICE_ENTITY_TYPE,
+    DEVICE_USER_ENTITY_TYPE,
+  );
 
-export const DEVICE_PROFILE_REATIONSHIP_CLASS = RelationshipClass.IMPLEMENTS;
+export const DEVICE_PROFILE_REATIONSHIP_CLASS = RelationshipClass.INSTALLED;
 export const DEVICE_PROFILE_REATIONSHIP_TYPE = generateRelationshipType(
   DEVICE_PROFILE_REATIONSHIP_CLASS,
   DEVICE_ENTITY_TYPE,
diff --git a/src/steps/profiles.ts b/src/steps/profiles.ts
index 9c5aeeb..916a170 100644
--- a/src/steps/profiles.ts
+++ b/src/steps/profiles.ts
@@ -51,46 +51,37 @@ export async function buildDeviceProfileRelationships({
 }: IntegrationStepExecutionContext<IntegrationConfig>) {
   const apiClient = createAPIClient(instance.config);
   await jobState.iterateEntities(
-    { _type: DEVICE_ENTITY_TYPE },
-    async (deviceEntity) => {
+    { _type: PROFILE_ENTITY_TYPE },
+    async (profileEntity) => {
       try {
-        const response = await apiClient.fetchProfilesOfDevice(
-          deviceEntity.deviceId! as string,
+        const response = await apiClient.fetchDevicesForProfile(
+          profileEntity._key,
         );
         // we don't have a way to test this - I'm using the model provided by the provider
-        // but its not working. Let's try logging.
-        for (const profile of response.DeviceProfiles) {
-          let profileUUid: string | undefined;
-          if (profile.Uuid) {
-            profileUUid = profile.Uuid;
-          } else if (profile.Id.Value) {
-            const details = await apiClient.fetchProfilesDetails(
-              profile.Id.Value?.toString(),
-            );
-            logger.info(
-              { detailKeys: Object.keys(details.general) },
-              'TEMP - detail keys.',
-            );
-            profileUUid = details.general.uuid;
-          }
+        // Let's try logging.
+        for (const device of response.profileAssignedDevices) {
+          logger.info(
+            { deviceKeys: Object.keys(device) },
+            'TEMP - Keys of device',
+          );
           if (
-            response.DeviceId.Uuid &&
-            profileUUid &&
-            jobState.hasKey(response.DeviceId.Uuid) &&
-            jobState.hasKey(profileUUid)
+            device.uuid &&
+            profileEntity._key &&
+            jobState.hasKey(device.uuid) &&
+            jobState.hasKey(profileEntity._key)
           ) {
             await jobState.addRelationship(
               createDirectRelationship({
                 _class: DEVICE_PROFILE_REATIONSHIP_CLASS,
-                fromKey: response.DeviceId.Uuid,
+                fromKey: device.uuid,
                 fromType: DEVICE_ENTITY_TYPE,
-                toKey: profileUUid,
+                toKey: profileEntity._key,
                 toType: PROFILE_ENTITY_TYPE,
               }),
             );
           } else {
             logger.info(
-              { fromKey: response.DeviceId.Uuid, toKey: profileUUid },
+              { fromKey: device.uuid, toKey: profileEntity._key },
               'Could not create a relationship',
             );
           }