arthur/artdanj-api
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/artdanj-api.git synced 2026-01-14 12:14:33 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

Testing Oauth

Browse Source
This commit is contained in:
Arthur Danjou
2021-08-19 19:27:57 +02:00
parent b0c5672100
commit 0bda1ecd12
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controllers/Http/AuthController.ts
View File

@@ -101,8 +101,10 @@ export default class AuthController {
}) })
} }
public async github ({ ally, auth, response }: HttpContextContract) { public async github ({ session, ally, auth, response }: HttpContextContract) {
const github = ally.use('github') const github = ally.use('github')
const redirected_url = await session.get('redirect')
await session.forget('redirect')
if (github.accessDenied()) { if (github.accessDenied()) {
return response.status(403).send({ return response.status(403).send({
@@ -125,7 +127,13 @@ export default class AuthController {
const githubUser = await github.user() const githubUser = await github.user()
const user = await this.createUser(githubUser) const user = await this.createUser(githubUser)
await auth.use('web').login(user, true) await auth.use('web').login(user, true)
return response.status(200).redirect('http://localhost:3333/guestbook') if (redirected_url) {
return response.status(200).redirect(redirected_url)
} else {
return response.status(200).send({
user: user
})
}
} }
public async google ({ ally, auth, response, }: HttpContextContract) { public async google ({ ally, auth, response, }: HttpContextContract) {

2
package.json
View File

@@ -27,7 +27,7 @@
"@adonisjs/mail": "^7.2.1", "@adonisjs/mail": "^7.2.1",
"@adonisjs/redis": "^7.0.6", "@adonisjs/redis": "^7.0.6",
"@adonisjs/repl": "^3.1.4", "@adonisjs/repl": "^3.1.4",
"@adonisjs/session": "^6.0.6", "@adonisjs/session": "^6.1.1",
"@adonisjs/view": "^6.0.3", "@adonisjs/view": "^6.0.3",
"axios": "^0.21.1", "axios": "^0.21.1",
"luxon": "^1.27.0", "luxon": "^1.27.0",

9
start/routes/auth.ts
View File

@@ -12,16 +12,17 @@ Route.group(() => {
Route.get('/google/callback', 'AuthController.google') Route.get('/google/callback', 'AuthController.google')
Route.get('/discord/callback', 'AuthController.discord') Route.get('/discord/callback', 'AuthController.discord')
Route.get('/twitter', async ({ally}) => { Route.get('/twitter', async ({ ally}) => {
return ally.use('twitter').redirect() return ally.use('twitter').redirect()
}) })
Route.get('/github', async ({ally}) => { Route.get('/github', async ({ request, session, ally}) => {
await session.put('redirect', request.input('redirect'))
return ally.use('github').redirect() return ally.use('github').redirect()
}) })
Route.get('/google', async ({ally}) => { Route.get('/google', async ({ ally}) => {
return ally.use('google').redirect() return ally.use('google').redirect()
}) })
Route.get('/discord', async ({ally}) => { Route.get('/discord', async ({ ally}) => {
return ally.use('discord').redirect() return ally.use('discord').redirect()
}) })
}).prefix('/auth') }).prefix('/auth')

2
yarn.lock
View File

@@ -273,7 +273,7 @@
rev-hash "^3.0.0" rev-hash "^3.0.0"
source-map-support "^0.5.19" source-map-support "^0.5.19"
"@adonisjs/session@^6.0.6": "@adonisjs/session@^6.1.1":
version "6.1.1" version "6.1.1"
resolved "https://registry.yarnpkg.com/@adonisjs/session/-/session-6.1.1.tgz#f3ffed30ecb82168b0660d316c46ffb053566114" resolved "https://registry.yarnpkg.com/@adonisjs/session/-/session-6.1.1.tgz#f3ffed30ecb82168b0660d316c46ffb053566114"
integrity sha512-TClg2O6wUnsoI4DhCS7F3mCRqmWO8AEh1kSrnKNl6ZqnxesLgU+30lsmMGTPfohSK/j2eU27+LpzuLFCz9Rf7Q== integrity sha512-TClg2O6wUnsoI4DhCS7F3mCRqmWO8AEh1kSrnKNl6ZqnxesLgU+30lsmMGTPfohSK/j2eU27+LpzuLFCz9Rf7Q==