diff --git a/nuxt.config.ts b/nuxt.config.ts index f4e6333e..bc699b81 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -3,14 +3,21 @@ export default defineNuxtConfig({ // JWT claims privateKey: '', publicKey: '', - // fetching GH repos in build and sponsors when deployed - githubToken: '', - // my GH ID - githubID: 'MDQ6VXNlcjI4NzA2Mzcy', + // for logging errors + axiom: { + dataset: 'roe.dev', + accessKey: '', + }, // emailing ideas sendgridApiKey: '', - // oauth flow - githubClientSecret: '', + github: { + // my GH ID + id: 'MDQ6VXNlcjI4NzA2Mzcy', + // fetching GH repos in build and sponsors when deployed + token: '', + // oauth flow + clientSecret: '', + }, public: { githubClientId: '', }, diff --git a/src/components/GithubRepos.vue b/src/components/GithubRepos.vue index 5e633858..b24c9800 100644 --- a/src/components/GithubRepos.vue +++ b/src/components/GithubRepos.vue @@ -73,7 +73,7 @@ const { data: repos } = await useAsyncData('repos', () => { { headers: { Accept: 'application/vnd.github.v3+json', - Authorization: `Bearer ${config.githubToken}`, + Authorization: `Bearer ${config.github.token}`, }, } ) diff --git a/src/server/plugins/axiom.ts b/src/server/plugins/axiom.ts new file mode 100644 index 00000000..e68b82cb --- /dev/null +++ b/src/server/plugins/axiom.ts @@ -0,0 +1,22 @@ +const config = useRuntimeConfig() +const baseURL = `https://cloud.axiom.co/api/v1/datasets/${config.axiom.dataset}/ingest` +export default defineNitroPlugin(() => { + if (process.dev) { + return + } + for (const name of ['log', 'warn', 'error', 'info']) { + const original = console[name] + console[name] = (arg: any, ...args: any[]) => { + $fetch(baseURL, { + method: 'POST', + body: [ + { name, message: arg, args, timestamp: new Date().toISOString() }, + ], + headers: { + Authorization: `Bearer ${config.axiom.accessKey}`, + }, + }) + original(...args) + } + } +}) diff --git a/src/server/routes/auth/[...provider].get.ts b/src/server/routes/auth/[...provider].get.ts index 15aabe3c..e264fb76 100644 --- a/src/server/routes/auth/[...provider].get.ts +++ b/src/server/routes/auth/[...provider].get.ts @@ -21,12 +21,12 @@ export default defineEventHandler(async event => { method: 'POST', body: { client_id: config.public.githubClientId, - client_secret: config.githubClientSecret, + client_secret: config.github.clientSecret, code, }, } ).catch(err => { - console.log('access', err) + console.error('access', err) return {} }) @@ -36,15 +36,21 @@ export default defineEventHandler(async event => { query(access_token, 'query { viewer { id, name, avatarUrl } }') .then(r => r.data.viewer) .catch(err => { - console.log('viewer', err) + console.error('viewer', err) return {} }), getSponsors().catch(err => { - console.log('sponsor', err) + console.error('sponsor', err) return [] }), ]) + console.info({ + sponsor: ids.includes(viewer.id), + avatar: viewer.avatarUrl, + name: viewer.name, + }) + // set custom JWT claim await loginUser(event, { sponsor: ids.includes(viewer.id), diff --git a/src/server/utils/sponsors.ts b/src/server/utils/sponsors.ts index 364f1e52..adef9248 100644 --- a/src/server/utils/sponsors.ts +++ b/src/server/utils/sponsors.ts @@ -16,12 +16,12 @@ export async function getSponsors (): Promise { const expired = Date.now() - (entry.mtime || 0) > ttl if (!entry.value || expired) { entry.value = await query( - useRuntimeConfig().githubToken, + useRuntimeConfig().github.token, sponsorQuery ).then(r => r.data.user.sponsors.edges.map(e => e.node.id)) // my ID - entry.value.push(useRuntimeConfig().githubID) + entry.value.push(useRuntimeConfig().github.id) entry.mtime = Date.now() useStorage()