sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source 
48ea805999 (commitcomment-48584326)
This commit is contained in:
syuilo
2021-03-23 14:54:09 +09:00
parent 48ea805999
commit 5c3a56b283
10 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/api/service/discord.ts
View File

@@ -4,7 +4,7 @@ import { getJson } from '../../../misc/fetch';
import { OAuth2 } from 'oauth';
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';
@@ -96,7 +96,7 @@ router.get('/connect/discord', async ctx => {
response_type: 'code'
};
redis.set(userToken, JSON.stringify(params));
redisClient.set(userToken, JSON.stringify(params));
const oauth2 = await getOAuth2();
ctx.redirect(oauth2!.getAuthorizeUrl(params));
@@ -118,7 +118,7 @@ router.get('/signin/discord', async ctx => {
httpOnly: true
});
redis.set(sessid, JSON.stringify(params));
redisClient.set(sessid, JSON.stringify(params));
const oauth2 = await getOAuth2();
ctx.redirect(oauth2!.getAuthorizeUrl(params));
@@ -145,7 +145,7 @@ router.get('/dc/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));
});
});
@@ -216,7 +216,7 @@ router.get('/dc/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));
});
});

10
src/server/api/service/github.ts
View File

@@ -4,7 +4,7 @@ import { getJson } from '../../../misc/fetch';
import { OAuth2 } from 'oauth';
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';
@@ -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));
});
});

10
src/server/api/service/twitter.ts
View File

@@ -2,7 +2,7 @@ import * as Koa from 'koa';
import * as Router from '@koa/router';
import { v4 as uuid } from 'uuid';
import autwh from 'autwh';
import redis from '../../../db/redis';
import { redisClient } from '../../../db/redis';
import { publishMainStream } from '../../../services/stream';
import config from '../../../config';
import signin from '../common/signin';
@@ -89,7 +89,7 @@ router.get('/connect/twitter', async ctx => {
const twAuth = await getTwAuth();
const twCtx = await twAuth!.begin();
redis.set(userToken, JSON.stringify(twCtx));
redisClient.set(userToken, JSON.stringify(twCtx));
ctx.redirect(twCtx.url);
});
@@ -99,7 +99,7 @@ router.get('/signin/twitter', async ctx => {
const sessid = uuid();
redis.set(sessid, JSON.stringify(twCtx));
redisClient.set(sessid, JSON.stringify(twCtx));
ctx.cookies.set('signin_with_twitter_sid', sessid, {
path: '/',
@@ -124,7 +124,7 @@ router.get('/tw/cb', async ctx => {
}
const get = new Promise<any>((res, rej) => {
redis.get(sessid, async (_, twCtx) => {
redisClient.get(sessid, async (_, twCtx) => {
res(twCtx);
});
});
@@ -153,7 +153,7 @@ router.get('/tw/cb', async ctx => {
}
const get = new Promise<any>((res, rej) => {
redis.get(userToken, async (_, twCtx) => {
redisClient.get(userToken, async (_, twCtx) => {
res(twCtx);
});
});