Signed-off-by: Arthur DANJOU <arthurdanjou@outlook.fr>
This commit is contained in:
2021-07-02 17:23:50 +02:00
parent 69065a03c0
commit 7dd2cdfdd5
10 changed files with 52 additions and 49 deletions

View File

@@ -95,7 +95,7 @@ export default class AuthController {
const githubUser = await github.user()
const user = await this.createUser(githubUser)
await auth.use('web').login(user)
await auth.use('web').login(user, true)
return response.status(200).send({
user: user
})
@@ -124,7 +124,7 @@ export default class AuthController {
const googleUser = await google.user()
const user = await this.createUser(googleUser)
await auth.use('web').login(user)
await auth.use('web').login(user, true)
return response.status(200).send({
user: user
})

View File

@@ -1,4 +1,5 @@
import {HttpContextContract} from "@ioc:Adonis/Core/HttpContext";
import {getDiscordActivity} from "App/Tasks/GetDiscordActivity";
export default class ProfileController {
@@ -30,7 +31,7 @@ export default class ProfileController {
"Software dev"
],
technologies: {
web_app: ["VueJs", "NuxtJs", "Sass", "Tailwind", "WindiCss"],
web_app: ["VueJs", "NuxtJs", "Sass", "TailwindCss", "WindiCss"],
desktop_app: ["ElectronJs"],
mobile_app: ["React Native", "Vue Native"],
back_end: {
@@ -45,4 +46,12 @@ export default class ProfileController {
},
})
}
//todo get discord Activity
public async discord({response}: HttpContextContract) {
const activity = await getDiscordActivity()
return response.status(200).send({
status: activity
})
}
}

View File

@@ -1,6 +1,5 @@
import {HttpContextContract} from '@ioc:Adonis/Core/HttpContext'
import {AuthenticationException} from '@adonisjs/auth/build/standalone'
import Logger from "@ioc:Adonis/Core/Logger";
/**
* Auth middleware is meant to restrict un-authenticated access to a given route
@@ -34,9 +33,7 @@ export default class AuthMiddleware {
for (let guard of guards) {
guardLastAttempted = guard
Logger.info('Trying to connect with ' + guard)
if (await auth.use(guard).check()) {
Logger.info(auth.use(guard).isLoggedIn)
/**
* Instruct auth to use the given guard as the default guard for
* the rest of the request, since the user authenticated

View File

@@ -1,3 +1,6 @@
export async function UpdateGitHubReadMe(): Promise<void> {
import axios, {AxiosResponse} from "axios";
import Env from "@ioc:Adonis/Core/Env";
export async function getDiscordActivity(): Promise<AxiosResponse> {
return await axios.get(`https://api.lanyard.rest/v1/users/${Env.get('DISCORD_ID')}`)
}