diff --git a/src/adonisjs/app/Controllers/Http/AuthController.js b/src/adonisjs/app/Controllers/Http/AuthController.js
index 040ce6cc4..662005335 100644
--- a/src/adonisjs/app/Controllers/Http/AuthController.js
+++ b/src/adonisjs/app/Controllers/Http/AuthController.js
@@ -1,104 +1,97 @@
+/* global use */
'use strict'
-const Logger = use('Logger')
+// const Logger = use('Logger')
const Env = use('Env')
-const axios = use('axios');
-var FormData = use('form-data');
+const axios = use('axios')
+// var FormData = use('form-data')
const { validate } = use('Validator')
-const User = use('App/Models/User');
+// const User = use('App/Models/User')
class AuthController {
-
- create({ view, session }){
+ create ({ view, session }) {
return view.render('registration.login', { pageTitle: 'Log in' })
}
-
-
- async login({ view, request, session, response, auth }) {
- try{
- const params = request.all()
-
- const messages = {
- 'email.required': 'Missing email',
- 'password.required': 'Missing password',
- }
-
- const validation = await validate(params, {
- email: 'required',
- password: 'required',
- }, messages)
-
- // * If validation fails, early returns with validation message
- if (validation.fails()) {
- session
- .withErrors(validation.messages())
- .flashExcept(['password'])
-
- return response.redirect('back')
- }
-
- let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/login"
-
- var config = {
- method: 'post',
- url: endpoint_url,
- data: {
- email: params.email,
- password: params.password,
- }
- };
-
- await axios(config)
- .then(async function (endpoint_response) {
-
- let response_user = endpoint_response.data
-
- await auth.loginViaId(response_user.id)
- response.cookie('token', response_user.token)
-
- return response.route('index')
- })
- .catch(function (error) {
- console.log(error);
- });
- } catch (e){
- console.log(e)
- }
+ async login ({ view, request, session, response, auth }) {
+ try {
+ const params = request.all()
+
+ const messages = {
+ 'email.required': 'Missing email',
+ 'password.required': 'Missing password',
+ }
+
+ const validation = await validate(params, {
+ email: 'required',
+ password: 'required'
+ }, messages)
+
+ // * If validation fails, early returns with validation message
+ if (validation.fails()) {
+ session
+ .withErrors(validation.messages())
+ .flashExcept(['password'])
+
+ return response.redirect('back')
+ }
+
+ const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/auth/login'
+
+ var config = {
+ method: 'post',
+ url: endpointUrl,
+ data: {
+ email: params.email,
+ password: params.password
+ }
+ }
+
+ await axios(config)
+ .then(async function (endpointResponse) {
+
+ const responseUser = endpointResponse.data
+
+ await auth.loginViaId(responseUser.id)
+ response.cookie('token', responseUser.token)
+
+ return response.route('index')
+ })
+ .catch(function (error) {
+ console.log(error)
+ })
+ } catch (e) {
+ console.log(e)
+ }
}
-
-
- async logout({ session, auth, response, request }){
- try{
- const endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/logout"
-
- var config = {
- method: 'post',
- url: endpoint_url,
- headers: {
- Authorization: 'Bearer ' + request.cookie('token')
- }
- };
-
- await axios(config)
- .then(async function (endpoint_response) {
- await auth.logout()
- return response.route('index')
- })
- .catch(function (error) {
- console.log(error);
- });
- }catch (e){
- console.log(e)
- }
+ async logout ({ session, auth, response, request }) {
+ try {
+ const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/auth/logout'
+
+ var config = {
+ method: 'post',
+ url: endpointUrl,
+ headers: {
+ Authorization: 'Bearer ' + request.cookie('token')
+ }
+ }
+
+ await axios(config)
+ .then(async function (endpointResponse) {
+ await auth.logout()
+ return response.route('index')
+ })
+ .catch(function (error) {
+ console.log(error)
+ })
+ } catch (e) {
+ console.log(e)
+ }
}
-
-
-
}
module.exports = AuthController
diff --git a/src/adonisjs/app/Controllers/Http/CaseController.js b/src/adonisjs/app/Controllers/Http/CaseController.js
index 9dd577443..4e5d1ee34 100644
--- a/src/adonisjs/app/Controllers/Http/CaseController.js
+++ b/src/adonisjs/app/Controllers/Http/CaseController.js
@@ -11,15 +11,10 @@ View.global('currentTime', function () {
})
class CaseController {
-
-
create ({ view }) {
return view.render('author.author')
}
-
-
-
async fetch ({ view }) {
const harenaManagerUrl = Env.get('HARENA_MANAGER_URL', 'http://127.0.0.1:1020')
const casesUrl = harenaManagerUrl + '/cases'
@@ -31,10 +26,6 @@ class CaseController {
})
}
-
-
-
-
async store ({ view, request, session, response }) {
try {
const params = request.all()
@@ -131,11 +122,8 @@ class CaseController {
}
}
-
-
async getCase ({ view, request, response, params }) {
try {
-
const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/case/' + request.input('id')
// "d2ad02da-b7e1-4391-9f65-4f93eeb4ca7f"
var config = {
@@ -175,8 +163,6 @@ class CaseController {
return view.render('author.author')
}
-
-
async populateModal ({ params, request, view, response }) {
try {
// const params = request.all()
@@ -194,7 +180,7 @@ class CaseController {
await axios(config)
.then(function (endpointResponse) {
console.log(endpointResponse.data)
- // return view.render('author.author')
+ // return view.render('author.author')
return view.render('author.author')
})
@@ -205,9 +191,6 @@ class CaseController {
console.log(e)
}
}
-
-
-
}
module.exports = CaseController
diff --git a/src/adonisjs/config/session.js b/src/adonisjs/config/session.js
index f04fae31f..ff478b48c 100644
--- a/src/adonisjs/config/session.js
+++ b/src/adonisjs/config/session.js
@@ -66,7 +66,7 @@ module.exports = {
cookie: {
httpOnly: true,
sameSite: false,
- path: '/',
+ path: '/'
// domain:'harena.com'
},
@@ -81,7 +81,7 @@ module.exports = {
*/
file: {
location: 'sessions'
- },
+ }
/*
|--------------------------------------------------------------------------
diff --git a/src/adonisjs/database/migrations/1503248427885_user.js b/src/adonisjs/database/migrations/1503248427885_user.js
index d54c97b12..813138302 100644
--- a/src/adonisjs/database/migrations/1503248427885_user.js
+++ b/src/adonisjs/database/migrations/1503248427885_user.js
@@ -8,7 +8,7 @@ class UserSchema extends Schema {
this.create('users', (table) => {
table.uuid('id')
table.primary('id')
-
+
table.string('username', 80).notNullable().unique()
table.string('email', 254).notNullable().unique()
table.string('password', 60).notNullable()
diff --git a/src/adonisjs/package.json b/src/adonisjs/package.json
index 93041cae8..2b5fc4b1f 100644
--- a/src/adonisjs/package.json
+++ b/src/adonisjs/package.json
@@ -39,7 +39,9 @@
"App": "./app"
},
"standard": {
- "globals": ["use"],
+ "globals": [
+ "use"
+ ],
"ignore": [
"public/"
]
diff --git a/src/adonisjs/public/infra/dcc-common-server-proxy.js b/src/adonisjs/public/infra/dcc-common-server-proxy.js
index 4117d5eee..0e44a4a21 100644
--- a/src/adonisjs/public/infra/dcc-common-server-proxy.js
+++ b/src/adonisjs/public/infra/dcc-common-server-proxy.js
@@ -185,6 +185,7 @@ class DCCCommonServer {
specialty: document.getElementById('specialty').value,
keywords: document.getElementById('keywords').value,
source: document.getElementById('case_source').value
+ .replace(/\\"/gm, '"')
}
}
diff --git a/src/adonisjs/resources/views/author/author.edge b/src/adonisjs/resources/views/author/author.edge
index b4426dc0b..6017625ce 100644
--- a/src/adonisjs/resources/views/author/author.edge
+++ b/src/adonisjs/resources/views/author/author.edge
@@ -190,10 +190,7 @@
@@ -208,19 +205,6 @@
-