summaryrefslogtreecommitdiff
path: root/src/server/api/define.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-03-28 11:24:37 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-03-28 11:24:37 +0900
commit6be127e18bdbea6031698baeb8632f917a8346eb (patch)
tree4b7ceb082d76b0628df6496bc802172106721ce9 /src/server/api/define.ts
parentwip (diff)
downloadsharkey-6be127e18bdbea6031698baeb8632f917a8346eb.tar.gz
sharkey-6be127e18bdbea6031698baeb8632f917a8346eb.tar.bz2
sharkey-6be127e18bdbea6031698baeb8632f917a8346eb.zip
Implement MiAuth
Diffstat (limited to 'src/server/api/define.ts')
-rw-r--r--src/server/api/define.ts9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/api/define.ts b/src/server/api/define.ts
index 1fd4543bd0..3c9e6863b7 100644
--- a/src/server/api/define.ts
+++ b/src/server/api/define.ts
@@ -2,7 +2,6 @@ import * as fs from 'fs';
import { ILocalUser } from '../../models/entities/user';
import { IEndpointMeta } from './endpoints';
import { ApiError } from './error';
-import { App } from '../../models/entities/app';
import { SchemaType } from '../../misc/schema';
// TODO: defaultが設定されている場合はその型も考慮する
@@ -15,12 +14,12 @@ type Params<T extends IEndpointMeta> = {
export type Response = Record<string, any> | void;
type executor<T extends IEndpointMeta> =
- (params: Params<T>, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, app: App, file?: any, cleanup?: Function) =>
+ (params: Params<T>, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, isSecure: boolean, file?: any, cleanup?: Function) =>
Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
export default function <T extends IEndpointMeta>(meta: T, cb: executor<T>)
- : (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, app: App, file?: any) => Promise<any> {
- return (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, app: App, file?: any) => {
+ : (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, isSecure: boolean, file?: any) => Promise<any> {
+ return (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, isSecure: boolean, file?: any) => {
function cleanup() {
fs.unlink(file.path, () => {});
}
@@ -37,7 +36,7 @@ export default function <T extends IEndpointMeta>(meta: T, cb: executor<T>)
return Promise.reject(pserr);
}
- return cb(ps, user, app, file, cleanup);
+ return cb(ps, user, isSecure, file, cleanup);
};
}