Working on OAuth

app/Controllers/Http/AuthController.ts

@@ -1,32 +1,14 @@
 import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
-import User from "../../Models/User";
-import AuthValidator from "../../Validators/AuthValidator";
+import User from "App/Models/User";
 import {AllyUserContract} from "@ioc:Adonis/Addons/Ally";
 
 export default class AuthController {
 
-  public async loginWeb ({ request, auth, response }: HttpContextContract) {
-    const data = await request.validate(AuthValidator)
-    const {email, password, remember_me } = data
-    await auth.attempt(email, password, remember_me)
-    const user = await User.query()
-      .where('id', auth.user!.id)
-      .firstOrFail()
-    if (!remember_me) {
-      await user.merge({
-        rememberMeToken: ''
-      }).save()
-    }
-    return response.status(200).send({
-      user: user
-    })
-  }
-
-  public async loginApi ({ request, auth, response }: HttpContextContract) {
+  public async login ({ request, auth, response }: HttpContextContract) {
     const email = request.input('email')
     const password = request.input('password')
 
-    const token = await auth.use('api').attempt(email, password, {
+    const token = await auth.attempt(email, password, {
       expiresIn: '2 days'
     })
     return response.status(200).send(token.toJSON())
@@ -35,24 +17,17 @@ export default class AuthController {
   public async createInfiniteToken ({ request, auth, response }: HttpContextContract) {
     const email = request.input('email')
     const password = request.input('password')
-    const token = await auth.use('api').attempt(email, password)
+    const token = await auth.attempt(email, password)
     return response.status(200).send(token.toJSON())
   }
 
-  public async logoutWeb ({ auth, response }: HttpContextContract) {
+  public async logout ({ auth, response }: HttpContextContract) {
     await auth.logout()
     return response.status(200).send({
       message: 'You have been disconnected'
     })
   }
 
-  public async logoutApi ({ auth, response }: HttpContextContract) {
-    await auth.use('api').logout()
-    return response.status(200).send({
-      message: 'You have been disconnected'
-    })
-  }
-
   public async user ({ auth, response }: HttpContextContract) {
     await auth.authenticate()
     const user = await User.query()
@@ -86,7 +61,7 @@ export default class AuthController {
 
     const twitterUser = await twitter.user()
     const user = await this.createUser(twitterUser)
-    await auth.use('web').login(user)
+    await auth.login(user)
     return response.status(200).send({
       user: user
     })
@@ -115,7 +90,7 @@ export default class AuthController {
 
     const githubUser = await github.user()
     const user = await this.createUser(githubUser)
-    await auth.use('web').login(user)
+    await auth.login(user)
     return response.status(200).send({
       user: user
     })
@@ -144,7 +119,7 @@ export default class AuthController {
 
     const googleUser = await google.user()
     const user = await this.createUser(googleUser)
-    await auth.use('web').login(user)
+    await auth.login(user)
     return response.status(200).send({
       user: user
     })

app/Controllers/Http/GuestBookController.ts

@@ -1,6 +1,6 @@
 import {HttpContextContract} from "@ioc:Adonis/Core/HttpContext";
-import GuestBookMessage from "../../Models/GuestBookMessage";
-import GuestValidator from "../../Validators/guestbook/GuestValidator";
+import GuestBookMessage from "App/Models/GuestBookMessage";
+import GuestValidator from "App/Validators/guestbook/GuestValidator";
 
 export default class GuestBookController {
 

app/Controllers/Http/StatesController.ts

@@ -1,6 +1,6 @@
 import {HttpContextContract} from "@ioc:Adonis/Core/HttpContext";
 import Redis from "@ioc:Adonis/Addons/Redis";
-import {UpdateGitHubReadme} from "app/Tasks/UpdateGithubReadme";
+import {UpdateGitHubReadme} from "App/Tasks/UpdateGithubReadme";
 
 export default class StatesController {
 

app/Controllers/Http/SubscribersController.ts

@@ -1,6 +1,6 @@
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'
-import SubscriberValidator from "../../Validators/subscriber/SubscriberValidator";
-import Subscriber from "../../Models/Subscriber";
+import Subscriber from "App/Models/Subscriber";
+import SubscriberValidator from "App/Validators/subscriber/SubscriberValidator";
 
 export default class SubscribersController {
 

app/Controllers/Http/UsersController.ts

@@ -1,7 +1,7 @@
 import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
 import User from "App/Models/User";
-import UserStoreValidator from "../../../app/Validators/users/UserStoreValidator";
-import UserUpdateValidator from "../../../app/Validators/users/UserUpdateValidator";
+import UserStoreValidator from "App/Validators/users/UserStoreValidator";
+import UserUpdateValidator from "App/Validators/users/UserUpdateValidator";
 
 export default class UsersController {
 

config/ally.ts

@@ -27,18 +27,7 @@ const allyConfig: AllyConfig = {
 		driver: 'github',
 		clientId: Env.get('GITHUB_CLIENT_ID'),
 		clientSecret: Env.get('GITHUB_CLIENT_SECRET'),
-		callbackUrl: `${Env.get('BASE_URL')}:${Env.get('PORT')}/auth/github/callback`,
-	},
-	/*
-	|--------------------------------------------------------------------------
-	| Twitter driver
-	|--------------------------------------------------------------------------
-	*/
-	twitter: {
-		driver: 'twitter',
-		clientId: Env.get('TWITTER_CLIENT_ID'),
-		clientSecret: Env.get('TWITTER_CLIENT_SECRET'),
-		callbackUrl: `${Env.get('BASE_URL')}:${Env.get('PORT')}/auth/twitter/callback`,
+		callbackUrl: `${Env.get('BASE_URL')}/auth/github/callback`
 	},
 	/*
 	|--------------------------------------------------------------------------
@@ -49,7 +38,18 @@ const allyConfig: AllyConfig = {
 		driver: 'google',
 		clientId: Env.get('GOOGLE_CLIENT_ID'),
 		clientSecret: Env.get('GOOGLE_CLIENT_SECRET'),
-		callbackUrl: `${Env.get('BASE_URL')}:${Env.get('PORT')}/auth/google/callback`,
+    callbackUrl: `${Env.get('BASE_URL')}/auth/google/callback`
+	},
+	/*
+	|--------------------------------------------------------------------------
+	| Twitter driver
+	|--------------------------------------------------------------------------
+	*/
+	twitter: {
+		driver: 'twitter',
+		clientId: Env.get('TWITTER_CLIENT_ID'),
+		clientSecret: Env.get('TWITTER_CLIENT_SECRET'),
+		callbackUrl: `${Env.get('BASE_URL')}/auth/twitter/callback`
 	},
 }
 

contracts/ally.ts

@@ -11,13 +11,13 @@ declare module '@ioc:Adonis/Addons/Ally' {
 			config: GithubDriverConfig
 			implementation: GithubDriverContract
 		}
+    google: {
+      config: GoogleDriverConfig
+      implementation: GoogleDriverContract
+    }
 		twitter: {
 			config: TwitterDriverConfig
 			implementation: TwitterDriverContract
 		}
-		google: {
-			config: GoogleDriverConfig
-			implementation: GoogleDriverContract
-		}
 	}
 }

start/routes.ts

@@ -75,11 +75,8 @@ Route.group(() => {
   Route.get('/me', 'AuthController.user').middleware('auth')
   Route.post('/token', 'AuthController.createInfiniteToken')
 
-  Route.post('/web/login', 'AuthController.loginWeb')
-  Route.post('/web/logout', 'AuthController.logoutWeb')
-
-  Route.post('/api/login', 'AuthController.loginApi')
-  Route.post('/api/logout', 'AuthController.logoutApi')
+  Route.post('/login', 'AuthController.login')
+  Route.post('/logout', 'AuthController.logout')
 
   Route.get('/twitter/callback', 'AuthController.twitter')
   Route.get('/github/callback', 'AuthController.github')