chore: formattato il codice e rimosso un vecchio file

This commit is contained in:
2023-01-10 01:36:29 +01:00
parent 476c0b4a71
commit 2901a1f899
7 changed files with 41 additions and 61 deletions
+24 -22
View File
@@ -1,4 +1,4 @@
import { Router } from 'express';
import { Router } from 'express'
import { AuthorizationCode } from 'simple-oauth2'
import fetch from 'node-fetch'
@@ -11,53 +11,55 @@ export function setupOauth(r: Router) {
auth: {
authorizePath: process.env.OAUTH_AUTH_URL ?? '',
tokenHost: process.env.OAUTH_TOKEN_HOST ?? '',
tokenPath: process.env.OAUTH_TOKEN_PATH ?? ''
tokenPath: process.env.OAUTH_TOKEN_PATH ?? '',
},
};
}
const conf = {
redirect_uri: process.env.OAUTH_REDIRECT_URL ?? '',
scope: process.env.OAUTH_SCOPES ?? '',
}
const client = new AuthorizationCode(config);
const client = new AuthorizationCode(config)
const authorizationUri = client.authorizeURL({
redirect_uri: conf.redirect_uri,
scope: conf.scope,
state: ''
});
state: '',
})
r.get('/redirect', (req, res) => {
res.redirect(authorizationUri);
});
res.redirect(authorizationUri)
})
// Callback service parsing the authorization token and asking for the access token
r.get('/callback', async (req, res) => {
const code = req.query.code as string;
const code = req.query.code as string
const options = {
code,
redirect_uri: conf.redirect_uri
};
redirect_uri: conf.redirect_uri,
}
try {
const accessToken = await client.getToken(options);
const accessToken = await client.getToken(options)
console.log(accessToken.token.access_token)
const userInfo = await (await fetch(process.env.OAUTH_USER_INFO_URL ?? '', {
method: 'GET',
headers: {
'Authorization': "Bearer " + accessToken.token.access_token
}
})).json()
const userInfo = await (
await fetch(process.env.OAUTH_USER_INFO_URL ?? '', {
method: 'GET',
headers: {
Authorization: 'Bearer ' + accessToken.token.access_token,
},
})
).json()
// TODO: call to db && login
return res.status(200).json(userInfo);
return res.status(200).json(userInfo)
} catch (error) {
console.error('Access Token Error', error.message);
return res.status(500).redirect(`/error?message=${encodeURIComponent('Autenticazione fallita')}`);
console.error('Access Token Error', error.message)
return res.status(500).redirect(`/error?message=${encodeURIComponent('Autenticazione fallita')}`)
}
});
})
}
+5 -5
View File
@@ -229,14 +229,14 @@ export async function createApiRouter() {
solutions.forEach(s => {
if (!stats[s.sentBy]) {
stats[s.sentBy] = {
sentSolutionsCount: s.status !== "pending" ? 1 : 0,
correctSolutionsCount: s.status === "correct" ? 1 : 0
sentSolutionsCount: s.status !== 'pending' ? 1 : 0,
correctSolutionsCount: s.status === 'correct' ? 1 : 0,
}
} else {
if (s.status !== "pending") {
if (s.status !== 'pending') {
stats[s.sentBy].sentSolutionsCount += 1
}
if (s.status === "correct") {
if (s.status === 'correct') {
stats[s.sentBy].correctSolutionsCount += 1
}
}
@@ -248,7 +248,7 @@ export async function createApiRouter() {
r.get('/api/solutions', async (req, res) => {
let queryUser = (req.query.user ?? null) as UserId | null
let queryProblem = (req.query.problem ?? null) as ProblemId | null
let isPublic = (req.query.public === '')
let isPublic = req.query.public === ''
const requestUser = await getRequestUser(req)