Merge pull request #12 from PolkadotEducation/artur-login-google

Add loginWithGoogle + user.picture

.env.example

@@ -1,5 +1,5 @@
 NODE_ENV=local
-MONGODB_URI=mongodb://0.0.0.0:27017/doteducation
+MONGODB_URI=mongodb://0.0.0.0:27017/doteducation-local
 SERVER_HOST=0.0.0.0
 SERVER_PORT=4000
 JWT_SECRET=OR5t0v7yk3z7qw77

src/controllers/users.ts

@@ -109,3 +109,24 @@ export const loginUser = async (req: Request, res: Response) => {
     },
   });
 };
+
+export const loginUserWithGoogle = async (req: Request, res: Response) => {
+  try {
+    const { email, name, picture } = req.body;
+    if (!email) return res.status(400).send({ error: { message: "Missing email" } });
+    const user = await UserModel.findOne({ email });
+    if (user) return res.status(200).send({ jwt: user.getAuthToken(true) });
+    else {
+      await UserModel.createUser(email, `google#${email}`, name, " ", picture);
+      const user = await UserModel.findOne({ email });
+      if (user) return res.status(200).send({ jwt: user.getAuthToken(true) });
+    }
+  } catch (e) {
+    console.log(`[ERROR][loginUser] ${JSON.stringify(e)}`);
+  }
+  return res.status(400).send({
+    error: {
+      message: "Invalid login",
+    },
+  });
+};

src/models/User.ts

@@ -18,7 +18,10 @@ class User extends BaseModel {
   @prop({ required: true, type: String })
   public name: string;
 
-  @prop({ required: true, type: String, default: "" })
+  @prop({ required: false, type: String })
+  public picture: string;
+
+  @prop({ required: true, type: String, default: " " })
   public company: string;
 
   @prop({ required: true, type: Boolean, default: false })
@@ -46,6 +49,7 @@ class User extends BaseModel {
     password: string,
     name: string,
     company: string,
+    picture?: string,
     isAdmin?: boolean,
   ): Promise<UserInfo | undefined> {
     try {
@@ -57,7 +61,8 @@ class User extends BaseModel {
         email: email.toLowerCase(),
         password: await this.hashPassword(password),
         name,
-        company: company || "",
+        company,
+        picture,
         isAdmin: isAdmin || false,
         verifyToken: randomBytes(16).toString("hex"),
         lastActivity: new Date(),
@@ -67,6 +72,7 @@ class User extends BaseModel {
         email: user.email,
         name: user.name,
         company: user.company,
+        picture: user.picture,
         isAdmin: user.isAdmin,
         verifyToken: user.verifyToken,
         lastActivity: user.lastActivity,
@@ -96,6 +102,7 @@ class User extends BaseModel {
         email: this.email,
         name: this.name,
         company: this.company,
+        picture: this.picture,
         isAdmin: this.isAdmin,
       },
       createdAt: moment().unix(),

src/routes.ts

@@ -1,7 +1,7 @@
 import { Express, Request, Response } from "express";
 
 // Controllers
-import { createUser, deleteUser, getUser, loginUser, updateUser } from "@/controllers/users";
+import { createUser, deleteUser, getUser, loginUser, loginUserWithGoogle, updateUser } from "@/controllers/users";
 
 import { createLesson, deleteLesson, getLesson, updateLesson } from "@/controllers/lessons";
 import authMiddleware from "./middlewares/auth";
@@ -17,6 +17,7 @@ const router = (app: Express) => {
   app.put("/users/:id", [corsConfig(), authMiddleware], updateUser);
   app.delete("/users/:id", [corsConfig(), authMiddleware], deleteUser);
   app.post("/users/login", loginUser);
+  app.post("/users/login/google", loginUserWithGoogle);
 
   // Tracks
   // Modules

src/types/User.ts

@@ -3,6 +3,7 @@ export type UserInfo = {
   email: string;
   name: string;
   company: string;
+  picture: string;
   isAdmin: boolean;
   lastActivity: Date;
   verifyToken?: string;

tests/users.test.ts

@@ -54,7 +54,7 @@ describe("Setting API Server up...", () => {
       const email = "user2@polkadot.education";
       const name = "User Two";
       const password = "superSecret";
-      const user = await UserModel.createUser(email, password, name, "company", false);
+      const user = await UserModel.createUser(email, password, name, "company", "Base64OrLink", false);
       await axios
         .get(`${API_URL}/users/${user?.userId}`)
         .then((r) => {
@@ -68,7 +68,7 @@ describe("Setting API Server up...", () => {
       const email = "user3@polkadot.education";
       const name = "User Three";
       const password = "superSecret";
-      const user = await UserModel.createUser(email, password, name, "company", false);
+      const user = await UserModel.createUser(email, password, name, "company", "Base64OrLink", false);
 
       const newEmail = "New Email";
       const newPassword = "newSuperSecret";
@@ -100,7 +100,7 @@ describe("Setting API Server up...", () => {
       const email = "user4@polkadot.education";
       const name = "User Four";
       const password = "superSecret";
-      const user = await UserModel.createUser(email, password, name, "company", false);
+      const user = await UserModel.createUser(email, password, name, "company", "Base64OrLink", false);
       await axios
         .delete(`${API_URL}/users/${user?.userId}`)
         .then((r) => {