summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-11-24 17:09:32 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-11-24 17:09:32 +0900
commitf7a328d66e8f0ddb5d7b6ca815bf86bba98895bb (patch)
tree78c78b428ee7aac5c4fefc61fe856da837a41fae /src/server/api
parentNew Crowdin translations (#5573) (diff)
downloadsharkey-f7a328d66e8f0ddb5d7b6ca815bf86bba98895bb.tar.gz
sharkey-f7a328d66e8f0ddb5d7b6ca815bf86bba98895bb.tar.bz2
sharkey-f7a328d66e8f0ddb5d7b6ca815bf86bba98895bb.zip
Update dependencies :rocket:
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/api-handler.ts2
-rw-r--r--src/server/api/common/signin.ts2
-rw-r--r--src/server/api/private/signin.ts2
-rw-r--r--src/server/api/private/signup.ts4
-rw-r--r--src/server/api/service/discord.ts4
-rw-r--r--src/server/api/service/github.ts4
-rw-r--r--src/server/api/service/twitter.ts4
7 files changed, 11 insertions, 11 deletions
diff --git a/src/server/api/api-handler.ts b/src/server/api/api-handler.ts
index a3be1f2aae..b147bca143 100644
--- a/src/server/api/api-handler.ts
+++ b/src/server/api/api-handler.ts
@@ -5,7 +5,7 @@ import authenticate from './authenticate';
import call from './call';
import { ApiError } from './error';
-export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res) => {
+export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise((res) => {
const body = ctx.request.body;
const reply = (x?: any, y?: ApiError) => {
diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts
index 37229ad1bc..66f89182d2 100644
--- a/src/server/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -6,7 +6,7 @@ import { Signins } from '../../../models';
import { genId } from '../../../misc/gen-id';
import { publishMainStream } from '../../../services/stream';
-export default function(ctx: Koa.BaseContext, user: ILocalUser, redirect = false) {
+export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
if (redirect) {
//#region Cookie
const expires = 1000 * 60 * 60 * 24 * 365; // One Year
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index de0e35f500..43928a6b44 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -10,7 +10,7 @@ import { ensure } from '../../../prelude/ensure';
import { verifyLogin, hash } from '../2fa';
import { randomBytes } from 'crypto';
-export default async (ctx: Koa.BaseContext) => {
+export default async (ctx: Koa.Context) => {
ctx.set('Access-Control-Allow-Origin', config.url);
ctx.set('Access-Control-Allow-Credentials', 'true');
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index d535d49836..63216019e9 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -15,8 +15,8 @@ import { UserProfile } from '../../../models/entities/user-profile';
import { getConnection } from 'typeorm';
import { UsedUsername } from '../../../models/entities/used-username';
-export default async (ctx: Koa.BaseContext) => {
- const body = ctx.request.body as any;
+export default async (ctx: Koa.Context) => {
+ const body = ctx.request.body;
const instance = await fetchMeta(true);
diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts
index 369061138c..d5ca05577c 100644
--- a/src/server/api/service/discord.ts
+++ b/src/server/api/service/discord.ts
@@ -12,11 +12,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure';
-function getUserToken(ctx: Koa.BaseContext) {
+function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
}
-function compareOrigin(ctx: Koa.BaseContext) {
+function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) {
return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : '';
}
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index ef5a753a1a..071b4a96d1 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -12,11 +12,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure';
-function getUserToken(ctx: Koa.BaseContext) {
+function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
}
-function compareOrigin(ctx: Koa.BaseContext) {
+function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) {
return url ? url.endsWith('/') ? url.substr(0, url.length - 1) : url : '';
}
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index cdf674bab0..dc6c593201 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -11,11 +11,11 @@ import { Users, UserProfiles } from '../../../models';
import { ILocalUser } from '../../../models/entities/user';
import { ensure } from '../../../prelude/ensure';
-function getUserToken(ctx: Koa.BaseContext) {
+function getUserToken(ctx: Koa.Context) {
return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1];
}
-function compareOrigin(ctx: Koa.BaseContext) {
+function compareOrigin(ctx: Koa.Context) {
function normalizeUrl(url: string) {
return url.endsWith('/') ? url.substr(0, url.length - 1) : url;
}