feat(login) login now returns jwt

.env

@@ -1 +1,2 @@
-MONGO_SRV = 'mongodb+srv://SRN:123456789123@cubiculospool-oxewp.mongodb.net/CubiculosPoolDev?retryWrites=true&w=majority'
+MONGO_SRV = 'mongodb+srv://SRN:123456789123@cubiculospool-oxewp.mongodb.net/CubiculosPoolDev?retryWrites=true&w=majority'
+JWT_SECRET = 'hArDT0D3C0D3PAZZW0RD'

.stignore

@@ -0,0 +1,4 @@
+/.git
+/node_modules
+/.vscode
+/images

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

Dockerfile

@@ -0,0 +1,20 @@
+FROM node:13 AS base
+
+WORKDIR /app
+RUN npm install
+RUN npm run build
+COPY  dist/main.js dist/main.js
+
+#################################
+
+FROM base AS dev
+
+COPY bashrc /root/.bashrc
+RUN npm install -g nodemon
+
+#################################
+
+FROM base AS prod
+
+EXPOSE 8080
+CMD node app.js

Makefile

@@ -0,0 +1,4 @@
+.PHONY: push
+push:
+	okteto build -t okteto/upc-pool:node-dev --target dev .
+	okteto build -t okteto/upc-pool:node .

bashrc

@@ -0,0 +1,5 @@
+cat << EOF
+Welcome to your development environment. Happy coding!
+EOF
+
+export PS1="\[\e[32m\]okteto\[\e[m\]> "

k8s.yml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: upc-pool
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: upc-pool
+  template:
+    metadata:
+      labels:
+        app: upc-pool
+    spec:
+      containers:
+      - image: node
+        name: upc-pool
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: upc-pool
+  annotations:
+    dev.okteto.com/auto-ingress: "true"
+spec:
+  type: ClusterIP  
+  ports:
+  - name: "upc-pool"
+    port: 3000
+  selector:
+    app: upc-pool

okteto.yml

@@ -0,0 +1,12 @@
+name: upc-pool
+image: okteto/node
+command: ["npm","install"]
+workdir: /usr/
+environment:
+  - MONGO_SRV=mongodb+srv://SRN:123456789123@cubiculospool-oxewp.mongodb.net/CubiculosPoolDev?retryWrites=true&w=majority
+  - environment=development
+forward:
+  - 3000:8000
+  - 9229:9229
+persistentVolume:
+  enabled: false

package.json

@@ -28,6 +28,7 @@
     "class-transformer": "^0.2.3",
     "class-validator": "^0.11.1",
     "dotenv": "^8.2.0",
+    "jsonwebtoken": "^8.5.1",
     "lightning-pool": "^2.1.3",
     "mongoose": "^5.9.7",
     "puppeteer": "^2.1.1",

src/app.module.ts

@@ -4,11 +4,11 @@ import { AppService } from './app.service';
 import { UserModule } from './modules/user/user.module';
 import { AuthModule } from './modules/auth/auth.module';
 import { MongooseModule } from '@nestjs/mongoose';
-require('dotenv').config()
 
+require('dotenv').config()
 @Module({
   imports: [MongooseModule.forRoot(process.env.MONGO_SRV,{useNewUrlParser: true,useUnifiedTopology: true}),UserModule, AuthModule],
   controllers: [AppController],
-  providers: [AppService],
+  providers: [AppService]
 })
 export class AppModule {}

src/modules/auth/auth.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { UserModule } from '../user/user.module';
-import { UserService } from '../user/user.service';
 
 @Module({
   imports:[UserModule],

src/modules/auth/auth.service.ts

@@ -4,18 +4,62 @@ import { async } from 'rxjs/internal/scheduler/async';
 import { AuthDto } from './auth.entity';
 import { UserService } from '../user/user.service';
 import { User } from '../user/user.entity';
-const { Pool } = require('lightning-pool');
+import { Pool } from 'lightning-pool';
+import { puppetterLogin } from './utils/puppetter';
+import { JWTsign } from './utils/jwt';
 // const puppeteer = require('puppeteer');
+/* eslint-disable prefer-const*/
 
 @Injectable()
 export class AuthService {
     puppeteerInstance: Browser
     puppeteerPage: Page
     puppeteerPool
-    constructor(private userService: UserService) {
+    constructor(private readonly userService: UserService) {
         this.createFactory()
     }
 
+    async upbWebTestPool(userCode, password) {
+        let page: Page = await this.puppeteerPool.acquire()
+        try {
+            let response = await puppetterLogin(page,userCode,password)
+            this.puppeteerPool.release(page)
+            if (response)
+                throw new BadRequestException(response);
+            return {
+                status:200
+            }
+        } catch (error) {
+            this.puppeteerPool.release(page)    
+            throw error
+        }
+    }
+
+    async createUser(userCode,password){
+        let user:User = new User({userCode,password})
+        let response = await this.userService.saveNewUser(user)
+        return response
+    }
+
+    async loginUser() {
+        return
+    }
+    async loginUserExp(body:AuthDto) {
+        try {
+            let response = await this.upbWebTestPool(body.userCode, body.password)
+            if(response.status== 200){
+                let createUser = await this.createUser(body.userCode,body.password)
+                console.log(createUser)
+                let jwt = JWTsign(createUser)
+                return jwt
+            } 
+        } catch (error) {
+            console.error(this.loginUserExp.name,error);
+            throw error
+        }
+
+    }
+
     createFactory() {
         const factory = {
             create: async function (opts) {
@@ -35,13 +79,10 @@ export class AuthService {
             reset:  function (client: Page) {
                 console.debug('Reseting Instance')
                 return client.goto('https://aulavirtual.upc.edu.pe/',{  timeout:6000})
-            },
-            validate: function (client) {
-
             }
         };
 
-        var opts = {
+        const opts = {
             max: 3, 
             min: 1,
             minIdle: 2
@@ -50,52 +91,4 @@ export class AuthService {
         this.puppeteerPool = new Pool(factory, opts)
     }
 
-    async upbWebTestPool(username, password) {
-        let page: Page = await this.puppeteerPool.acquire()
-        try {
-            await page.focus('#user_id');
-            await page.keyboard.type(username);
-            await page.focus('#password');
-            await page.keyboard.type(password);
-            await page.click('#entry-login');
-            await page.waitFor(200);
-            let response = await page.evaluate(() => {
-                try {
-                    return document.getElementById('loginErrorMessage').textContent;
-                } catch (e) {
-                    return null;
-                }
-            });
-            console.log('resp', response);
-            this.puppeteerPool.release(page)
-            if (response)
-                throw new BadRequestException(response);
-            return {
-                statusCode: 200,
-                message: 'Ok'
-            }
-        } catch (error) {
-            this.puppeteerPool.release(page)    
-            throw error
-        }
-    }
-
-    upcApi() {
-
-    }
-
-    async loginUser() {
-
-        let response = await this.upcApi()
-        return
-    }
-    async loginUserExp(body:AuthDto) {
-        let response = await this.upbWebTestPool(body.userCode, body.password)
-        if(response.statusCode == 200){
-            let user = new User()
-            //this.userService.saveNewUser()
-        }
-        return response
-    }
-
 }