Merge pull request #78 from datasci4health/feature/space#177

Feature/space#177
harena-lab · Aug 25, 2020 · 6ede069 · 6ede069
2 parents d0fc764 + a42a7a4
commit 6ede069
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 77 deletions.
diff --git a/src/adonisjs/app/Controllers/Http/AuthController.js b/src/adonisjs/app/Controllers/Http/AuthController.js
@@ -1,69 +1,49 @@
 'use strict'
 
+const Logger = use('Logger')
+
 const User = use('App/Models/v1/User');
-const Token = use('App/Models/v1/Token');
 
 class AuthController {
+    async login({ request, auth, response, session }) {
+        console.log('v2/session')
+        try {
+            let { email, password } = request.all();
+            // if (await auth.remember(true).attempt(email, password)) {
+            if (await auth.remember(true).attempt(email, password)) {
+
+                console.log('------------------------------- attempt')
+                        // console.log(session.all())
+
+                let user = await User.findBy('email', email)
+                // let token = await auth.generate(user)
+
+                // let authenticatedUser = new User()
+                // authenticatedUser.id = user.id
+                // authenticatedUser.email = user.email
+                // authenticatedUser.username = user.username
+
+                Object.assign(user, { 'adonisAuth': session.get('adonis-auth') })
+                // return response.json('Logged in successfully')
+
+                // let adonis_session = session.get('adonis-auth')
+                console.log(session.all())
+                // console.log(auth)
+                return response.json(user)
 
-	async login({ request, auth, response }) {
-        let { email, password, refresh_token } = request.all();
-        let user = ""
-        let token = ""
-
-        try{
-            await auth.check()
-            return response.json('user is signed already')
-        } catch(e) {
-            // token expired
-            if (e.code == 'E_JWT_TOKEN_EXPIRED'){
-                token = await auth.generateForRefreshToken(refresh_token)
-
-                Object.entries(token).forEach(entry => {
-                    if (entry[0] == 'refreshToken'){
-                        refresh_token = entry[1]
-                    }
-                }); 
-            }
-
-            // unloged user
-            if (e.code == 'E_INVALID_JWT_TOKEN'){
-                try{
-                   token = await auth.withRefreshToken().attempt(email, password)
-                } catch(e){
-                    console.log(e)
-                }
             }
-
-            // generic error
-            if (token == "")
-                return response.status(e.status).json(e.message)
-
-            user = await User.findBy('email', email)
-            Object.assign(user, token)
-
-            return response.json(user)
         }
-    }
-
-    async login2({ request, auth, response }) {
-        try{
-            let refresh_token  = request.input('access_code');
-
-            let token = await auth.generateForRefreshToken(refresh_token)
-            return response.json(token)
-        }catch(e){
+        catch (e) {
             console.log(e)
-            return response.status(500).json(e.message)
+            return response.status(e.status).json({ message: e.message })
         }
-
     }
 
     async logout({ auth, response }) {
         try{
-            const refreshToken = auth.getAuthHeader()
-            await auth.revokeTokens(refreshToken)
-
-            return response.json('successfull logout')
+            await auth.logout()
+
+            return response.json('Logged out successfuly')
         }catch(e){
             console.log(e)
             return response.status(500).json(e.message)
@@ -73,3 +53,7 @@ class AuthController {
 }
 
 module.exports = AuthController
+
+
+
+
diff --git a/src/adonisjs/app/Controllers/Http/v1/AuthController.js b/src/adonisjs/app/Controllers/Http/v1/AuthController.js
@@ -1,41 +1,72 @@
 'use strict'
 
 const User = use('App/Models/v1/User');
+const Token = use('App/Models/v1/Token');
 
 class AuthController {
+
     async login({ request, auth, response }) {
-        try {
-            let { email, password } = request.all();
-
-console.log(request)
-            if (await auth.attempt(email, password)) {
-                console.log('------------------------------- attempt')
-                let user = await User.findBy('email', email)
-                // let token = await auth.generate(user)
-
-                // let authenticatedUser = new User()
-                // authenticatedUser.id = user.id
-                // authenticatedUser.email = user.email
-                // authenticatedUser.username = user.username
-
-                // Object.assign(authenticatedUser, token)
-                // return response.json('Logged in successfully')
-                return response.json(auth.user)
+        // console.log(request.all())
+        let { email, password, refresh_token } = request.all();
+        let user = ""
+        let token = ""
+
+        try{
+            await auth.check()
+            return response.json('user is signed already')
+        } catch(e) {
+            console.log(e)
+            // token expired
+            if (e.code == 'E_JWT_TOKEN_EXPIRED'){
+                token = await auth.generateForRefreshToken(refresh_token)
 
+                Object.entries(token).forEach(entry => {
+                    if (entry[0] == 'refreshToken'){
+                        refresh_token = entry[1]
+                    }
+                }); 
             }
+
+            // unloged user
+            if (e.code == 'E_INVALID_JWT_TOKEN'){
+                try{
+                   token = await auth.withRefreshToken().attempt(email, password)
+                } catch(e){
+                    console.log('erro aqui')
+                    console.log(e)
+                }
+            }
+
+            // generic error
+            if (token == "")
+                return response.status(e.status).json(e.message)
+
+            user = await User.findBy('email', email)
+            Object.assign(user, token)
+
+            return response.json(user)
         }
-        catch (e) {
+    }
+
+    async login2({ request, auth, response }) {
+        try{
+            let refresh_token  = request.input('access_code');
+
+            let token = await auth.generateForRefreshToken(refresh_token)
+            return response.json(token)
+        }catch(e){
             console.log(e)
-            return response.status(e.status).json({ message: e.message })
+            return response.status(500).json(e.message)
         }
+
     }
 
     async logout({ auth, response }) {
         try{
-
-            await auth.logout()
+            const refreshToken = auth.getAuthHeader()
+            await auth.revokeTokens(refreshToken)
 
-            return response.json('Logged Zout successfuly')
+            return response.json('successfull logout')
         }catch(e){
             console.log(e)
             return response.status(500).json(e.message)
@@ -44,4 +75,4 @@ console.log(request)
     }
 }
 
-module.exports = AuthController
+module.exports = AuthController
diff --git a/src/adonisjs/config/auth.js b/src/adonisjs/config/auth.js
@@ -75,6 +75,7 @@ module.exports = {
       secret: Env.get('APP_KEY'),
       // expiresIn: 300
       expiresIn: 86400
+      // algorithm: 
     }
   },
 

diff --git a/src/adonisjs/config/cors.js b/src/adonisjs/config/cors.js
@@ -73,7 +73,7 @@ module.exports = {
   | boolean.
   |
   */
-  credentials: false,
+  credentials: true,
 
   /*
   |--------------------------------------------------------------------------

diff --git a/src/adonisjs/config/session.js b/src/adonisjs/config/session.js
@@ -66,7 +66,9 @@ module.exports = {
   cookie: {
     httpOnly: true,
     sameSite: false,
-    path: '/'
+    path: '/',
+    // domain: 'harena.com'
+    // domain: Env.get('COOKIE_DOMAIN', null)
   },
 
   /*