mirror of
https://github.com/misskey-dev/misskey.git
synced 2025-02-23 07:35:21 +09:00

* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275
.
* frontend: 翻訳の抜けを訂正, read:adminとwrite:adminはアクセス発行トークンのデフォルトでは非表示にする
* enhance(test): misskey-ghsa-7pxq-6xx9-xpgmに関するテストを追加
* enhance(test): Websocket APIに対するテストも追加
* enhance(refactor): `@/misc/api-permissions.ts`を`misskey-js/permissions`に統合
* fix(frontend): アクセストークン発行UIで全ての権限を有効にした際、管理者用APIへのアクセスも許可してしまう問題を修正
* enhance(backend): Websocketの接続に最低限必要な権限を変更
* fix(backend): `/api/admin/meta`をサードパーティアプリケーションからはアクセスできないように
* fix(backend): エンドポイントにアクセスするために必要な権限を変更
* fix(frontend/locale): Add missing type declaration
* chore: update `misskey-js/src/autogen`
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
82 lines
2.1 KiB
TypeScript
82 lines
2.1 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import type { UserProfilesRepository } from '@/models/_.js';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { ApiError } from '../error.js';
|
|
|
|
export const meta = {
|
|
tags: ['account'],
|
|
|
|
requireCredential: true,
|
|
kind: "read:account",
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
ref: 'MeDetailed',
|
|
},
|
|
|
|
errors: {
|
|
userIsDeleted: {
|
|
message: 'User is deleted.',
|
|
code: 'USER_IS_DELETED',
|
|
id: 'e5b3b9f0-2b8f-4b9f-9c1f-8c5c1b2e1b1a',
|
|
kind: 'permission',
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {},
|
|
required: [],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.userProfilesRepository)
|
|
private userProfilesRepository: UserProfilesRepository,
|
|
|
|
private userEntityService: UserEntityService,
|
|
) {
|
|
super(meta, paramDef, async (ps, user, token) => {
|
|
const isSecure = token == null;
|
|
|
|
const now = new Date();
|
|
const today = `${now.getFullYear()}/${now.getMonth() + 1}/${now.getDate()}`;
|
|
|
|
// 渡ってきている user はキャッシュされていて古い可能性があるので改めて取得
|
|
const userProfile = await this.userProfilesRepository.findOne({
|
|
where: {
|
|
userId: user.id,
|
|
},
|
|
relations: ['user'],
|
|
});
|
|
|
|
if (userProfile == null) {
|
|
throw new ApiError(meta.errors.userIsDeleted);
|
|
}
|
|
|
|
if (!userProfile.loggedInDates.includes(today)) {
|
|
this.userProfilesRepository.update({ userId: user.id }, {
|
|
loggedInDates: [...userProfile.loggedInDates, today],
|
|
});
|
|
userProfile.loggedInDates = [...userProfile.loggedInDates, today];
|
|
}
|
|
|
|
return await this.userEntityService.pack<true, true>(userProfile.user!, userProfile.user!, {
|
|
detail: true,
|
|
includeSecrets: isSecure,
|
|
userProfile,
|
|
});
|
|
});
|
|
}
|
|
}
|