Merge pull request #43 from hwgilbert16/develop

v1.0.6 Release

Author: hwgilbert16

.eslintrc.json

@@ -46,7 +46,8 @@
         "max-len": "off",
         "require-jsdoc": "off",
         "camelcase": ["error", { "allow": ["jwt_decode"] }],
-        "valid-jsdoc": "off"
+        "valid-jsdoc": "off",
+        "linebreak-style": ["error", "unix"]
       }
     },
     {

.github/workflows/docker.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           node-version: 'lts/Hydrogen'
 
-      - name: Install dependencies and run migrations
+      - name: Install dependencies and generate Prisma types
         run: |
           npm install --legacy-peer-deps
           npm run generate

.github/workflows/test.yml

@@ -12,16 +12,16 @@ jobs:
         with:
           node-version: 'lts/Hydrogen'
 
-      - name: Install dependencies and run migrations
+      - name: Install dependencies and generate Prisma types
         run: |
           npm install --legacy-peer-deps
           npm run generate
 
-      - name: Build website and lint
+      - name: Build and lint
         run: |
           npm run build
           npm run lint
 
       - name: Run tests
-        run: npx nx test api
+        run: npm run test
 

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.3-labs
-FROM node:18
+FROM node:lts-alpine3.18
 
 ARG NODE_ENV
 ARG DATABASE_PASSWORD

apps/api/src/app/auth/auth.controller.spec.ts

@@ -11,6 +11,7 @@ import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
 import { MailService } from "../providers/mail/mail.service";
 import { Request, Response } from "express";
 import { HttpException } from "@nestjs/common";
+import { ApiResponseOptions } from "@scholarsome/shared";
 
 describe("AuthController", () => {
   let authController: AuthController;
@@ -73,6 +74,7 @@ describe("AuthController", () => {
 
               return {};
             },
+            setLoginCookies: jest.fn(),
             validateRecaptcha: (s: string) => {
               switch (s) {
                 case "true":
@@ -168,7 +170,7 @@ describe("AuthController", () => {
 
       expect(res.status).toHaveBeenCalledWith(401);
       expect(result).toEqual({
-        status: "fail",
+        status: ApiResponseOptions.Fail,
         message: "Invalid reset token"
       });
     });
@@ -185,7 +187,7 @@ describe("AuthController", () => {
         }
       });
       expect(result).toEqual({
-        status: "success",
+        status: ApiResponseOptions.Success,
         data: {}
       });
     });
@@ -238,7 +240,7 @@ describe("AuthController", () => {
       const result = await authController.sendReset({ email: "true" });
 
       expect(result).toEqual({
-        status: "success",
+        status: ApiResponseOptions.Success,
         data: null
       });
     });
@@ -277,7 +279,7 @@ describe("AuthController", () => {
       const result = await authController.verifyEmail({ token: "" }, res);
 
       expect(result).toEqual({
-        status: "fail",
+        status: ApiResponseOptions.Fail,
         message: "Invalid token"
       });
     });
@@ -291,6 +293,23 @@ describe("AuthController", () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any as Response;
 
+    it("should return a normal response body", async () => {
+      const dto = {
+        username: "false",
+        email: "false",
+        password: "b",
+        confirmPassword: "b",
+        recaptchaToken: "a"
+      };
+
+      const result = await authController.register(dto, res);
+
+      expect(result).toEqual({
+        status: ApiResponseOptions.Success,
+        data: null
+      });
+    });
+
     it("should send HTTP 409 if user already exists", async () => {
       const dto = {
         username: "true",
@@ -304,7 +323,7 @@ describe("AuthController", () => {
 
       expect(res.status).toHaveBeenCalledWith(409);
       expect(result).toEqual({
-        status: "fail",
+        status: ApiResponseOptions.Fail,
         message: "Email already exists"
       });
     });
@@ -328,7 +347,7 @@ describe("AuthController", () => {
       });
     });
 
-    it("should not send email if email not enabled", async () => {
+    it("should set login cookies", async () => {
       const dto = {
         username: "false",
         email: "false",
@@ -337,13 +356,9 @@ describe("AuthController", () => {
         recaptchaToken: "a"
       };
 
-      const result = await authController.register(dto, res);
+      await authController.register(dto, res);
 
-      expect(mailService.sendEmailConfirmation).toHaveBeenCalledWith(dto.email);
-      expect(result).toEqual({
-        status: "success",
-        data: { confirmEmail: false }
-      });
+      expect(authService.setLoginCookies).toHaveBeenCalled();
     });
   });
 
@@ -366,7 +381,7 @@ describe("AuthController", () => {
 
       expect(res.status).toHaveBeenCalledWith(401);
       expect(result).toEqual({
-        status: "fail",
+        status: ApiResponseOptions.Fail,
         message: "Incorrect email or password"
       });
     });
@@ -420,22 +435,7 @@ describe("AuthController", () => {
 
       await authController.login(dto, res);
 
-      expect(res.cookie).toHaveBeenNthCalledWith(1, "verified", "", {
-        httpOnly: false,
-        expires: expect.any(Date)
-      });
-      expect(res.cookie).toHaveBeenNthCalledWith(2, "refresh_token", {}, {
-        httpOnly: true,
-        expires: expect.any(Date)
-      });
-      expect(res.cookie).toHaveBeenNthCalledWith(3, "access_token", {}, {
-        httpOnly: true,
-        expires: expect.any(Date)
-      });
-      expect(res.cookie).toHaveBeenNthCalledWith(4, "authenticated", true, {
-        httpOnly: false,
-        expires: expect.any(Date)
-      });
+      expect(authService.setLoginCookies).toHaveBeenCalled();
     });
   });