fix(POST quest/link/case)

harena-lab · Aug 26, 2020 · 122ffff · 122ffff
1 parent 6ede069
commit 122ffff
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 17 deletions.
diff --git a/src/adonisjs/app/Controllers/Http/AuthController.js b/src/adonisjs/app/Controllers/Http/AuthController.js
@@ -7,6 +7,7 @@ const User = use('App/Models/v1/User');
 class AuthController {
     async login({ request, auth, response, session }) {
         console.log('v2/session')
+        Logger.info('login attempt via v2/auth/login (SESSION)')
         try {
             let { email, password } = request.all();
             // if (await auth.remember(true).attempt(email, password)) {

diff --git a/src/adonisjs/app/Controllers/Http/v1/AuthController.js b/src/adonisjs/app/Controllers/Http/v1/AuthController.js
@@ -2,11 +2,14 @@
 
 const User = use('App/Models/v1/User');
 const Token = use('App/Models/v1/Token');
+const Logger = use('Logger')
 
 class AuthController {
 
     async login({ request, auth, response }) {
         // console.log(request.all())
+        Logger.info('login attempt via v1/auth/login (JWT)')
+
         let { email, password, refresh_token } = request.all();
         let user = ""
         let token = ""
@@ -15,7 +18,7 @@ class AuthController {
             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)
@@ -25,14 +28,17 @@ class AuthController {
                         refresh_token = entry[1]
                     }
                 }); 
+                Logger.info('expired token')
+
             }
 
             // unloged user
             if (e.code == 'E_INVALID_JWT_TOKEN'){
                 try{
                    token = await auth.withRefreshToken().attempt(email, password)
+                   Logger.info('newly generated token')
+
                 } catch(e){
-                    console.log('erro aqui')
                     console.log(e)
                 }
             }
@@ -63,9 +69,11 @@ class AuthController {
 
     async logout({ auth, response }) {
         try{
+            Logger.info('logout attempt via v1/auth/logout (JWT)')
+
             const refreshToken = auth.getAuthHeader()
             await auth.revokeTokens(refreshToken)
-            
+
             return response.json('successfull logout')
         }catch(e){
             console.log(e)

diff --git a/src/adonisjs/app/Controllers/Http/v1/QuestController.js b/src/adonisjs/app/Controllers/Http/v1/QuestController.js
@@ -59,11 +59,11 @@ class QuestController {
         }
     }
 
-    async link_user({ request, response }) {
+    async linkUser({ request, response }) {
         try {
-            const {user_id, quest_id, roleSlug} = request.post()
-            let user = await User.find(user_id)
-            let quest = await Quest.find(quest_id)
+            const {userId, questId, roleSlug} = request.post()
+            let user = await User.find(userId)
+            let quest = await Quest.find(questId)
             let role = await Role.findBy('slug', roleSlug)
 
             if (role == null)
@@ -89,15 +89,15 @@ class QuestController {
         }
     }
 
-    async link_case({ request, response }) {
+    async linkCase({ request, response }) {
         try {
-            const {quest_id, case_id, order_position} = request.post()
+            const {questId, caseId, orderPosition} = request.post()
 
             // let c = await Case.find(case_id)
-            let quest = await Quest.find(quest_id)
+            let quest = await Quest.find(questId)
 
-            await quest.cases().attach(case_id, (row) => {
-                row.order_position = order_position
+            await quest.cases().attach(caseId, (row) => {
+                row.order_position = orderPosition
             })
 
             quest.cases = await quest.cases().fetch()

diff --git a/src/adonisjs/app/Middleware/CheckUserQuestPermission.js b/src/adonisjs/app/Middleware/CheckUserQuestPermission.js
@@ -50,7 +50,7 @@ class CheckUserQuestPermission {
       if (query_result[0]['count(*)'] === 0)
         return response.status(500).json('user dont have ' + properties[0] + ' permissions for such quest')
       else {
-        Logger.info('check user\'s quest permission - OK')
+        // Logger.info('check user\'s quest permission - OK')
         await next()
       }
   	} catch(e){

diff --git a/src/adonisjs/app/Models/Hooks/UserHook.js b/src/adonisjs/app/Models/Hooks/UserHook.js
@@ -5,5 +5,6 @@ const Hash = use('Hash')
 const UserHook = exports = module.exports = {}
 
 UserHook.hashPassword = async (user) => {
-	user.password = await Hash.make(user.password)
+	// user.password = await Hash.make(user.password)
+	console.log('-----------------'+ await Hash.make(user.password))
 }
diff --git a/src/adonisjs/database/seeds/InitialSeeder.js b/src/adonisjs/database/seeds/InitialSeeder.js
@@ -27,6 +27,8 @@ const RESOURCE_DIR = "resources/"
 
 const fs = require('fs');
 const uuidv4 = require('uuid/v4');
+const Hash = use('Hash')
+
 
 class UserSeeder {
   async run() {
@@ -92,7 +94,11 @@ class UserSeeder {
         user.username = 'jacinto'
         user.login = 'jacinto'
         user.email = 'jacinto@email.com'
-        user.password = 'jacinto'
+
+        const safePassword = await Hash.make('jacinto')
+        user.password = safePassword
+
+        // user.password = 'jacinto'
         user.id =  await uuidv4()
 
         // await user.save(trx)

diff --git a/src/adonisjs/start/routes.js b/src/adonisjs/start/routes.js
@@ -103,8 +103,8 @@ Route.group(() => {
 
 	Route.put(   '',             	'v1/QuestController.store')
 
-	Route.post(  'link/user',		'v1/QuestController.link_user').middleware('quest_permission:contributor')
-	Route.post(  'link/case',		'v1/QuestController.link_case').middleware('quest_permission:contributor')
+	Route.post(  'link/user',		'v1/QuestController.linkUser').middleware('quest_permission:contributor')
+	Route.post(  'link/case',		'v1/QuestController.linkCase').middleware('quest_permission:contributor')
 
 	Route.get(   'users',      		'v1/QuestController.listUsers').middleware('quest_permission:contributor')