Fix some small things

panoratech · Sep 13, 2024 · 4409e9d · 4409e9d
1 parent 74fac19
commit 4409e9d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/packages/api/src/filestorage/folder/services/sharepoint/index.ts b/packages/api/src/filestorage/folder/services/sharepoint/index.ts
@@ -66,6 +66,7 @@ export class SharepointService implements IFolderService {
         statusCode: 201,
       };
     } catch (error) {
+      console.log(error.response?.data);
       throw error;
     }
   }

diff --git a/packages/api/src/filestorage/group/services/onedrive/index.ts b/packages/api/src/filestorage/group/services/onedrive/index.ts
@@ -19,7 +19,7 @@ export class OnedriveService implements IGroupService {
     private registry: ServiceRegistry,
   ) {
     this.logger.setContext(
-      `${FileStorageObject.group.toUpperCase()}:${OnedriveService.name}`,
+      FileStorageObject.group.toUpperCase() + ':' + OnedriveService.name,
     );
     this.registry.registerService('onedrive', this);
   }
@@ -34,12 +34,7 @@ export class OnedriveService implements IGroupService {
           vertical: 'filestorage',
         },
       });
-
-      // remove /sites/site_id from account_url
-      const url = connection.account_url.replace(/\/sites\/.+$/, '');
-
-      // ref: https://learn.microsoft.com/en-us/graph/api/group-list?view=graph-rest-1.0&tabs=http
-      const resp = await axios.get(`${url}/groups`, {
+      const resp = await axios.get(`${connection.account_url}/v1.0/groups`, {
         headers: {
           'Content-Type': 'application/json',
           Authorization: `Bearer ${this.cryptoService.decrypt(

diff --git a/packages/api/src/filestorage/group/services/onedrive/mappers.ts b/packages/api/src/filestorage/group/services/onedrive/mappers.ts
@@ -76,7 +76,7 @@ export class OnedriveGroupMapper implements IGroupMapper {
       name: group.mailNickname,
       remote_was_deleted: group.deletedDateTime !== null,
       field_mappings,
-      users: null,
+      users: [],
     };
   }
 }
diff --git a/packages/api/src/filestorage/group/services/sharepoint/index.ts b/packages/api/src/filestorage/group/services/sharepoint/index.ts
@@ -19,7 +19,7 @@ export class SharepointService implements IGroupService {
     private registry: ServiceRegistry,
   ) {
     this.logger.setContext(
-      FileStorageObject.group.toUpperCase() + ':' + SharepointService.name,
+      `${FileStorageObject.group.toUpperCase()}:${SharepointService.name}`,
     );
     this.registry.registerService('sharepoint', this);
   }
@@ -34,7 +34,11 @@ export class SharepointService implements IGroupService {
           vertical: 'filestorage',
         },
       });
-      const resp = await axios.get(`${connection.account_url}/groups`, {
+      // remove /sites/site_id from account_url
+      const url = connection.account_url.replace(/\/sites\/.+$/, '');
+
+      // ref: https://learn.microsoft.com/en-us/graph/api/user-list?view=graph-rest-1.0&tabs=http
+      const resp = await axios.get(`${url}/groups`, {
         headers: {
           'Content-Type': 'application/json',
           Authorization: `Bearer ${this.cryptoService.decrypt(

diff --git a/packages/api/src/filestorage/group/services/sharepoint/mappers.ts b/packages/api/src/filestorage/group/services/sharepoint/mappers.ts
@@ -76,7 +76,7 @@ export class SharepointGroupMapper implements IGroupMapper {
       name: group.mailNickname,
       remote_was_deleted: group.deletedDateTime !== null,
       field_mappings,
-      users: null,
+      users: [],
     };
   }
 }
diff --git a/packages/api/src/filestorage/permission/services/sharepoint/index.ts b/packages/api/src/filestorage/permission/services/sharepoint/index.ts
@@ -19,7 +19,7 @@ export class SharepointService implements IPermissionService {
     private registry: ServiceRegistry,
   ) {
     this.logger.setContext(
-      FileStorageObject.permission.toUpperCase() + ':' + SharepointService.name,
+      `${FileStorageObject.permission.toUpperCase()}:${SharepointService.name}`,
     );
     this.registry.registerService('sharepoint', this);
   }

diff --git a/packages/api/src/filestorage/sharedlink/services/sharepoint/index.ts b/packages/api/src/filestorage/sharedlink/services/sharepoint/index.ts
@@ -20,7 +20,7 @@ export class SharepointService implements ISharedLinkService {
     private registry: ServiceRegistry,
   ) {
     this.logger.setContext(
-      FileStorageObject.sharedlink.toUpperCase() + ':' + SharepointService.name,
+      `${FileStorageObject.sharedlink.toUpperCase()}:${SharepointService.name}`,
     );
     this.registry.registerService('sharepoint', this);
   }