Skip to content

Commit

Permalink
Merge pull request #91 from datasci4health/development
Browse files Browse the repository at this point in the history 
New routes, delete quest, new InitialSeeder, js standard style
  • Loading branch information
@HeitorMatt
HeitorMatt authored Sep 10, 2020
2 parents d4a90e9 + 93b00b6 commit 198f6df
Show file tree
Hide file tree
Showing 64 changed files with 3,080 additions and 1,223 deletions.
88 changes: 40 additions & 48 deletions src/adonisjs/app/Controllers/Http/AuthController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,51 @@

const Logger = use('Logger')

const User = use('App/Models/v1/User');
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)) {
if (await auth.remember(true).attempt(email, password)) {

console.log('------------------------------- attempt')
// console.log(session.all())

let user = await User.findBy('email', email)
// let token = await auth.generate(user)

// let authenticatedUser = new User()
// authenticatedUser.id = user.id
// authenticatedUser.email = user.email
// authenticatedUser.username = user.username

Object.assign(user, { 'adonisAuth': session.get('adonis-auth') })
// return response.json('Logged in successfully')

// let adonis_session = session.get('adonis-auth')
console.log(session.all())
// console.log(auth)
return response.json(user)

}
}
catch (e) {
console.log(e)
return response.status(e.status).json({ message: e.message })
}
async login ({ request, auth, response, session }) {
console.log('v2/session')
Logger.info('login attempt via v2/auth/login (SESSION)')
try {
const { email, password } = request.all()
// if (await auth.remember(true).attempt(email, password)) {
if (await auth.remember(true).attempt(email, password)) {
console.log('------------------------------- attempt')
// console.log(session.all())

const user = await User.findBy('email', email)
// let token = await auth.generate(user)

// let authenticatedUser = new User()
// authenticatedUser.id = user.id
// authenticatedUser.email = user.email
// authenticatedUser.username = user.username

Object.assign(user, { adonisAuth: session.get('adonis-auth') })
// return response.json('Logged in successfully')

// let adonis_session = session.get('adonis-auth')
console.log(session.all())
// console.log(auth)
return response.json(user)
}
} catch (e) {
console.log(e)
return response.status(e.status).json({ message: e.message })
}
}

async logout({ auth, response }) {
try{
await auth.logout()

return response.json('Logged out successfuly')
}catch(e){
console.log(e)
return response.status(500).json(e.message)
}

async logout ({ auth, response }) {
try {
await auth.logout()

return response.json('Logged out successfuly')
} catch (e) {
console.log(e)
return response.status(500).json(e.message)
}
}
}

module.exports = AuthController




88 changes: 44 additions & 44 deletions src/adonisjs/app/Controllers/Http/TestController.js
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
'use strict'

const Case = use('App/Models/v1/Case');
const CloudinaryService = use('App/Services/CloudinaryService');
const Case = use('App/Models/v1/Case')
const CloudinaryService = use('App/Services/CloudinaryService')

class TestController {
async test() {
console.log('Method reached')

// const profilePic = request.file('profile_pic', {
// types: ['image'],
// size: '2mb'
// })

// await profilePic.move(Helpers.tmpPath('uploads'), {
// name: 'custom-name.jpg',
// overwrite: true
// })

// if (!profilePic.moved()) {
// return profilePic.error()
// }
// return 'File moved'
}

async index({ view }) {
const cases = await Case.all();
// console.log(cases.toJSON())
return view.render('index', { cases: cases.toJSON() })
}

async create({ request, response, view, session }) {
console.log('chegou')
const { name } = request.all();
const file = request.file('image');
try {
const cloudinaryResponse = await CloudinaryService.v2.uploader.upload(file.tmpPath, {folder: 'harena'});
let c = new Case();
c.name = name;
c.image_url = cloudinaryResponse.secure_url;
await c.save();
session.flash({success: 'Successfully added case'});
return response.redirect('back');
} catch (e) {
console.log(e)
session.flash({error: 'Error Uploading Image'});
return response.redirect('/')
}
async test () {
console.log('Method reached')

// const profilePic = request.file('profile_pic', {
// types: ['image'],
// size: '2mb'
// })

// await profilePic.move(Helpers.tmpPath('uploads'), {
// name: 'custom-name.jpg',
// overwrite: true
// })

// if (!profilePic.moved()) {
// return profilePic.error()
// }
// return 'File moved'
}

async index ({ view }) {
const cases = await Case.all()
// console.log(cases.toJSON())
return view.render('index', { cases: cases.toJSON() })
}

async create ({ request, response, view, session }) {
console.log('chegou')
const { name } = request.all()
const file = request.file('image')
try {
const cloudinaryResponse = await CloudinaryService.v2.uploader.upload(file.tmpPath, { folder: 'harena' })
const c = new Case()
c.name = name
c.image_url = cloudinaryResponse.secure_url
await c.save()
session.flash({ success: 'Successfully added case' })
return response.redirect('back')
} catch (e) {
console.log(e)
session.flash({ error: 'Error Uploading Image' })
return response.redirect('/')
}
}
}

module.exports = TestController
167 changes: 80 additions & 87 deletions src/adonisjs/app/Controllers/Http/v1/AdminController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,113 +6,106 @@

const Database = use('Database')

const Role = use('Adonis/Acl/Role');
const Permission = use('Adonis/Acl/Permission');
const User = use('App/Models/v1/User');
const Role = use('Adonis/Acl/Role')
const Permission = use('Adonis/Acl/Permission')
const User = use('App/Models/v1/User')

const uuidv4 = require('uuid/v4');
const uuidv4 = require('uuid/v4')

class AdminController {
async create_role ({ request, response }) {
try {
const role = new Role()
role.id = await uuidv4()

async create_role({ request, response }) {
try {
const r = request.all()
role.merge(r)

let role = new Role()
role.id = await uuidv4()
await role.save()

let r = request.all()
role.merge(r)
return response.json(role)
} catch (e) {
console.log(e)

await role.save()

return response.json(role)
} catch(e){
console.log(e)

if (e.code === 'ER_DUP_ENTRY') {
return response.status(409).json({ code: e.code, message: e.sqlMessage })
}
return response.status(500).json({ message: e.toString() })
}
if (e.code === 'ER_DUP_ENTRY') {
return response.status(409).json({ code: e.code, message: e.sqlMessage })
}
return response.status(500).json({ message: e.toString() })
}


async linkRoleUser({ request, response }) {
try {
const {userId, roleId} = request.post()
let user = await User.find(userId)
let role = await Role.find(roleId)

await user.roles().attach(role.id)
return response.json(role.slug + ' role has given to the user ' + user.username)
} catch (e) {
console.log(e)
return response.status(500).json(e)
}
}

async linkRoleUser ({ request, response }) {
try {
const { userId, roleId } = request.post()
const user = await User.find(userId)
const role = await Role.find(roleId)

await user.roles().attach(role.id)
return response.json(role.slug + ' role has given to the user ' + user.username)
} catch (e) {
console.log(e)
return response.status(500).json(e)
}
}

async link_role_permission({ request, response }) {
try {
const {permission_id, role_id} = request.post()
let permission = await User.find(permission_id)
let role = await Role.find(role_id)
async link_role_permission ({ request, response }) {
try {
const { permission_id, role_id } = request.post()
const permission = await User.find(permission_id)
const role = await Role.find(role_id)

await role.permissions().attach(permission.id)
await role.permissions().attach(permission.id)

role.permissions = await role.permissions().fetch()
role.permissions = await role.permissions().fetch()

return response.json(role)
} catch (e) {
console.log(e)
if (e.code === 'ER_DUP_ENTRY') {
return response.status(409).json({ message: e.message })
}
return response.json(role)
} catch (e) {
console.log(e)
if (e.code === 'ER_DUP_ENTRY') {
return response.status(409).json({ message: e.message })
}

return response.status(500).json({ message: e.toString() })
}
return response.status(500).json({ message: e.toString() })
}

async list_roles({ response }) {
try{
let roles = await Role.all()
return response.json(roles)
} catch(e){
return response.status(500).json({ message: e.toString() })
}
}

async list_roles ({ response }) {
try {
const roles = await Role.all()
return response.json(roles)
} catch (e) {
return response.status(500).json({ message: e.toString() })
}
}

async list_roles_by_user ({ params, response }) {
try {
const user = await User.find(params.id)


async list_roles_by_user({ params, response }) {
try{
let user = await User.find(params.id)

return response.json(await user.roles().fetch())
} catch(e){
console.log(e)
return response.status(500).json({ message: e.toString() })
}
return response.json(await user.roles().fetch())
} catch (e) {
console.log(e)
return response.status(500).json({ message: e.toString() })
}



async revoke_tokens({ auth, params, response }) {
try{
// await user.tokens().update({ is_revoked: true })
// console.log('antes')
// console.log(await auth.listTokens())
// // const affectedRows = await Database
// // .table('tokens').update('is_revoked', true)
// // console.log(affectedRows)
// console.log('depois')
// console.log(await auth.listTokens())
await auth.revokeTokens()
return response.json('tokens revoked')
} catch(e){
console.log(e)
return response.status(500).json({ message: e.message })
}
}

async revoke_tokens ({ auth, params, response }) {
try {
// await user.tokens().update({ is_revoked: true })
// console.log('antes')
// console.log(await auth.listTokens())
// // const affectedRows = await Database
// // .table('tokens').update('is_revoked', true)
// // console.log(affectedRows)
// console.log('depois')
// console.log(await auth.listTokens())
await auth.revokeTokens()
return response.json('tokens revoked')
} catch (e) {
console.log(e)
return response.status(500).json({ message: e.message })
}
}
}

module.exports = AdminController
Loading

0 comments on commit 198f6df

Please sign in to comment.