Skip to content

Commit

Permalink
Merge pull request: update docker-compose.yml
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@lealfp
lealfp authored Aug 26, 2020
2 parents 8316f4f + 4d19161 commit 59c5002
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 110 deletions.
12 changes: 11 additions & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ services:
- HARENA_MANAGER_URL=http://localhost:10020
- HARENA_MANAGER_API_VERSION=v1
- HARENA_LOGGER_URL=http://localhost:10030
- HARENA_LOGGER_API_VERSION=v1
- 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
Expand Down
113 changes: 27 additions & 86 deletions src/adonisjs/app/Controllers/Http/AuthController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@ const User = use('App/Models/User');
class AuthController {

create({ view, session }){
console.log('ejijeiej')
console.log(session.all())

return view.render('registration.login', { pageTitle: 'Log in' })
}



async login({ view, request, session, response, auth }) {
console.log('here')
try{
const params = request.all()

Expand All @@ -36,7 +32,7 @@ class AuthController {
password: 'required',
}, messages)

// * If validation fails, early returns with validation message.
// * If validation fails, early returns with validation message
if (validation.fails()) {
session
.withErrors(validation.messages())
Expand All @@ -47,57 +43,22 @@ class AuthController {

let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/login"

let bodyFormData = new FormData();
bodyFormData.append('email', params.email);
bodyFormData.append('password', params.password);
// console.log(bodyFormData.getHeaders())

var config = {
method: 'post',
url: endpoint_url,
// headers: {
// data.getHeaders()
// },
// data: bodyFormData
data: {
email: params.email,
password: params.password,
}
};
// session.clear()
console.log('aqui')

await axios(config)
// console.log('retorno')
.then(async function (endpoint_response) {
// console.log(session.all())

let response_user = endpoint_response.data
console.log("-----------------------------------------------------------------------------------------------------------")
let response_user = endpoint_response.data

// let user = new User()
// user.id = response_user.id
// user.email = response_user.email

// session.put('adonis-auth', response_user.adonisAuth)

// console.log(session.all())
// await auth.attempt(params.email,params.password)
await auth.loginViaId(response_user.id)
// console.log(session.all())

response.cookie('token', response_user.token)
console.log("cookies-----------------------------------------------------------------------------------------------------------")
console.log(response_user)

// console.log(response_user.token)
// console.log(response.cookies())

// console.log(response.cookie('token'))
// console.log(response.plainCookie('token'))

//yield response.sendView('index', data)
//return view.render('index', { user: user.toJSON() })


return response.route('index')
})
Expand All @@ -112,52 +73,32 @@ class AuthController {


async logout({ session, auth, response, request }){
console.log('aquiiiiiiiiiiiiiiiiiiii')
// console.log(request.cookies())
try{
// console.log('aqui')
// console.log(request.cookies())

// console.log(request.cookie('adonis-session'))
// console.log(request.cookie('adonis-session-values'))

const endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/logout"
// console.log(session)

var config = {
method: 'post',
url: endpoint_url,
headers: {
Authorization: 'Bearer ' + request.cookie('token')

// "Cookie": "Bearer " + request.cookie("token")
// "Cookie": "adonis-session=" + request.cookie("adonis-session") +
// "; XSRF-TOKEN="+ request.cookie('XSRF-TOKEN') +
// "; adonis-session-values=" + request.cookie('adonis-session-values')
}
};

// axios.defaults.withCredentials = true
// console.log(request.cookies())
// await auth.logout()

await axios(config)
.then(async function (endpoint_response) {
// console.log('200 ok')
await auth.logout()

return response.route('index')

})
.catch(function (error) {
console.log('401 unauthorized')
console.log(error);
});
}catch (e){
// console.log(e)
}

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)
}
}



}

module.exports = AuthController
44 changes: 21 additions & 23 deletions src/adonisjs/app/Controllers/Http/CaseController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,35 @@ 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'
axios.get(casesUrl)
.then((reponse) => {
console.log(reponse)
.then((response) => {
console.log(response)
}, (error) => {
console.log(error)
})
}





async store ({ view, request, session, response }) {
try {
const params = request.all()
// console.log("-------------------------------------------------------------------------------------------------------")
// console.log(request.cookie('token'))
const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/case'

console.log('******************************************** token from Adonis')
console.log(request.cookie('token'))
console.log(params)
const token = request.cookie('token')

// load template
Expand All @@ -47,11 +51,10 @@ class CaseController {
Authorization: 'Bearer ' + request.cookie('token')
}
}

let markdown = null
await axios(templateRequest)
.then(function (endpointResponse) {
console.log('================== markdown')
console.log(endpointResponse.data)
markdown = endpointResponse.data
})
.catch(function (error) {
Expand Down Expand Up @@ -80,7 +83,6 @@ class CaseController {
await axios(config)
.then(function (endpointResponse) {
return response.redirect('/author/?id=' + endpointResponse.data.id)
// return response.redirect('/home')
})
.catch(function (error) {
console.log(error)
Expand All @@ -94,16 +96,10 @@ class CaseController {
async update ({ request, session, response }) {
try {
const params = request.all()
console.log('-------------------------------------------------------------------------------------------------------')
console.log('=== params')
console.log(params)

// console.log("-------------------------------------------------------------------------------------------------------")
// console.log(request.cookie('token'))
const endpointUrl =
Env.get('HARENA_MANAGER_URL') + '/api/v1/case/' + params.case_id

// console.log(request.cookie('token'))
const token = request.cookie('token')
const config = {
method: 'PUT',
Expand All @@ -125,9 +121,7 @@ class CaseController {

await axios(config)
.then(function () {

// return response.redirect('/')

})
.catch(function (error) {
console.log(error)
Expand All @@ -137,9 +131,10 @@ class CaseController {
}
}



async getCase ({ view, request, response, params }) {
try {
// const params = request.all();

const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/case/' + request.input('id')
// "d2ad02da-b7e1-4391-9f65-4f93eeb4ca7f"
Expand All @@ -155,7 +150,6 @@ class CaseController {
.then(function (endpointResponse) {
// DCCCommonServer.setCaseObj(endpoint_response);

console.log('=====GET selected case:' + endpointResponse.status)
// return view.render('author.author')
const responseContent = endpointResponse.data
const caseId = responseContent.id
Expand All @@ -168,8 +162,7 @@ class CaseController {
const caseKeywords = responseContent.keywords
const caseOriginalDate = responseContent.original_date
const caseSource = responseContent.source.replace(/"/gm, '\\"')
console.log('THIS IS CASE SOURCE ====================')
console.log(caseSource)

return view.render('author.author',
{ caseId, caseTitle, caseDescription, caseLanguage, caseInstitution, caseDomain, caseSpecialty, caseKeywords, caseOriginalDate, caseSource })
})
Expand All @@ -182,6 +175,8 @@ class CaseController {
return view.render('author.author')
}



async populateModal ({ params, request, view, response }) {
try {
// const params = request.all()
Expand All @@ -199,7 +194,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')
})
Expand All @@ -210,6 +205,9 @@ class CaseController {
console.log(e)
}
}



}

module.exports = CaseController

0 comments on commit 59c5002

Please sign in to comment.