Merge branch 'main' of https://github.com/NeuronCore/WoW-CMS

NeuronCore · Jul 20, 2023 · 7ebfe5b · 7ebfe5b
2 parents 484aefe + 14fd99e
commit 7ebfe5b
Show file tree

Hide file tree

Showing 8 changed files with 675 additions and 13 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -66,7 +66,7 @@ Contributions are what make the open source community such an amazing place to b
 
 ## License
 
-[//]: # (The WoW-CMS source is released under the [GNU AGPL v3]&#40;https://github.com/NeuronCore/WoW-CMS/blob/main/LICENSE&#41;)
+- The WoW-CMS source is released under the [GNU AGPL v3](https://github.com/NeuronCore/WoW-CMS/blob/main/LICENSE)
 
 ## Links
 

diff --git a/LICENSE b/LICENSE
diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json
@@ -15,6 +15,10 @@
         "isolatedModules": true,
         "jsx": "preserve",
         "incremental": true,
+        "removeComments": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "allowUnreachableCode": true,
         "baseUrl": ".",
         "paths": { "@/*": ["./src/*"] }
     },

diff --git a/apps/server/src/blog/blog.service.ts b/apps/server/src/blog/blog.service.ts
@@ -15,10 +15,7 @@ export class BlogService
 {
     private logger: Logger = new Logger(BlogService.name);
 
-    constructor(
-        @Inject('AUTH_DATABASE') private authDatabase: Pool,
-        @Inject('WEB_DATABASE') private webDatabase: Pool
-    )
+    constructor(@Inject('WEB_DATABASE') private webDatabase: Pool)
     { }
 
     public async create(accountID: number, createBlogDto: CreateBlogDto, thumbnail: Express.Multer.File)

diff --git a/apps/server/src/payment/payment.gateway.ts b/apps/server/src/payment/payment.gateway.ts
@@ -13,7 +13,7 @@ export abstract class PaymentGateway
 
 export class ZarinPalGateway implements PaymentGateway
 {
-    constructor(private authDatabase: Pool, private webDatabase: Pool)
+    constructor(private webDatabase: Pool)
     { }
 
     public async request(accountID: number, requestDto: RequestDto, response: Response)

diff --git a/apps/server/src/payment/payment.service.ts b/apps/server/src/payment/payment.service.ts
@@ -10,18 +10,15 @@ import { RequestDto } from '@/payment/dto/request.dto';
 @Injectable()
 export class PaymentService
 {
-    constructor(
-        @Inject('AUTH_DATABASE') private authDatabase: Pool,
-        @Inject('WEB_DATABASE') private webDatabase: Pool
-    )
+    constructor(@Inject('WEB_DATABASE') private webDatabase: Pool)
     { }
 
     public async request(accountID: number, requestDto: RequestDto, response: Response)
     {
         switch (Object.values(PaymentMethod).join())
         {
             case requestDto.paymentMethod:
-                await new ZarinPalGateway(this.authDatabase, this.webDatabase).request(accountID, requestDto, response);
+                await new ZarinPalGateway(this.webDatabase).request(accountID, requestDto, response);
                 break;
             default:
                 return response.status(HttpStatus.BAD_GATEWAY).json({ statusCode: HttpStatus.BAD_GATEWAY, message: 'Unsupported payment method!' });
@@ -33,7 +30,7 @@ export class PaymentService
         switch (Object.values(PaymentMethod).join())
         {
             case request.query.gateway:
-                await new ZarinPalGateway(this.authDatabase, this.webDatabase).verify(request, response);
+                await new ZarinPalGateway(this.webDatabase).verify(request, response);
                 break;
             default:
                 return response.status(HttpStatus.BAD_GATEWAY).json({ statusCode: HttpStatus.BAD_GATEWAY, message: 'Unsupported payment method!' });

diff --git a/apps/server/src/utils/email.util.ts b/apps/server/src/utils/email.util.ts
@@ -60,7 +60,7 @@ export class Email
     {
         const template =
         `
-            <h1>Forgot your password?</h1>
+            <h1>${ this.username } Forgot your password?</h1>
             <p>Submit a patch request with your new password and password confirm to: <a href='${ this.url }'>Reset my password</a></p>
             <p>Your password reset token (valid for only 10 minutes)</p>
             <p>If you didn't forget your password, please ignore this email</p>

diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json
@@ -18,6 +18,9 @@
         "strictBindCallApply": false,
         "forceConsistentCasingInFileNames": false,
         "noFallthroughCasesInSwitch": false,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "allowUnreachableCode": true,
         "paths": { "@/*": ["./src/*"] }
     }
 }