From 2c3f731ae245eef97f1893f904b103da005c877e Mon Sep 17 00:00:00 2001 From: Johann150 Date: Fri, 19 May 2023 23:08:06 +0200 Subject: [PATCH] remove more default exports --- packages/backend/src/server/api/api-handler.ts | 2 +- packages/backend/src/server/api/authenticate.ts | 4 ++-- packages/backend/src/server/api/call.ts | 2 +- packages/backend/src/server/api/endpoints.ts | 4 +--- packages/backend/src/server/api/endpoints/endpoint.ts | 2 +- packages/backend/src/server/api/endpoints/endpoints.ts | 2 +- packages/backend/src/server/api/index.ts | 2 +- packages/backend/src/server/api/openapi/gen-spec.ts | 2 +- packages/backend/src/server/api/streaming.ts | 2 +- 9 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/backend/src/server/api/api-handler.ts b/packages/backend/src/server/api/api-handler.ts index de9af0890..3bde09602 100644 --- a/packages/backend/src/server/api/api-handler.ts +++ b/packages/backend/src/server/api/api-handler.ts @@ -1,7 +1,7 @@ import Koa from 'koa'; import { IEndpoint } from './endpoints.js'; -import authenticate, { AuthenticationError } from './authenticate.js'; +import { authenticate, AuthenticationError } from './authenticate.js'; import call from './call.js'; import { ApiError } from './error.js'; diff --git a/packages/backend/src/server/api/authenticate.ts b/packages/backend/src/server/api/authenticate.ts index 9da253526..7daa91de4 100644 --- a/packages/backend/src/server/api/authenticate.ts +++ b/packages/backend/src/server/api/authenticate.ts @@ -11,7 +11,7 @@ export class AuthenticationError extends Error { } } -export default async (authorization: string | null | undefined, bodyToken: string | null | undefined): Promise<[ILocalUser | null | undefined, AccessToken | null | undefined]> => { +export async function authenticate(authorization: string | null | undefined, bodyToken: string | null | undefined): Promise<[ILocalUser | null | undefined, AccessToken | null | undefined]> { let maybeToken: string | null = null; // check if there is an authorization header set @@ -66,4 +66,4 @@ export default async (authorization: string | null | undefined, bodyToken: strin return [user, accessToken]; } -}; +} diff --git a/packages/backend/src/server/api/call.ts b/packages/backend/src/server/api/call.ts index 7ecb0676b..ea8c6086e 100644 --- a/packages/backend/src/server/api/call.ts +++ b/packages/backend/src/server/api/call.ts @@ -4,7 +4,7 @@ import { ILocalUser } from '@/models/entities/user.js'; import { AccessToken } from '@/models/entities/access-token.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; import { limiter } from './limiter.js'; -import endpoints, { IEndpointMeta } from './endpoints.js'; +import { endpoints, IEndpointMeta } from './endpoints.js'; import { ApiError } from './error.js'; import { apiLogger } from './logger.js'; diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 55763d875..a7757c2b5 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -713,7 +713,7 @@ export interface IEndpoint { params: Schema; } -const endpoints: IEndpoint[] = eps.map(([name, ep]) => { +export const endpoints: IEndpoint[] = eps.map(([name, ep]) => { return { name, exec: ep.default, @@ -721,5 +721,3 @@ const endpoints: IEndpoint[] = eps.map(([name, ep]) => { params: ep.paramDef, }; }); - -export default endpoints; diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts index f380a5287..b5894c10d 100644 --- a/packages/backend/src/server/api/endpoints/endpoint.ts +++ b/packages/backend/src/server/api/endpoints/endpoint.ts @@ -1,5 +1,5 @@ import define from '@/server/api/define.js'; -import endpoints from '@/server/api/endpoints.js'; +import { endpoints } from '@/server/api/endpoints.js'; export const meta = { requireCredential: false, diff --git a/packages/backend/src/server/api/endpoints/endpoints.ts b/packages/backend/src/server/api/endpoints/endpoints.ts index 184f74e79..976109887 100644 --- a/packages/backend/src/server/api/endpoints/endpoints.ts +++ b/packages/backend/src/server/api/endpoints/endpoints.ts @@ -1,5 +1,5 @@ import define from '@/server/api/define.js'; -import endpoints from '@/server/api/endpoints.js'; +import { endpoints } from '@/server/api/endpoints.js'; export const meta = { requireCredential: false, diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts index fe0c4450a..554596e3a 100644 --- a/packages/backend/src/server/api/index.ts +++ b/packages/backend/src/server/api/index.ts @@ -10,7 +10,7 @@ import cors from '@koa/cors'; import { Instances, AccessTokens, Users } from '@/models/index.js'; import config from '@/config/index.js'; -import endpoints from './endpoints.js'; +import { endpoints } from './endpoints.js'; import { handler } from './api-handler.js'; import signup from './private/signup.js'; import signin from './private/signin.js'; diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index 0a7fcf667..9dc1c89cf 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -2,7 +2,7 @@ import config from '@/config/index.js'; import { kinds } from '@/misc/api-permissions.js'; import { I18n } from '@/misc/i18n.js'; import { errors as errorDefinitions } from '@/server/api/error.js'; -import endpoints from '@/server/api/endpoints.js'; +import { endpoints } from '@/server/api/endpoints.js'; import { schemas, convertSchemaToOpenApiSchema } from './schemas.js'; import { httpCodes } from './http-codes.js'; diff --git a/packages/backend/src/server/api/streaming.ts b/packages/backend/src/server/api/streaming.ts index 797443afb..eefbcc216 100644 --- a/packages/backend/src/server/api/streaming.ts +++ b/packages/backend/src/server/api/streaming.ts @@ -6,7 +6,7 @@ import { SECOND, MINUTE } from '@/const.js'; import { subscriber as redisClient } from '@/db/redis.js'; import { Users } from '@/models/index.js'; import { Connection } from './stream/index.js'; -import authenticate from './authenticate.js'; +import { authenticate } from './authenticate.js'; export const initializeStreamingServer = (server: http.Server): void => { // Init websocket server