Skip to content

Commit 1a2e424

Browse files
committed
refactor(shares): rename share-resources module
1 parent 0a895bd commit 1a2e424

File tree

11 files changed

+30
-37
lines changed

11 files changed

+30
-37
lines changed

src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { NullUserEmail1752814358259 } from 'omniboxd/migrations/1752814358259-nu
3636
import { AttachmentsModule } from 'omniboxd/attachments/attachments.module';
3737
import { Shares1753866547335 } from 'omniboxd/migrations/1753866547335-shares';
3838
import { SharesModule } from 'omniboxd/shares/shares.module';
39-
import { ShareResourcesModule } from 'omniboxd/share-resources/share-resources.module';
39+
import { SharedResourcesModule } from 'omniboxd/shared-resources/shared-resources.module';
4040
import { ApiKeys1754550165406 } from 'omniboxd/migrations/1754550165406-api-keys';
4141
import { ResourceAttachments1755059371000 } from 'omniboxd/migrations/1755059371000-resource-attachments';
4242
import { AddTagIdsToResources1755248141570 } from 'omniboxd/migrations/1755248141570-add-tag-ids-to-resources';
@@ -85,7 +85,7 @@ export class AppModule implements NestModule {
8585
AttachmentsModule,
8686
SharesModule,
8787
OAuthModule,
88-
ShareResourcesModule,
88+
SharedResourcesModule,
8989
// CacheModule.registerAsync({
9090
// imports: [ConfigModule],
9191
// inject: [ConfigService],

src/attachments/attachments.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { AttachmentsService } from 'omniboxd/attachments/attachments.service';
66
import { MinioModule } from 'omniboxd/minio/minio.module';
77
import { ResourceAttachmentsModule } from 'omniboxd/resource-attachments/resource-attachments.module';
88
import { SharesModule } from 'omniboxd/shares/shares.module';
9-
import { ShareResourcesModule } from 'omniboxd/share-resources/share-resources.module';
9+
import { SharedResourcesModule } from 'omniboxd/shared-resources/shared-resources.module';
1010

1111
@Module({
1212
exports: [AttachmentsService],
@@ -17,7 +17,7 @@ import { ShareResourcesModule } from 'omniboxd/share-resources/share-resources.m
1717
MinioModule,
1818
ResourceAttachmentsModule,
1919
SharesModule,
20-
ShareResourcesModule,
20+
SharedResourcesModule,
2121
],
2222
})
2323
export class AttachmentsModule {}

src/attachments/attachments.service.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ import {
22
encodeFileName,
33
getOriginalFileName,
44
} from 'omniboxd/utils/encode-filename';
5-
import {
6-
ForbiddenException,
7-
Injectable,
8-
Logger,
9-
NotFoundException,
10-
UnauthorizedException,
11-
} from '@nestjs/common';
5+
import { ForbiddenException, Injectable, Logger } from '@nestjs/common';
126
import { Response } from 'express';
137
import { MinioService } from 'omniboxd/minio/minio.service';
148
import { PermissionsService } from 'omniboxd/permissions/permissions.service';
@@ -20,9 +14,7 @@ import {
2014
UploadedAttachmentDto,
2115
} from './dto/upload-attachments-response.dto';
2216
import { SharesService } from 'omniboxd/shares/shares.service';
23-
import { ResourcesService } from 'omniboxd/resources/resources.service';
24-
import * as bcrypt from 'bcrypt';
25-
import { ShareResourcesService } from 'omniboxd/share-resources/share-resources.service';
17+
import { SharedResourcesService } from 'omniboxd/shared-resources/shared-resources.service';
2618

2719
@Injectable()
2820
export class AttachmentsService {
@@ -33,7 +25,7 @@ export class AttachmentsService {
3325
private readonly permissionsService: PermissionsService,
3426
private readonly resourceAttachmentsService: ResourceAttachmentsService,
3527
private readonly sharesService: SharesService,
36-
private readonly shareResourcesService: ShareResourcesService,
28+
private readonly sharedResourcesService: SharedResourcesService,
3729
) {}
3830

3931
async checkPermission(
@@ -201,7 +193,7 @@ export class AttachmentsService {
201193
password,
202194
userId,
203195
);
204-
await this.shareResourcesService.getAndValidateResource(share, resourceId);
196+
await this.sharedResourcesService.getAndValidateResource(share, resourceId);
205197
await this.resourceAttachmentsService.getResourceAttachmentOrFail(
206198
share.namespaceId,
207199
resourceId,

src/share-resources/share-resources.module.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/share-resources/share-resources.controller.ts renamed to src/shared-resources/shared-resources.controller.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { Controller, Get, Param } from '@nestjs/common';
2-
import { ShareResourcesService } from './share-resources.service';
2+
import { SharedResourcesService } from './shared-resources.service';
33
import { SharedResourceDto } from './dto/shared-resource.dto';
44
import { UserId } from 'omniboxd/decorators/user-id.decorator';
55
import { CookieAuth } from 'omniboxd/auth/decorators';
66
import { Cookies } from 'omniboxd/decorators/cookie.decorators';
77
import { SharedResourceMetaDto } from './dto/shared-resource-meta.dto';
88

99
@Controller('api/v1/shares/:shareId/resources')
10-
export class ShareResourcesController {
11-
constructor(private readonly shareResourcesService: ShareResourcesService) {}
10+
export class SharedResourcesController {
11+
constructor(
12+
private readonly sharedResourcesService: SharedResourcesService,
13+
) {}
1214

1315
@CookieAuth({ onAuthFail: 'continue' })
1416
@Get(':resourceId')
@@ -18,7 +20,7 @@ export class ShareResourcesController {
1820
@Cookies('share-password') password: string,
1921
@UserId({ optional: true }) userId?: string,
2022
): Promise<SharedResourceDto> {
21-
return await this.shareResourcesService.getSharedResource(
23+
return await this.sharedResourcesService.getSharedResource(
2224
shareId,
2325
resourceId,
2426
password,
@@ -34,7 +36,7 @@ export class ShareResourcesController {
3436
@Cookies('share-password') password: string,
3537
@UserId({ optional: true }) userId?: string,
3638
): Promise<SharedResourceMetaDto[]> {
37-
return await this.shareResourcesService.getSharedResourceChildren(
39+
return await this.sharedResourcesService.getSharedResourceChildren(
3840
shareId,
3941
resourceId,
4042
password,
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Module } from '@nestjs/common';
2+
import { SharedResourcesController } from './shared-resources.controller';
3+
import { SharedResourcesService } from './shared-resources.service';
4+
import { SharesModule } from 'omniboxd/shares/shares.module';
5+
import { ResourcesModule } from 'omniboxd/resources/resources.module';
6+
7+
@Module({
8+
controllers: [SharedResourcesController],
9+
providers: [SharedResourcesService],
10+
imports: [SharesModule, ResourcesModule],
11+
exports: [SharedResourcesService],
12+
})
13+
export class SharedResourcesModule {}

src/share-resources/share-resources.service.ts renamed to src/shared-resources/shared-resources.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import { SharesService } from 'omniboxd/shares/shares.service';
44
import { SharedResourceDto } from './dto/shared-resource.dto';
55
import { Resource } from 'omniboxd/resources/resources.entity';
66
import { Share } from 'omniboxd/shares/entities/share.entity';
7-
import { PublicShareInfoDto } from './dto/public-share-info.dto';
87
import { SharedResourceMetaDto } from './dto/shared-resource-meta.dto';
98

109
@Injectable()
11-
export class ShareResourcesService {
10+
export class SharedResourcesService {
1211
constructor(
1312
private readonly resourcesService: ResourcesService,
1413
private readonly sharesService: SharesService,

0 commit comments

Comments
 (0)