summaryrefslogtreecommitdiff
path: root/src/server/api/service/github.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/service/github.ts')
-rw-r--r--src/server/api/service/github.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index 2b10fa02a0..12435b7e81 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -1,13 +1,13 @@
import * as Koa from 'koa';
import * as Router from '@koa/router';
-import { getJson } from '../../../misc/fetch';
+import { getJson } from '@/misc/fetch';
import { OAuth2 } from 'oauth';
-import config from '../../../config';
+import config from '@/config';
import { publishMainStream } from '../../../services/stream';
-import redis from '../../../db/redis';
+import { redisClient } from '../../../db/redis';
import { v4 as uuid } from 'uuid';
import signin from '../common/signin';
-import { fetchMeta } from '../../../misc/fetch-meta';
+import { fetchMeta } from '@/misc/fetch-meta';
import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user';
@@ -95,7 +95,7 @@ router.get('/connect/github', async ctx => {
state: uuid()
};
- redis.set(userToken, JSON.stringify(params));
+ redisClient.set(userToken, JSON.stringify(params));
const oauth2 = await getOath2();
ctx.redirect(oauth2!.getAuthorizeUrl(params));
@@ -116,7 +116,7 @@ router.get('/signin/github', async ctx => {
httpOnly: true
});
- redis.set(sessid, JSON.stringify(params));
+ redisClient.set(sessid, JSON.stringify(params));
const oauth2 = await getOath2();
ctx.redirect(oauth2!.getAuthorizeUrl(params));
@@ -143,7 +143,7 @@ router.get('/gh/cb', async ctx => {
}
const { redirect_uri, state } = await new Promise<any>((res, rej) => {
- redis.get(sessid, async (_, state) => {
+ redisClient.get(sessid, async (_, state) => {
res(JSON.parse(state));
});
});
@@ -194,7 +194,7 @@ router.get('/gh/cb', async ctx => {
}
const { redirect_uri, state } = await new Promise<any>((res, rej) => {
- redis.get(userToken, async (_, state) => {
+ redisClient.get(userToken, async (_, state) => {
res(JSON.parse(state));
});
});