Merge pull request #69 from JupiterOne/INT-9900-0.6.5

Int 9900 0.6.5
JupiterOne · Nov 16, 2023 · 377a6db · 377a6db
2 parents 5856f61 + fff6741
commit 377a6db
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/graph-airwatch",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "A graph conversion tool for https://www.air-watch.com/.",
   "repository": {
     "type": "git",

diff --git a/src/client/index.ts b/src/client/index.ts
@@ -16,6 +16,7 @@ import {
   AirWatchOrganizationGroupsResponse,
   AirwatchDeviceProfileResponse,
   AirwatchProfile,
+  AirwatchProfileDetails,
   AirwatchProfileResponse,
   ResourceIteratee,
 } from './types';
@@ -184,6 +185,19 @@ export default class AirWatchClient {
     );
     return response;
   }
+
+  public async fetchProfilesDetails(
+    profileId: string,
+  ): Promise<AirwatchProfileDetails> {
+    const response: AirwatchProfileDetails =
+      await this.makeRequest<AirwatchProfileDetails>(
+        `/mdm/profiles/${profileId}`,
+        'GET',
+        undefined,
+        '4',
+      );
+    return response;
+  }
   private async makeRequest<T>(
     path: string,
     method: string = 'GET',

diff --git a/src/client/types.ts b/src/client/types.ts
@@ -171,3 +171,40 @@ export interface DeviceProfile {
 export interface ID {
   Value: number;
 }
+
+export interface AirwatchProfileDetails {
+  general: General;
+}
+
+export interface General {
+  ProfileId: number;
+  AfwOemSettingsEnabled: boolean;
+  AfwOemType: number;
+  Name: string;
+  Description: string;
+  ProfileScope: string;
+  Version: number;
+  CreateNewVersion: boolean;
+  AssignmentType: string;
+  ProfileContext: string;
+  EnableProvisioning: boolean;
+  IsActive: boolean;
+  IsManaged: boolean;
+  Password: string;
+  AllowRemoval: string;
+  AssignedSmartGroups: EdSmartGroup[];
+  ExcludedSmartGroups: EdSmartGroup[];
+  ManagedLocationGroupID: number;
+  AssignedGeofenceArea: number[];
+  AssignedSchedule: number[];
+  ExpirationDate: string;
+  ProfileUuid: string;
+  IsProvisionedForOobe: boolean;
+  id: number;
+  uuid: string;
+}
+
+export interface EdSmartGroup {
+  SmartGroupId: number;
+  Name: string;
+}
diff --git a/src/steps/profiles.ts b/src/steps/profiles.ts
@@ -59,33 +59,38 @@ export async function buildDeviceProfileRelationships({
         );
         // 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.
-        logger.info(
-          { objectKeys: response.DeviceProfiles?.length },
-          'TEMP - DeviceProfiles length',
-        );
         for (const profile of response.DeviceProfiles) {
-          logger.info(
-            { objectKeys: Object.keys(profile) },
-            'TEMP - profileKeys',
-          );
+          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;
+          }
           if (
             response.DeviceId.Uuid &&
-            profile.Uuid &&
+            profileUUid &&
             jobState.hasKey(response.DeviceId.Uuid) &&
-            jobState.hasKey(profile.Uuid)
+            jobState.hasKey(profileUUid)
           ) {
             await jobState.addRelationship(
               createDirectRelationship({
                 _class: DEVICE_PROFILE_REATIONSHIP_CLASS,
                 fromKey: response.DeviceId.Uuid,
                 fromType: DEVICE_ENTITY_TYPE,
-                toKey: profile.Uuid,
+                toKey: profileUUid,
                 toType: PROFILE_ENTITY_TYPE,
               }),
             );
           } else {
             logger.info(
-              { fromKey: response.DeviceId.Uuid, toKey: profile.Uuid },
+              { fromKey: response.DeviceId.Uuid, toKey: profileUUid },
               'Could not create a relationship',
             );
           }