summaryrefslogtreecommitdiff
path: root/src/server/api/service
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/service')
-rw-r--r--src/server/api/service/discord.ts163
-rw-r--r--src/server/api/service/github.ts86
-rw-r--r--src/server/api/service/twitter.ts69
3 files changed, 172 insertions, 146 deletions
diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts
index 92f5bbf72d..d8a979b5b2 100644
--- a/src/server/api/service/discord.ts
+++ b/src/server/api/service/discord.ts
@@ -2,13 +2,15 @@ import * as Koa from 'koa';
import * as Router from 'koa-router';
import * as request from 'request';
import { OAuth2 } from 'oauth';
-import User, { pack, ILocalUser } from '../../../models/user';
import config from '../../../config';
import { publishMainStream } from '../../../services/stream';
import redis from '../../../db/redis';
import * as uuid from 'uuid';
import signin from '../common/signin';
import fetchMeta from '../../../misc/fetch-meta';
+import { Users, UserProfiles } from '../../../models';
+import { ILocalUser } from '../../../models/entities/user';
+import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) {
return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1];
@@ -39,19 +41,27 @@ router.get('/disconnect/discord', async ctx => {
return;
}
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
- 'token': userToken
+ token: userToken
+ }).then(ensure);
+
+ await UserProfiles.update({
+ userId: user.id
}, {
- $set: {
- 'discord': null
- }
+ discord: false,
+ discordAccessToken: null,
+ discordRefreshToken: null,
+ discordExpiresDate: null,
+ discordId: null,
+ discordUsername: null,
+ discordDiscriminator: null,
});
ctx.body = `Discordの連携を解除しました :v:`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
@@ -62,8 +72,8 @@ async function getOAuth2() {
if (meta.enableDiscordIntegration) {
return new OAuth2(
- meta.discordClientId,
- meta.discordClientSecret,
+ meta.discordClientId!,
+ meta.discordClientSecret!,
'https://discordapp.com/',
'api/oauth2/authorize',
'api/oauth2/token');
@@ -94,7 +104,7 @@ router.get('/connect/discord', async ctx => {
redis.set(userToken, JSON.stringify(params));
const oauth2 = await getOAuth2();
- ctx.redirect(oauth2.getAuthorizeUrl(params));
+ ctx.redirect(oauth2!.getAuthorizeUrl(params));
});
router.get('/signin/discord', async ctx => {
@@ -120,7 +130,7 @@ router.get('/signin/discord', async ctx => {
redis.set(sessid, JSON.stringify(params));
const oauth2 = await getOAuth2();
- ctx.redirect(oauth2.getAuthorizeUrl(params));
+ ctx.redirect(oauth2!.getAuthorizeUrl(params));
});
router.get('/dc/cb', async ctx => {
@@ -155,24 +165,22 @@ router.get('/dc/cb', async ctx => {
}
const { accessToken, refreshToken, expiresDate } = await new Promise<any>((res, rej) =>
- oauth2.getOAuthAccessToken(
- code,
- {
- grant_type: 'authorization_code',
- redirect_uri
- },
- (err, accessToken, refreshToken, result) => {
- if (err)
- rej(err);
- else if (result.error)
- rej(result.error);
- else
+ oauth2!.getOAuthAccessToken(code, {
+ grant_type: 'authorization_code',
+ redirect_uri
+ }, (err, accessToken, refreshToken, result) => {
+ if (err) {
+ rej(err);
+ } else if (result.error) {
+ rej(result.error);
+ } else {
res({
accessToken,
refreshToken,
expiresDate: Date.now() + Number(result.expires_in) * 1000
});
- }));
+ }
+ }));
const { id, username, discriminator } = await new Promise<any>((res, rej) =>
request({
@@ -182,10 +190,11 @@ router.get('/dc/cb', async ctx => {
'User-Agent': config.userAgent
}
}, (err, response, body) => {
- if (err)
+ if (err) {
rej(err);
- else
+ } else {
res(JSON.parse(body));
+ }
}));
if (!id || !username || !discriminator) {
@@ -193,32 +202,30 @@ router.get('/dc/cb', async ctx => {
return;
}
- let user = await User.findOne({
- host: null,
- 'discord.id': id
- }) as ILocalUser;
+ const profile = await UserProfiles.createQueryBuilder()
+ .where('discord @> :discord', {
+ discord: {
+ id: id,
+ },
+ })
+ .andWhere('userHost IS NULL')
+ .getOne();
- if (!user) {
+ if (profile == null) {
ctx.throw(404, `@${username}#${discriminator}と連携しているMisskeyアカウントはありませんでした...`);
return;
}
- user = await User.findOneAndUpdate({
- host: null,
- 'discord.id': id
- }, {
- $set: {
- discord: {
- accessToken,
- refreshToken,
- expiresDate,
- username,
- discriminator
- }
- }
- }) as ILocalUser;
+ await UserProfiles.update({ userId: profile.userId }, {
+ discord: true,
+ discordAccessToken: accessToken,
+ discordRefreshToken: refreshToken,
+ discordExpiresDate: expiresDate,
+ discordUsername: username,
+ discordDiscriminator: discriminator
+ });
- signin(ctx, user, true);
+ signin(ctx, await Users.findOne(profile.userId) as ILocalUser, true);
} else {
const code = ctx.query.code;
@@ -239,24 +246,22 @@ router.get('/dc/cb', async ctx => {
}
const { accessToken, refreshToken, expiresDate } = await new Promise<any>((res, rej) =>
- oauth2.getOAuthAccessToken(
- code,
- {
- grant_type: 'authorization_code',
- redirect_uri
- },
- (err, accessToken, refreshToken, result) => {
- if (err)
- rej(err);
- else if (result.error)
- rej(result.error);
- else
- res({
- accessToken,
- refreshToken,
- expiresDate: Date.now() + Number(result.expires_in) * 1000
- });
- }));
+ oauth2!.getOAuthAccessToken(code, {
+ grant_type: 'authorization_code',
+ redirect_uri
+ }, (err, accessToken, refreshToken, result) => {
+ if (err) {
+ rej(err);
+ } else if (result.error) {
+ rej(result.error);
+ } else {
+ res({
+ accessToken,
+ refreshToken,
+ expiresDate: Date.now() + Number(result.expires_in) * 1000
+ });
+ }
+ }));
const { id, username, discriminator } = await new Promise<any>((res, rej) =>
request({
@@ -266,10 +271,11 @@ router.get('/dc/cb', async ctx => {
'User-Agent': config.userAgent
}
}, (err, response, body) => {
- if (err)
+ if (err) {
rej(err);
- else
+ } else {
res(JSON.parse(body));
+ }
}));
if (!id || !username || !discriminator) {
@@ -277,26 +283,25 @@ router.get('/dc/cb', async ctx => {
return;
}
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
token: userToken
- }, {
- $set: {
- discord: {
- accessToken,
- refreshToken,
- expiresDate,
- id,
- username,
- discriminator
- }
- }
+ }).then(ensure);
+
+ await UserProfiles.update({ userId: user.id }, {
+ discord: true,
+ discordAccessToken: accessToken,
+ discordRefreshToken: refreshToken,
+ discordExpiresDate: expiresDate,
+ discordId: id,
+ discordUsername: username,
+ discordDiscriminator: discriminator
});
ctx.body = `Discord: @${username}#${discriminator} を、Misskey: @${user.username} に接続しました！`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index cf3589a4b7..a4d274cc62 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -2,13 +2,15 @@ import * as Koa from 'koa';
import * as Router from 'koa-router';
import * as request from 'request';
import { OAuth2 } from 'oauth';
-import User, { pack, ILocalUser } from '../../../models/user';
import config from '../../../config';
import { publishMainStream } from '../../../services/stream';
import redis from '../../../db/redis';
import * as uuid from 'uuid';
import signin from '../common/signin';
import fetchMeta from '../../../misc/fetch-meta';
+import { Users, UserProfiles } from '../../../models';
+import { ILocalUser } from '../../../models/entities/user';
+import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) {
return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1];
@@ -39,19 +41,24 @@ router.get('/disconnect/github', async ctx => {
return;
}
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
- 'token': userToken
+ token: userToken
+ }).then(ensure);
+
+ await UserProfiles.update({
+ userId: user.id
}, {
- $set: {
- 'github': null
- }
+ github: false,
+ githubAccessToken: null,
+ githubId: null,
+ githubLogin: null,
});
ctx.body = `GitHubの連携を解除しました :v:`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
@@ -60,7 +67,7 @@ router.get('/disconnect/github', async ctx => {
async function getOath2() {
const meta = await fetchMeta();
- if (meta.enableGithubIntegration) {
+ if (meta.enableGithubIntegration && meta.githubClientId && meta.githubClientSecret) {
return new OAuth2(
meta.githubClientId,
meta.githubClientSecret,
@@ -93,7 +100,7 @@ router.get('/connect/github', async ctx => {
redis.set(userToken, JSON.stringify(params));
const oauth2 = await getOath2();
- ctx.redirect(oauth2.getAuthorizeUrl(params));
+ ctx.redirect(oauth2!.getAuthorizeUrl(params));
});
router.get('/signin/github', async ctx => {
@@ -118,7 +125,7 @@ router.get('/signin/github', async ctx => {
redis.set(sessid, JSON.stringify(params));
const oauth2 = await getOath2();
- ctx.redirect(oauth2.getAuthorizeUrl(params));
+ ctx.redirect(oauth2!.getAuthorizeUrl(params));
});
router.get('/gh/cb', async ctx => {
@@ -153,17 +160,17 @@ router.get('/gh/cb', async ctx => {
}
const { accessToken } = await new Promise<any>((res, rej) =>
- oauth2.getOAuthAccessToken(
- code,
- { redirect_uri },
- (err, accessToken, refresh, result) => {
- if (err)
- rej(err);
- else if (result.error)
- rej(result.error);
- else
- res({ accessToken });
- }));
+ oauth2!.getOAuthAccessToken(code, {
+ redirect_uri
+ }, (err, accessToken, refresh, result) => {
+ if (err) {
+ rej(err);
+ } else if (result.error) {
+ rej(result.error);
+ } else {
+ res({ accessToken });
+ }
+ }));
const { login, id } = await new Promise<any>((res, rej) =>
request({
@@ -185,17 +192,21 @@ router.get('/gh/cb', async ctx => {
return;
}
- const user = await User.findOne({
- host: null,
- 'github.id': id
- }) as ILocalUser;
+ const link = await UserProfiles.createQueryBuilder()
+ .where('github @> :github', {
+ github: {
+ id: id,
+ },
+ })
+ .andWhere('userHost IS NULL')
+ .getOne();
- if (!user) {
+ if (link == null) {
ctx.throw(404, `@${login}と連携しているMisskeyアカウントはありませんでした...`);
return;
}
- signin(ctx, user, true);
+ signin(ctx, await Users.findOne(link.userId) as ILocalUser, true);
} else {
const code = ctx.query.code;
@@ -216,7 +227,7 @@ router.get('/gh/cb', async ctx => {
}
const { accessToken } = await new Promise<any>((res, rej) =>
- oauth2.getOAuthAccessToken(
+ oauth2!.getOAuthAccessToken(
code,
{ redirect_uri },
(err, accessToken, refresh, result) => {
@@ -248,23 +259,22 @@ router.get('/gh/cb', async ctx => {
return;
}
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
token: userToken
- }, {
- $set: {
- github: {
- accessToken,
- id,
- login
- }
- }
+ }).then(ensure);
+
+ await UserProfiles.update({ userId: user.id }, {
+ github: true,
+ githubAccessToken: accessToken,
+ githubId: id,
+ githubLogin: login,
});
ctx.body = `GitHub: @${login} を、Misskey: @${user.username} に接続しました！`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index fc23808e21..39fdfd8654 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -3,11 +3,13 @@ import * as Router from 'koa-router';
import * as uuid from 'uuid';
import autwh from 'autwh';
import redis from '../../../db/redis';
-import User, { pack, ILocalUser } from '../../../models/user';
import { publishMainStream } from '../../../services/stream';
import config from '../../../config';
import signin from '../common/signin';
import fetchMeta from '../../../misc/fetch-meta';
+import { Users, UserProfiles } from '../../../models';
+import { ILocalUser } from '../../../models/entities/user';
+import { ensure } from '../../../prelude/ensure';
function getUserToken(ctx: Koa.BaseContext) {
return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1];
@@ -38,19 +40,25 @@ router.get('/disconnect/twitter', async ctx => {
return;
}
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
- 'token': userToken
+ token: userToken
+ }).then(ensure);
+
+ await UserProfiles.update({
+ userId: user.id
}, {
- $set: {
- 'twitter': null
- }
+ twitter: false,
+ twitterAccessToken: null,
+ twitterAccessTokenSecret: null,
+ twitterUserId: null,
+ twitterScreenName: null,
});
ctx.body = `Twitterの連携を解除しました :v:`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
@@ -59,7 +67,7 @@ router.get('/disconnect/twitter', async ctx => {
async function getTwAuth() {
const meta = await fetchMeta();
- if (meta.enableTwitterIntegration) {
+ if (meta.enableTwitterIntegration && meta.twitterConsumerKey && meta.twitterConsumerSecret) {
return autwh({
consumerKey: meta.twitterConsumerKey,
consumerSecret: meta.twitterConsumerSecret,
@@ -83,14 +91,14 @@ router.get('/connect/twitter', async ctx => {
}
const twAuth = await getTwAuth();
- const twCtx = await twAuth.begin();
+ const twCtx = await twAuth!.begin();
redis.set(userToken, JSON.stringify(twCtx));
ctx.redirect(twCtx.url);
});
router.get('/signin/twitter', async ctx => {
const twAuth = await getTwAuth();
- const twCtx = await twAuth.begin();
+ const twCtx = await twAuth!.begin();
const sessid = uuid();
@@ -130,19 +138,23 @@ router.get('/tw/cb', async ctx => {
const twCtx = await get;
- const result = await twAuth.done(JSON.parse(twCtx), ctx.query.oauth_verifier);
+ const result = await twAuth!.done(JSON.parse(twCtx), ctx.query.oauth_verifier);
- const user = await User.findOne({
- host: null,
- 'twitter.userId': result.userId
- }) as ILocalUser;
+ const link = await UserProfiles.createQueryBuilder()
+ .where('twitter @> :twitter', {
+ twitter: {
+ userId: result.userId,
+ },
+ })
+ .andWhere('userHost IS NULL')
+ .getOne();
- if (user == null) {
+ if (link == null) {
ctx.throw(404, `@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
return;
}
- signin(ctx, user, true);
+ signin(ctx, await Users.findOne(link.userId) as ILocalUser, true);
} else {
const verifier = ctx.query.oauth_verifier;
@@ -159,26 +171,25 @@ router.get('/tw/cb', async ctx => {
const twCtx = await get;
- const result = await twAuth.done(JSON.parse(twCtx), verifier);
+ const result = await twAuth!.done(JSON.parse(twCtx), verifier);
- const user = await User.findOneAndUpdate({
+ const user = await Users.findOne({
host: null,
token: userToken
- }, {
- $set: {
- twitter: {
- accessToken: result.accessToken,
- accessTokenSecret: result.accessTokenSecret,
- userId: result.userId,
- screenName: result.screenName
- }
- }
+ }).then(ensure);
+
+ await UserProfiles.update({ userId: user.id }, {
+ twitter: true,
+ twitterAccessToken: result.accessToken,
+ twitterAccessTokenSecret: result.accessTokenSecret,
+ twitterUserId: result.userId,
+ twitterScreenName: result.screenName,
});
ctx.body = `Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`;
// Publish i updated event
- publishMainStream(user._id, 'meUpdated', await pack(user, user, {
+ publishMainStream(user.id, 'meUpdated', await Users.pack(user, user, {
detail: true,
includeSecrets: true
}));
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-18 17:53:58 +0000