summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/service/github.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/service/github.ts
parent.js (diff)
downloadsharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/api/service/github.ts')
-rw-r--r--packages/backend/src/server/api/service/github.ts15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/backend/src/server/api/service/github.ts b/packages/backend/src/server/api/service/github.ts
index ce032db181..61bb768a63 100644
--- a/packages/backend/src/server/api/service/github.ts
+++ b/packages/backend/src/server/api/service/github.ts
@@ -10,6 +10,7 @@ import signin from '../common/signin.js';
import { fetchMeta } from '@/misc/fetch-meta.js';
import { Users, UserProfiles } from '@/models/index.js';
import { ILocalUser } from '@/models/entities/user.js';
+import { IsNull } from 'typeorm';
function getUserToken(ctx: Koa.BaseContext): string | null {
return ((ctx.headers['cookie'] || '').match(/igi=(\w+)/) || [null, null])[1];
@@ -40,12 +41,12 @@ router.get('/disconnect/github', async ctx => {
return;
}
- const user = await Users.findOneOrFail({
- host: null,
+ const user = await Users.findOneByOrFail({
+ host: IsNull(),
token: userToken,
});
- const profile = await UserProfiles.findOneOrFail(user.id);
+ const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
delete profile.integrations.github;
@@ -184,7 +185,7 @@ router.get('/gh/cb', async ctx => {
return;
}
- signin(ctx, await Users.findOne(link.userId) as ILocalUser, true);
+ signin(ctx, await Users.findOneBy({ id: link.userId }) as ILocalUser, true);
} else {
const code = ctx.query.code;
@@ -227,12 +228,12 @@ router.get('/gh/cb', async ctx => {
return;
}
- const user = await Users.findOneOrFail({
- host: null,
+ const user = await Users.findOneByOrFail({
+ host: IsNull(),
token: userToken,
});
- const profile = await UserProfiles.findOneOrFail(user.id);
+ const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
await UserProfiles.update(user.id, {
integrations: {