chore: code formatting

This commit is contained in:
github-actions[bot]
2022-08-06 04:50:31 +00:00
parent 587ceecc84
commit e437a4da7c
6 changed files with 41 additions and 36 deletions

View File

@@ -1,18 +1,18 @@
//Imports //Imports
import octokit from "@octokit/graphql" import octokit from "@octokit/graphql"
import OctokitRest from "@octokit/rest" import OctokitRest from "@octokit/rest"
import axios from "axios"
import compression from "compression" import compression from "compression"
import crypto from "crypto"
import express from "express" import express from "express"
import ratelimit from "express-rate-limit" import ratelimit from "express-rate-limit"
import cache from "memory-cache" import cache from "memory-cache"
import util from "util"
import url from "url" import url from "url"
import axios from "axios" import util from "util"
import mocks from "../../../tests/mocks/index.mjs" import mocks from "../../../tests/mocks/index.mjs"
import metrics from "../metrics/index.mjs" import metrics from "../metrics/index.mjs"
import presets from "../metrics/presets.mjs" import presets from "../metrics/presets.mjs"
import setup from "../metrics/setup.mjs" import setup from "../metrics/setup.mjs"
import crypto from "crypto"
/**App */ /**App */
export default async function({sandbox = false} = {}) { export default async function({sandbox = false} = {}) {
@@ -68,8 +68,9 @@ export default async function({sandbox = false} = {}) {
console.debug(`metrics/app/session/${login} > authenticated with session ${session.substring(0, 6)}, using custom octokit`) console.debug(`metrics/app/session/${login} > authenticated with session ${session.substring(0, 6)}, using custom octokit`)
return {login, graphql: octokit.graphql.defaults({headers: {authorization: `token ${token}`}}), rest: new OctokitRest.Octokit({auth: token})} return {login, graphql: octokit.graphql.defaults({headers: {authorization: `token ${token}`}}), rest: new OctokitRest.Octokit({auth: token})}
} }
else if (session) else if (session) {
console.debug(`metrics/app/session > unknown session ${session.substring(0, 6)}, using default octokit`) console.debug(`metrics/app/session > unknown session ${session.substring(0, 6)}, using default octokit`)
}
return null return null
} }
@@ -238,11 +239,14 @@ export default async function({sandbox = false} = {}) {
try { try {
//Authorize user //Authorize user
console.debug("metrics/app/oauth > authorization") console.debug("metrics/app/oauth > authorization")
const {data} = await axios.post("https://github.com/login/oauth/access_token", `${new url.URLSearchParams({ const {data} = await axios.post(
"https://github.com/login/oauth/access_token",
`${new url.URLSearchParams({
client_id: conf.settings.oauth.id, client_id: conf.settings.oauth.id,
client_secret: conf.settings.oauth.secret, client_secret: conf.settings.oauth.secret,
code, code,
})}`) })}`,
)
const token = new url.URLSearchParams(data).get("access_token") const token = new url.URLSearchParams(data).get("access_token")
//Validate user //Validate user
const {data: {login}} = await axios.get("https://api.github.com/user", {headers: {Authorization: `token ${token}`}}) const {data: {login}} = await axios.get("https://api.github.com/user", {headers: {Authorization: `token ${token}`}})
@@ -279,8 +283,9 @@ export default async function({sandbox = false} = {}) {
app.get("/.oauth/redirect", limiter, (req, res) => res.sendFile(`${conf.paths.statics}/oauth/redirect.html`)) app.get("/.oauth/redirect", limiter, (req, res) => res.sendFile(`${conf.paths.statics}/oauth/redirect.html`))
app.get("/.oauth/enabled", limiter, (req, res) => res.json(true)) app.get("/.oauth/enabled", limiter, (req, res) => res.json(true))
} }
else else {
app.get("/.oauth/enabled", limiter, (req, res) => res.json(false)) app.get("/.oauth/enabled", limiter, (req, res) => res.json(false))
}
//Pending requests //Pending requests
const pending = new Map() const pending = new Map()

View File

@@ -352,7 +352,7 @@
if (!Array.isArray(this.extras)) if (!Array.isArray(this.extras))
return this.extras return this.extras
return required.filter(permission => !this.extras.includes(permission)).length === 0 return required.filter(permission => !this.extras.includes(permission)).length === 0
} },
}, },
}) })
})() })()