Merge branch 'bugfix/userID-bugfix' into develop

src/actions/auth/login/index.ts

@@ -69,7 +69,7 @@ const login = async (input: LoginInput): Promise<LoginResult> => {
         {
             companyName: user.companyName,
             fullName: user.fullName,
-            userId: user._id,
+            userID: user._id,
             mail: user.mail
         },
         process.env.JWT_SECRET as string,
@@ -84,7 +84,7 @@ const login = async (input: LoginInput): Promise<LoginResult> => {
         {
             companyName: user.companyName,
             fullName: user.fullName,
-            userId: user._id,
+            userID: user._id,
             mail: user.mail
         },
         process.env.JWT_SECRET as string,
@@ -105,7 +105,7 @@ const login = async (input: LoginInput): Promise<LoginResult> => {
             user: {
                 phoneNumber: user.phoneNumber,
                 companyName: user.companyName,
-                userId: user._id.toString(),
+                userID: user._id.toString(),
                 firstName: user.firstName,
                 lastName: user.lastName,
                 fullName: user.fullName,

src/actions/auth/login/types.ts

@@ -31,7 +31,7 @@ export interface LoginResult {
             firstName?: string;
             fullName?: string;
             lastName?: string;
-            userId?: string;
+            userID?: string;
             mail: string;
         };
     };

src/actions/auth/logout/index.ts

@@ -6,13 +6,13 @@ import {
     LogoutResult
 } from "./types";
 
-const logout = async (userId: string, token: string): Promise<LogoutResult> => {
+const logout = async (userID: string, token: string): Promise<LogoutResult> => {
     try {
-        await User.findByIdAndUpdate(userId, {
+        await User.findByIdAndUpdate(userID, {
             refreshToken: null
         });
 
-        await redis.del(`${userId}`);
+        await redis.del(`${userID}`);
 
         return {
             message: "Logout successful",

src/actions/auth/me/index.ts

@@ -5,9 +5,9 @@ import {
     MeResult
 } from "./types";
 
-const me = async (userId: string): Promise<MeResult> => {
+const me = async (userID: string): Promise<MeResult> => {
     try {
-        const user = await User.findById(userId).select("-password -refreshToken");
+        const user = await User.findById(userID).select("-password -refreshToken");
 
         if (!user) {
             return {
@@ -23,7 +23,7 @@ const me = async (userId: string): Promise<MeResult> => {
                 user: {
                     phoneNumber: user.phoneNumber,
                     companyName: user.companyName,
-                    userId: user._id.toString(),
+                    userID: user._id.toString(),
                     firstName: user.firstName,
                     fullName: user.fullName,
                     lastName: user.lastName,

src/actions/auth/me/types.ts

@@ -5,7 +5,7 @@ export interface MeResult {
         user: {
             phoneNumber: string;
             companyName: string;
-            userId: string;
+            userID: string;
             firstName: string;
             fullName: string;
             lastName: string;