Merge pull request #234 from datasci4health/development

Token validator, case draft by quests, link case to quest, bootstrap update

docker-compose-dev.yml

@@ -7,7 +7,7 @@ services:
     ports:
       - "10010:10010"
     environment:
-      - ENV_SILENT=true            
+      - ENV_SILENT=true
       - HOST=0.0.0.0
       - PORT=10010
       - NODE_ENV=development
@@ -27,13 +27,6 @@ services:
       - HARENA_LOGGER_URL=http://localhost:10030
       - HARENA_LOGGER_API_VERSION=v1
 
-      - DB_CONNECTION=mysql
-      - DB_HOST=harena-manager-database
-      - DB_PORT=3306
-      - DB_USER=jacinto
-      - DB_PASSWORD=jacinto
-      - DB_DATABASE=harena-manager  
-
     restart: always
     networks:
       - harena-space
@@ -54,7 +47,7 @@ services:
       - APP_URL=http://0.0.0.0:10020
       - CACHE_VIEWS=false
       - APP_KEY=vJX37W4ycI2nkVoBbCM8OW1nsP5LAE8l
-      
+
       - DB_CONNECTION=mysql
       - DB_HOST=harena-manager-database
       - DB_PORT=3306
@@ -64,7 +57,7 @@ services:
       - HASH_DRIVER=bcrypt
     depends_on:
       - harena-manager-database
-    restart: always  
+    restart: always
     networks:
       - harena-space
     volumes:
@@ -87,16 +80,16 @@ services:
     restart: always
     networks:
       - harena-space
-      
+
 
   harena-manager-database-ui:
     image: phpmyadmin/phpmyadmin:latest
     ports:
       - 10022:80
     environment:
-      - PMA_ARBITRARY=0                         # connection to any server 
+      - PMA_ARBITRARY=0                         # connection to any server
       - PMA_HOST=harena-manager-database
-      - PMA_PORT=3306  
+      - PMA_PORT=3306
     depends_on:
       - harena-manager-database
     networks:
@@ -114,4 +107,4 @@ volumes:
 
 networks:
   harena-space:
-    driver: bridge
+    driver: bridge

src/adonisjs/app/Controllers/Http/AuthController.js

@@ -12,17 +12,17 @@ const { validate } = use('Validator')
 // const User = use('App/Models/User')
 
 class AuthController {
-  create ({ view, session }) {
+  create ({ view }) {
     return view.render('registration.login', { pageTitle: 'Log in' })
   }
 
-  async login ({ view, request, session, response, auth }) {
+  async login ({ view, request, response }) {
     try {
       const params = request.all()
 
       const messages = {
         'email.required': 'Missing email',
-        'password.required': 'Missing password',
+        'password.required': 'Missing password'
       }
 
       const validation = await validate(params, {
@@ -31,13 +31,13 @@ class AuthController {
       }, messages)
 
       // * If validation fails, early returns with validation message
-      if (validation.fails()) {
-        session
-          .withErrors(validation.messages())
-          .flashExcept(['password'])
-
-        return response.redirect('back')
-      }
+      // if (validation.fails()) {
+      //   session
+      //     .withErrors(validation.messages())
+      //     .flashExcept(['password'])
+      //
+      //   return response.redirect('back')
+      // }
 
       const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/auth/login'
 
@@ -52,10 +52,9 @@ class AuthController {
 
       await axios(config)
         .then(async function (endpointResponse) {
-
           const responseUser = endpointResponse.data
-
-          await auth.loginViaId(responseUser.id)
+          // session.put('username', responseUser.username)
+          // await auth.loginViaId(responseUser.id)
           response.cookie('token', responseUser.token)
 
           return response.route('index')
@@ -68,7 +67,7 @@ class AuthController {
     }
   }
 
-  async logout ({ session, auth, response, request }) {
+  async logout ({ response, request }) {
     try {
       const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/auth/logout'
 
@@ -82,7 +81,8 @@ class AuthController {
 
       await axios(config)
         .then(async function (endpointResponse) {
-          await auth.logout()
+          response.clearCookie('token')
+
           return response.route('index')
         })
         .catch(function (error) {

src/adonisjs/app/Controllers/Http/CaseController.js

@@ -19,18 +19,14 @@ class CaseController {
     const harenaManagerUrl = Env.get('HARENA_MANAGER_URL', 'http://127.0.0.1:1020')
     const casesUrl = harenaManagerUrl + '/cases'
     axios.get(casesUrl)
-      .then((response) => {
-        console.log(response)
-      }, (error) => {
-        console.log(error)
-      })
+      .then((response) => { console.log(response) }, (error) => { console.log(error) })
   }
 
   async store ({ view, request, session, response }) {
     try {
       const params = request.all()
       const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/case'
-
+      console.log(params)
       const token = request.cookie('token')
 
       // load template
@@ -71,9 +67,31 @@ class CaseController {
           }
         }
 
+        let _caseId
         await axios(config)
           .then(function (endpointResponse) {
-            return response.redirect('/author/?id=' + endpointResponse.data.id)
+            _caseId = endpointResponse.data.id
+          // return response.redirect('/author/?id=' + endpointResponse.data.id)
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+
+        const linkCase = {
+          method: 'POST',
+          url: Env.get('HARENA_MANAGER_URL') + '/api/v1/quest/link/case',
+          data: {
+            questId: params.quest,
+            caseId: _caseId,
+            orderPosition: 0
+          },
+          headers: {
+            Authorization: 'Bearer ' + token
+          }
+        }
+        await axios(linkCase)
+          .then(function (endpointResponse) {
+            return response.redirect('/author/?id=' + _caseId)
           })
           .catch(function (error) {
             console.log(error)
@@ -84,10 +102,36 @@ class CaseController {
     }
   }
 
+  async linkCase ({ request, response }) {
+    const params = request.all()
+    const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/quest/link/case'
+    const token = request.cookie('token')
+    const config = {
+      method: 'POST',
+      url: endpointUrl,
+      data: {
+        questId: params.quest,
+        caseId: params.case,
+        orderPosition: 0
+      },
+      headers: {
+        Authorization: 'Bearer ' + token
+      }
+    }
+    await axios(config)
+      .then(function (endpointResponse) {
+      // return response.redirect('/author/?id=' + endpointResponse.data.id)
+        return true
+      })
+      .catch(function (error) {
+        console.log(error)
+      })
+  }
+
   async update ({ request, session, response }) {
     try {
       const params = request.all()
-      console.log('UPDATE STARTING........');
+      // console.log('UPDATE STARTING........')
       const endpointUrl =
       Env.get('HARENA_MANAGER_URL') + '/api/v1/case/' + params.case_id
 
@@ -112,7 +156,7 @@ class CaseController {
 
       await axios(config)
         .then(function () {
-          // return response.redirect('/')
+        // return response.redirect('/')
         })
         .catch(function (error) {
           console.log(error)
@@ -136,7 +180,7 @@ class CaseController {
 
       await axios(config)
         .then(function (endpointResponse) {
-          // DCCCommonServer.setCaseObj(endpoint_response);
+        // DCCCommonServer.setCaseObj(endpoint_response);
 
           // return view.render('author.author')
           const responseContent = endpointResponse.data

src/adonisjs/app/Controllers/Http/QuestController.js

@@ -1,13 +1,11 @@
 'use strict'
 
-const Env = use("Env")
-const axios = use("axios")
+const Env = use('Env')
+const axios = use('axios')
 const view = use('View')
 
 class QuestController {
-
-
-	async getCasesByQuest({ request, response }) {
+  async getCasesByQuestAuthor({ request, response }) {
 		try{
 			const params = request.all()
 			console.log('------------------------COR DA QUEST');
@@ -50,10 +48,11 @@ class QuestController {
 			console.log(e)
 		}
 
-		return view.render('player.player-cases', { cases: responseData[0], color: request.input('color')  });
+		return view.render('author.drafts-cases', { cases: responseData[0]});
 
 	}
-	async getQuests({ request, response }) {
+
+async getQuestsAuthor({ request, response }) {
 		try{
 			var responseData = [];
 			let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/author/quests"
@@ -91,10 +90,94 @@ class QuestController {
 		} catch(e){
 			console.log(e)
 		}
-		const pageTitle = 'Welcome Player';
-		return view.render('player.welcome', { quests: responseData[0], pageTitle});
+
+		return view.render('author.drafts-quest', { quests: responseData[0]});
 
 	}
+
+  async getCasesByQuest ({ request, response }) {
+    try {
+      const params = request.all()
+      console.log('------------------------COR DA QUEST')
+      console.log(params.color)
+      var responseData = []
+      const endpoint_url = Env.get('HARENA_MANAGER_URL') + '/api/v1/author/quest/cases'
+
+      var config = {
+        method: 'get',
+        url: endpoint_url,
+        data: {
+          questId: params.id
+        },
+        headers: {
+          Authorization: 'Bearer ' + request.cookie('token')
+        }
+      }
+
+      await axios(config)
+        .then(function (endpoint_response) {
+          console.log('============ Retrieving cases for selected quests')
+          console.log(endpoint_response.data)
+          const busResponse = []
+          for (const c in endpoint_response.data) {
+            busResponse.push({
+              id: endpoint_response.data[c].id,
+              title: endpoint_response.data[c].title
+
+            })
+          }
+          responseData[0] = busResponse
+        })
+
+        .catch(function (error) {
+          console.log(error)
+        })
+    } catch (e) {
+      console.log(e)
+    }
+
+    return view.render('player.player-cases', { cases: responseData[0], color: request.input('color') })
+  }
+
+  async getQuests ({ request, response }) {
+    try {
+      var responseData = []
+      const endpoint_url = Env.get('HARENA_MANAGER_URL') + '/api/v1/author/quests'
+
+      var config = {
+        method: 'get',
+        url: endpoint_url,
+        headers: {
+          Authorization: 'Bearer ' + request.cookie('token')
+        }
+      }
+
+      await axios(config)
+        .then(function (endpoint_response) {
+          console.log('============ Retrieving quests')
+          console.log(endpoint_response.data)
+          const busResponse = []
+          for (const c in endpoint_response.data) {
+            busResponse.push({
+              id: endpoint_response.data[c].id,
+              title: endpoint_response.data[c].title,
+              color: endpoint_response.data[c].color,
+              url: endpoint_response.data[c].url
+
+            })
+          }
+          responseData[0] = busResponse
+        })
+
+        .catch(function (error) {
+          console.log(error)
+        })
+    } catch (e) {
+      console.log(e)
+    }
+    const pageTitle = 'Welcome Player'
+    return view.render('player.welcome', { quests: responseData[0], pageTitle })
+  }
 }
 
 module.exports = QuestController

src/adonisjs/config/auth.js

@@ -16,7 +16,7 @@ module.exports = {
   | Available Serializers - lucid, database
   |
   */
-  authenticator: 'session',
+  authenticator: 'jwt',
 
   /*
   |--------------------------------------------------------------------------

src/adonisjs/config/session.js

@@ -80,7 +80,7 @@ module.exports = {
   |
   */
   file: {
-    location: 'sessions'
+    location: ''
   }
 
   /*