Merge pull request #13 from Devvyky/fixes

Fixes
Devvyky · Aug 5, 2022 · da36fbf · da36fbf
2 parents fe41e69 + e4d8ac5
commit da36fbf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,19 +12,13 @@ RUN npm run build
 
 FROM node:16-alpine as production
 
-# ARG NODE_ENV=production
-# ENV NODE_ENV=${NODE_ENV}
-
 WORKDIR /usr/src/app
 
 COPY package*.json ./
 
 RUN npm install
 
 COPY --from=build /usr/src/app/dist ./dist
-# COPY .env ./
 
-# ENV PORT 3000
-# EXPOSE ${PORT}
 
 CMD [ "node", "dist/src/app.js" ]
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
-
 # League API
 
-A small project that allow admins to creat teams, fixtures, etc
-
+A small project that allow admins to create teams, fixtures, etc
 
 ## Run Locally
 
@@ -30,7 +28,6 @@ Start the server
   npm run start
 ```
 
-
 ## Environment Variables
 
 Create a `.env` file and replace the contents of `example.env` inside your `.env` file
@@ -43,3 +40,6 @@ To run tests, run the following command
   npm run test
 ```
 
+## Documentation
+
+[Documentation](https://documenter.getpostman.com/view/9742220/VUjLLSoa)
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "start": "npm run build && node dist/src/app.js",
     "dev": "NODE_ENV=development nodemon src/app.ts",
     "build": "rimraf ./dist && tsc -p .",
-    "test": "jest --watch"
+    "test": "jest --watchAll"
   },
   "author": "",
   "license": "ISC",

diff --git a/src/app.ts b/src/app.ts
@@ -25,9 +25,6 @@ const app: Application = express();
 let RedisStore = connectRedis(session);
 const redisClient = new Redis(configuration().redis.url);
 
-// if running behind a proxy
-// app.set('trust proxy', 1)
-
 // Set Security Headers
 app.use(helmet());
 
@@ -55,10 +52,9 @@ app.use(
     resave: false,
     saveUninitialized: false,
     cookie: {
-      secure: configuration().env === 'production' ? true : 'auto',
+      secure: configuration().env === 'staging' ? true : 'auto',
       httpOnly: true,
-      // expires:
-      sameSite: configuration().env === 'production' ? 'none' : 'lax',
+      sameSite: configuration().env === 'staging' ? 'none' : 'lax',
     },
   })
 );
@@ -89,7 +85,6 @@ app.listen(port, async () => {
 });
 
 app.all('*', (req, res, next) => {
-  configuration().env;
   next(new AppError(`Can't find ${req.originalUrl} on this server`, 404));
 });
 

diff --git a/tests/user.test.ts → src/tests/user.test.ts b/tests/user.test.ts → src/tests/user.test.ts
@@ -1,8 +1,8 @@
 import mongoose from 'mongoose';
 import request from 'supertest';
 
-import app from '../src/app';
-import * as authService from '../src/user/services/authService';
+import app from '../app';
+import * as authService from '../user/services/authService';
 
 const userId = new mongoose.Types.ObjectId().toString();
 const userPayload = {
@@ -58,5 +58,5 @@ describe('User Test', () => {
   // the email and password gets validation
   // verify that the handler handles any errors
 
-  // Create a user session
+  // login user
 });
diff --git a/src/user/controllers/authController.ts b/src/user/controllers/authController.ts
@@ -1,7 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import * as _ from 'lodash';
 import { omit } from 'lodash';
-import { configuration } from '../../../config/default';
 
 import logger from '../../logger';
 import catchAsync from '../../utils/catchAsync';
@@ -12,7 +10,10 @@ import { login, signup } from '../services/authService';
 export const userSignup = catchAsync(
   async (req: Request, res: Response, next: NextFunction): Promise<void> => {
     const { name, email, password }: User = req.body;
-    const isAdmin: boolean = _.isBoolean(req.query.admin);
+    const { admin } = req.query;
+
+    const isAdmin = (admin as string).toLowerCase() === 'false' ? false : true;
+
     const payload = {
       name,
       email,
@@ -22,7 +23,7 @@ export const userSignup = catchAsync(
     await signup(payload, isAdmin);
 
     res.status(201).json({
-      message: 'User signup successful',
+      message: isAdmin ? 'Admin signup successful' : 'User signup successful',
       status: 'success',
     });
   }