From f0a29721c9fb10f97faf386bc9d6b1b2fad97895 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 Apr 2019 21:50:36 +0900 Subject: Use PostgreSQL instead of MongoDB (#4572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug --- src/server/api/endpoints/auth/accept.ts | 30 +++++++++----------- src/server/api/endpoints/auth/session/generate.ts | 11 ++++---- src/server/api/endpoints/auth/session/show.ts | 6 ++-- src/server/api/endpoints/auth/session/userkey.ts | 34 ++++++++--------------- 4 files changed, 33 insertions(+), 48 deletions(-) (limited to 'src/server/api/endpoints/auth') diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts index cedf7821fe..21a78011dc 100644 --- a/src/server/api/endpoints/auth/accept.ts +++ b/src/server/api/endpoints/auth/accept.ts @@ -1,11 +1,10 @@ import rndstr from 'rndstr'; import * as crypto from 'crypto'; import $ from 'cafy'; -import App from '../../../../models/app'; -import AuthSess from '../../../../models/auth-session'; -import AccessToken from '../../../../models/access-token'; import define from '../../define'; import { ApiError } from '../../error'; +import { AuthSessions, AccessTokens, Apps } from '../../../../models'; +import { genId } from '../../../../misc/gen-id'; export const meta = { tags: ['auth'], @@ -31,10 +30,10 @@ export const meta = { export default define(meta, async (ps, user) => { // Fetch token - const session = await AuthSess + const session = await AuthSessions .findOne({ token: ps.token }); - if (session === null) { + if (session == null) { throw new ApiError(meta.errors.noSuchSession); } @@ -42,16 +41,14 @@ export default define(meta, async (ps, user) => { const accessToken = rndstr('a-zA-Z0-9', 32); // Fetch exist access token - const exist = await AccessToken.findOne({ + const exist = await AccessTokens.findOne({ appId: session.appId, - userId: user._id, + userId: user.id, }); - if (exist === null) { + if (exist == null) { // Lookup app - const app = await App.findOne({ - _id: session.appId - }); + const app = await Apps.findOne(session.appId); // Generate Hash const sha256 = crypto.createHash('sha256'); @@ -59,20 +56,19 @@ export default define(meta, async (ps, user) => { const hash = sha256.digest('hex'); // Insert access token doc - await AccessToken.insert({ + await AccessTokens.save({ + id: genId(), createdAt: new Date(), appId: session.appId, - userId: user._id, + userId: user.id, token: accessToken, hash: hash }); } // Update session - await AuthSess.update(session._id, { - $set: { - userId: user._id - } + await AuthSessions.update(session.id, { + userId: user.id }); return; diff --git a/src/server/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts index e12bea7681..5a9bfe6451 100644 --- a/src/server/api/endpoints/auth/session/generate.ts +++ b/src/server/api/endpoints/auth/session/generate.ts @@ -1,10 +1,10 @@ import * as uuid from 'uuid'; import $ from 'cafy'; -import App from '../../../../../models/app'; -import AuthSess from '../../../../../models/auth-session'; import config from '../../../../../config'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { Apps, AuthSessions } from '../../../../../models'; +import { genId } from '../../../../../misc/gen-id'; export const meta = { tags: ['auth'], @@ -46,7 +46,7 @@ export const meta = { export default define(meta, async (ps) => { // Lookup app - const app = await App.findOne({ + const app = await Apps.findOne({ secret: ps.appSecret }); @@ -58,9 +58,10 @@ export default define(meta, async (ps) => { const token = uuid.v4(); // Create session token document - const doc = await AuthSess.insert({ + const doc = await AuthSessions.save({ + id: genId(), createdAt: new Date(), - appId: app._id, + appId: app.id, token: token }); diff --git a/src/server/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts index 992e0a499e..e6ecd8b839 100644 --- a/src/server/api/endpoints/auth/session/show.ts +++ b/src/server/api/endpoints/auth/session/show.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import AuthSess, { pack } from '../../../../../models/auth-session'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { AuthSessions } from '../../../../../models'; export const meta = { tags: ['auth'], @@ -29,7 +29,7 @@ export const meta = { export default define(meta, async (ps, user) => { // Lookup session - const session = await AuthSess.findOne({ + const session = await AuthSessions.findOne({ token: ps.token }); @@ -37,5 +37,5 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.noSuchSession); } - return await pack(session, user); + return await AuthSessions.pack(session, user); }); diff --git a/src/server/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts index e09e16e658..8524b96f94 100644 --- a/src/server/api/endpoints/auth/session/userkey.ts +++ b/src/server/api/endpoints/auth/session/userkey.ts @@ -1,10 +1,7 @@ import $ from 'cafy'; -import App from '../../../../../models/app'; -import AuthSess from '../../../../../models/auth-session'; -import AccessToken from '../../../../../models/access-token'; -import { pack } from '../../../../../models/user'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { Apps, AuthSessions, AccessTokens, Users } from '../../../../../models'; export const meta = { tags: ['auth'], @@ -67,7 +64,7 @@ export const meta = { export default define(meta, async (ps) => { // Lookup app - const app = await App.findOne({ + const app = await Apps.findOne({ secret: ps.appSecret }); @@ -76,13 +73,12 @@ export default define(meta, async (ps) => { } // Fetch token - const session = await AuthSess - .findOne({ - token: ps.token, - appId: app._id - }); + const session = await AuthSessions.findOne({ + token: ps.token, + appId: app.id + }); - if (session === null) { + if (session == null) { throw new ApiError(meta.errors.noSuchSession); } @@ -91,25 +87,17 @@ export default define(meta, async (ps) => { } // Lookup access token - const accessToken = await AccessToken.findOne({ - appId: app._id, + const accessToken = await AccessTokens.findOne({ + appId: app.id, userId: session.userId }); // Delete session - - /* https://github.com/Automattic/monk/issues/178 - AuthSess.deleteOne({ - _id: session._id - }); - */ - AuthSess.remove({ - _id: session._id - }); + AuthSessions.delete(session.id); return { accessToken: accessToken.token, - user: await pack(session.userId, null, { + user: await Users.pack(session.userId, null, { detail: true }) }; -- cgit v1.2.3-freya