This commit is contained in:
Andras Bacsai
2021-05-16 21:54:44 +02:00
committed by GitHub
parent 23a4ebb74a
commit adcd68c1ab
68 changed files with 2466 additions and 1194 deletions

View File

@@ -1,10 +1,10 @@
import { githubAPI } from '$api';
import type { Request } from '@sveltejs/kit';
import mongoose from 'mongoose';
import User from '$models/User';
import Settings from '$models/Settings';
import cuid from 'cuid';
import jsonwebtoken from 'jsonwebtoken';
import { githubAPI } from '$lib/api/github';
export async function get(request: Request) {
const code = request.query.get('code');
@@ -17,7 +17,7 @@ export async function get(request: Request) {
{ headers: { accept: 'application/json' } }
)
).json();
const { avatar_url, id } = await (await githubAPI(request, '/user', access_token)).body;
const { avatar_url } = await (await githubAPI(request, '/user', access_token)).body;
const email = (await githubAPI(request, '/user/emails', access_token)).body.filter(
(e) => e.primary
)[0].email;
@@ -41,11 +41,10 @@ export async function get(request: Request) {
try {
await newUser.save();
await defaultSettings.save();
} catch (e) {
console.log(e);
} catch (error) {
return {
status: 500,
body: e
error: error.message || error
};
}
} else {
@@ -73,12 +72,11 @@ export async function get(request: Request) {
});
try {
await newUser.save();
} catch (e) {
console.log(e);
} catch (error) {
return {
status: 500,
body: {
error: e
error: error.message || error
}
};
}
@@ -103,8 +101,6 @@ export async function get(request: Request) {
}
};
} catch (error) {
console.log('error happened');
console.log(error);
return { status: 500, body: { ...error } };
return { status: 500, body: { error: error.message || error } };
}
}