Skip to content

Commit

Permalink
βœ” Refactor ~ πŸ€·β€β™‚οΈ
Browse files Browse the repository at this point in the history
  • Loading branch information
bifeldy committed Jul 6, 2023
1 parent cb2a184 commit 179b4a3
Show file tree
Hide file tree
Showing 26 changed files with 30 additions and 32 deletions.
2 changes: 1 addition & 1 deletion dist/fansubid/browser/ngsw.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"configVersion": 1,
"timestamp": 1688639731723,
"timestamp": 1688654909000,
"index": "/index.html",
"assetGroups": [
{
Expand Down
2 changes: 1 addition & 1 deletion dist/fansubid/server/main.js

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions src/api/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,15 @@ import { RegisterMiddleware } from './middlewares/register.middleware';
import { LogoutMiddleware } from './middlewares/logout.middleware';
import { CacheMiddleware } from './middlewares/cache.middleware';

import { FilterApiKeyAccessGuard } from './guards/filter-api-key-access.guard';
import { HttpExceptionFilter } from './filters/http-exception.filter';

import { RateLimitGuard } from './guards/rate-limit.guard';
import { RolesGuard } from './guards/roles.guard';
import { VerifiedGuard } from './guards/verified.guard';
import { VerifiedOnlyGuard } from './guards/verified-only.guard';

import { ExcludeFieldInterceptor } from './interceptors/exclude-field.interceptor';
import { ReqResInterceptor } from './interceptors/req-res.interceptor';

import { HttpExceptionFilter } from './filters/http-exception.filter';

import { SocketIoGateway } from './gateways/socket-io.gateway';

import { ApiService } from './services/api.service';
Expand Down Expand Up @@ -224,12 +223,12 @@ import { UserService } from './repository/user.service';
VerifySosmedController
],
providers: [
// Global Lifecycle - Middleware => Guards => Interceptors => Controller
// Global Lifecycle - Exception Filter => Middleware => Guards => Interceptors => Controller
// https://docs.nestjs.com/faq/request-lifecycle
{ provide: APP_GUARD, useClass: FilterApiKeyAccessGuard },
{ provide: APP_FILTER, useClass: HttpExceptionFilter },
{ provide: APP_GUARD, useClass: RateLimitGuard },
{ provide: APP_GUARD, useClass: RolesGuard },
{ provide: APP_GUARD, useClass: VerifiedGuard },
{ provide: APP_GUARD, useClass: VerifiedOnlyGuard },
{ provide: APP_INTERCEPTOR, useClass: ExcludeFieldInterceptor },
{ provide: APP_INTERCEPTOR, useClass: ReqResInterceptor },
{
Expand All @@ -246,7 +245,6 @@ import { UserService } from './repository/user.service';
].join(' ~ ');
})
},
{ provide: APP_FILTER, useClass: HttpExceptionFilter },
// Gateway - Socket.IO
SocketIoGateway,
// Services - Service(s) Aren't Available Globally Like Angular
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/api-key.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { CONSTANTS } from '../../constants';
import { RoleModel, UserModel } from '../../models/req-res.model';

import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { ApiKeyService } from '../repository/api-key.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/attachment.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { AttachmentService } from '../repository/attachment.service';
import { TempAttachmentService } from '../repository/temp-attachment.service';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/banned.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { DiscordService } from '../services/discord.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/berkas.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { CONSTANTS } from '../../constants';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { RoleModel, UserModel } from '../../models/req-res.model';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/comment.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { KomentarService } from '../repository/komentar.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/ddl-file.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { environment } from '../../environments/api/environment';
import { RoleModel } from '../../models/req-res.model';

import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { AttachmentService } from '../repository/attachment.service';
import { DdlFileService } from '../repository/ddl-file';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/fansub-/fansub-dns.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { FansubModel, RoleModel, UserModel } from '../../../models/req-res.model

import { FilterApiKeyAccess } from '../../decorators/filter-api-key-access.decorator';
import { Roles } from '../../decorators/roles.decorator';
import { VerifiedOnly } from '../../decorators/verified.decorator';
import { VerifiedOnly } from '../../decorators/verified-only.decorator';

import { FansubService } from '../../repository/fansub.service';
import { FansubMemberService } from '../../repository/fansub-member.service';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/fansub-/fansub-member.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Equal, ILike } from 'typeorm';

import { FilterApiKeyAccess } from '../../decorators/filter-api-key-access.decorator';
import { Roles } from '../../decorators/roles.decorator';
import { VerifiedOnly } from '../../decorators/verified.decorator';
import { VerifiedOnly } from '../../decorators/verified-only.decorator';

import { environment } from '../../../environments/api/environment';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/fansub.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { DiscordService } from '../services/discord.service';
import { SocketIoService } from '../services/socket-io.service';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/information.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { InformationModel, RoleModel, UserModel } from '../../models/req-res.mod

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { InformationService } from '../repository/information.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/likedislike.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { LikeAndDislikeModel, RoleModel, UserModel } from '../../models/req-res.

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { BerkasService } from '../repository/berkas.service';
import { FansubService } from '../repository/fansub.service';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/mail-/mail-inbox.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { environment } from '../../../environments/api/environment';
import { RoleModel, UserModel } from '../../../models/req-res.model';

import { Roles } from '../../decorators/roles.decorator';
import { VerifiedOnly } from '../../decorators/verified.decorator';
import { VerifiedOnly } from '../../decorators/verified-only.decorator';

import { MailboxService } from '../../repository/mailbox.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/mail-/mail-outbox.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { environment } from '../../../environments/api/environment';
import { RoleModel, UserModel } from '../../../models/req-res.model';

import { Roles } from '../../decorators/roles.decorator';
import { VerifiedOnly } from '../../decorators/verified.decorator';
import { VerifiedOnly } from '../../decorators/verified-only.decorator';

import { MailboxService } from '../../repository/mailbox.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/mail.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { MailboxService } from '../repository/mailbox.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/news.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { NewsService } from '../repository/news.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/nihongo.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { NihongoService } from '../repository/nihongo.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/notification.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { NotificationModel, RoleModel, UserModel } from '../../models/req-res.mo

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { NotificationService } from '../repository/notification.service';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/project-type.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RoleModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { BerkasService } from '../repository/berkas.service';
import { ProjectTypeService } from '../repository/project-type.service';
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/promote.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { environment } from '../../environments/api/environment';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { RoleModel, UserModel } from '../../models/req-res.model';

Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/task-cron-job.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RoleModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

@ApiExcludeController()
@Controller('/task-cron-job')
Expand Down
2 changes: 1 addition & 1 deletion src/api/controllers/user.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RoleModel, UserModel } from '../../models/req-res.model';

import { FilterApiKeyAccess } from '../decorators/filter-api-key-access.decorator';
import { Roles } from '../decorators/roles.decorator';
import { VerifiedOnly } from '../decorators/verified.decorator';
import { VerifiedOnly } from '../decorators/verified-only.decorator';

import { ApiKeyService } from '../repository/api-key.service';
import { BerkasService } from '../repository/berkas.service';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { UserModel } from '../../models/req-res.model';
import { GlobalService } from '../services/global.service';

@Injectable()
export class VerifiedGuard implements CanActivate {
export class VerifiedOnlyGuard implements CanActivate {

constructor(
private reflector: Reflector,
Expand Down

0 comments on commit 179b4a3

Please sign in to comment.