From a47809e90b70d648427041ff7a7da2b8eed9c23c Mon Sep 17 00:00:00 2001 From: Fagner Date: Mon, 24 Aug 2020 12:23:16 -0300 Subject: [PATCH] working on csrf token --- .../app/Controllers/Http/AuthController.js | 69 +++++++++++-------- src/adonisjs/config/session.js | 5 +- .../resources/views/registration/login.edge | 2 +- 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/adonisjs/app/Controllers/Http/AuthController.js b/src/adonisjs/app/Controllers/Http/AuthController.js index e712d7325..2c6090bc3 100644 --- a/src/adonisjs/app/Controllers/Http/AuthController.js +++ b/src/adonisjs/app/Controllers/Http/AuthController.js @@ -12,14 +12,17 @@ const User = use('App/Models/User'); class AuthController { - create({ view }){ + 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(session.all()) + console.log('here') try{ const params = request.all() @@ -42,7 +45,7 @@ class AuthController { return response.redirect('back') } - let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/login" + let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v2/auth/login" let bodyFormData = new FormData(); bodyFormData.append('email', params.email); @@ -61,21 +64,27 @@ class AuthController { 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 user = new User() - user.id = response_user.id - user.email = response_user.email - console.log(response_user) - session.put('adonis-auth', response_user) - console.log(session.all()) - // await auth.attempt(params.email,params.password) - // await auth.loginViaId(user.id) + let response_user = endpoint_response.data + console.log("-----------------------------------------------------------------------------------------------------------") + + let user = new User() + user.id = response_user.id + user.email = response_user.email + + console.log(response_user) + + session.put('adonis-auth', response_user) + + console.log(session.all()) + // await auth.attempt(params.email,params.password) + await auth.loginViaId(user.id) // console.log(session.all()) // response.cookie('token', user.token) @@ -87,26 +96,26 @@ class AuthController { return response.route('index') }) .catch(function (error) { - // console.log(error); + console.log(error); }); - endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/logout" + // endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/auth/logout" - config = { - method: 'post', - url: endpoint_url, - data: new FormData() - }; + // config = { + // method: 'post', + // url: endpoint_url, + // data: new FormData() + // }; - await axios(config) - .then(async function (endpoint_response) { - // await auth.logout() + // await axios(config) + // .then(async function (endpoint_response) { + // // await auth.logout() - return response.route('index') - }) - .catch(function (error) { - // console.log(error); - }); + // return response.route('index') + // }) + // .catch(function (error) { + // // console.log(error); + // }); } catch (e){ console.log(e) } @@ -115,7 +124,7 @@ class AuthController { async logout({ session, auth, response, request }){ - console.log(session.all()) + // console.log(session.all()) try{ // console.log('aqui') // console.log(request.cookies()) diff --git a/src/adonisjs/config/session.js b/src/adonisjs/config/session.js index b42fbd159..da3fcd1fd 100644 --- a/src/adonisjs/config/session.js +++ b/src/adonisjs/config/session.js @@ -65,8 +65,9 @@ module.exports = { */ cookie: { httpOnly: true, - sameSite: true, - path: '/' + sameSite: false, + path: '/', + domain:'harena.com' }, /* diff --git a/src/adonisjs/resources/views/registration/login.edge b/src/adonisjs/resources/views/registration/login.edge index 1e4ef9cf6..309ef4c79 100644 --- a/src/adonisjs/resources/views/registration/login.edge +++ b/src/adonisjs/resources/views/registration/login.edge @@ -44,7 +44,7 @@ - Log in @endcomponent