Skip to content

Commit d95255e

Browse files
committed
Fix googledrive permission bugs
1 parent 9fa492d commit d95255e

File tree

5 files changed

+74
-83
lines changed

5 files changed

+74
-83
lines changed

packages/api/src/@core/utils/types/original/original.file-storage.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { GoogledrivePermissionInput, GoogledrivePermissionOutput } from '@filestorage/permission/services/googledrive/types';
2+
13
import {
24
DropboxGroupInput,
35
DropboxGroupOutput,
@@ -147,7 +149,7 @@ export type OriginalFolderInput =
147149
export type OriginalPermissionInput =
148150
| any
149151
| OnedrivePermissionInput
150-
| SharepointPermissionInput;
152+
| SharepointPermissionInput | GoogledrivePermissionInput;
151153

152154
/* shared link */
153155
export type OriginalSharedLinkInput = any;
@@ -209,7 +211,7 @@ export type OriginalFolderOutput =
209211
export type OriginalPermissionOutput =
210212
| any
211213
| OnedrivePermissionOutput
212-
| SharepointPermissionOutput;
214+
| SharepointPermissionOutput | GoogledrivePermissionOutput;
213215

214216
/* shared link */
215217
export type OriginalSharedLinkOutput = any;

packages/api/src/filestorage/permission/permission.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { GoogledrivePermissionMapper } from './services/googledrive/mappers';
2+
import { GoogledriveService } from './services/googledrive';
13
import { SharepointPermissionMapper } from './services/sharepoint/mappers';
24
import { SharepointService } from './services/sharepoint';
35
import { OnedrivePermissionMapper } from './services/onedrive/mappers';
@@ -37,6 +39,8 @@ import { Utils } from '@filestorage/@lib/@utils';
3739
SharepointPermissionMapper,
3840
OnedriveService,
3941
OnedrivePermissionMapper,
42+
GoogledriveService,
43+
GoogledrivePermissionMapper,
4044
],
4145
exports: [SyncService],
4246
})

packages/api/src/filestorage/permission/services/googledrive/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { google } from 'googleapis';
1313
import { OAuth2Client } from 'google-auth-library';
1414

1515
@Injectable()
16-
export class GoogleDriveService implements IPermissionService {
16+
export class GoogledriveService implements IPermissionService {
1717
constructor(
1818
private prisma: PrismaService,
1919
private logger: LoggerService,
@@ -23,14 +23,14 @@ export class GoogleDriveService implements IPermissionService {
2323
this.logger.setContext(
2424
FileStorageObject.permission.toUpperCase() +
2525
':' +
26-
GoogleDriveService.name,
26+
GoogledriveService.name,
2727
);
2828
this.registry.registerService('googledrive', this);
2929
}
3030

3131
async sync(
3232
data: SyncParam,
33-
): Promise<ApiResponse<GoogleDrivePermissionOutput[]>> {
33+
): Promise<ApiResponse<GoogledrivePermissionOutput[]>> {
3434
try {
3535
const { linkedUserId, extra } = data;
3636
// TODO: Determine the source of 'extra'
@@ -88,14 +88,14 @@ export class GoogleDriveService implements IPermissionService {
8888
});
8989
const drive = google.drive({ version: 'v3', auth });
9090

91-
const resp = await drive.permissions.list({
91+
const resp: any = await drive.permissions.list({
9292
fileId: remote_id,
9393
fields: 'permissions(id, emailAddress, role, type, expirationTime)',
9494
supportsAllDrives: true,
9595
});
9696

9797
return {
98-
data: resp.data.permissions as GoogleDrivePermissionOutput[],
98+
data: resp.data.permissions as GoogledrivePermissionOutput[],
9999
message: 'Synced Google Drive permissions!',
100100
statusCode: 200,
101101
};

0 commit comments

Comments
 (0)