diff options
author | Chocobozzz <me@florianbigard.com> | 2022-07-06 15:44:14 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-07-06 16:12:17 +0200 |
commit | 9452d4fd3321148fb80b64a67bd9983fee6c208e (patch) | |
tree | 62ad9be8d3f4bfcf63196274ad4b736372c05f2c /server/middlewares/validators | |
parent | 630d0a1bf5897fff203cb07e426223f55dcc882d (diff) | |
download | PeerTube-9452d4fd3321148fb80b64a67bd9983fee6c208e.tar.gz PeerTube-9452d4fd3321148fb80b64a67bd9983fee6c208e.tar.zst PeerTube-9452d4fd3321148fb80b64a67bd9983fee6c208e.zip |
/!\ Use a dedicated config file for development
It means you have to replace NODE_ENV=test to NODE_ENV=dev if you use it
npm run dev:* commands are already updated
Diffstat (limited to 'server/middlewares/validators')
-rw-r--r-- | server/middlewares/validators/follows.ts | 6 | ||||
-rw-r--r-- | server/middlewares/validators/oembed.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/middlewares/validators/follows.ts b/server/middlewares/validators/follows.ts index df4cefe28..86d2d6228 100644 --- a/server/middlewares/validators/follows.ts +++ b/server/middlewares/validators/follows.ts | |||
@@ -1,12 +1,13 @@ | |||
1 | import express from 'express' | 1 | import express from 'express' |
2 | import { body, param, query } from 'express-validator' | 2 | import { body, param, query } from 'express-validator' |
3 | import { isProdInstance } from '@server/helpers/core-utils' | ||
3 | import { isEachUniqueHandleValid, isFollowStateValid, isRemoteHandleValid } from '@server/helpers/custom-validators/follows' | 4 | import { isEachUniqueHandleValid, isFollowStateValid, isRemoteHandleValid } from '@server/helpers/custom-validators/follows' |
4 | import { loadActorUrlOrGetFromWebfinger } from '@server/lib/activitypub/actors' | 5 | import { loadActorUrlOrGetFromWebfinger } from '@server/lib/activitypub/actors' |
5 | import { getRemoteNameAndHost } from '@server/lib/activitypub/follow' | 6 | import { getRemoteNameAndHost } from '@server/lib/activitypub/follow' |
6 | import { getServerActor } from '@server/models/application/application' | 7 | import { getServerActor } from '@server/models/application/application' |
7 | import { MActorFollowActorsDefault } from '@server/types/models' | 8 | import { MActorFollowActorsDefault } from '@server/types/models' |
9 | import { ServerFollowCreate } from '@shared/models' | ||
8 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' | 10 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' |
9 | import { isTestInstance } from '../../helpers/core-utils' | ||
10 | import { isActorTypeValid, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor' | 11 | import { isActorTypeValid, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor' |
11 | import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers' | 12 | import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers' |
12 | import { logger } from '../../helpers/logger' | 13 | import { logger } from '../../helpers/logger' |
@@ -14,7 +15,6 @@ import { WEBSERVER } from '../../initializers/constants' | |||
14 | import { ActorModel } from '../../models/actor/actor' | 15 | import { ActorModel } from '../../models/actor/actor' |
15 | import { ActorFollowModel } from '../../models/actor/actor-follow' | 16 | import { ActorFollowModel } from '../../models/actor/actor-follow' |
16 | import { areValidationErrors } from './shared' | 17 | import { areValidationErrors } from './shared' |
17 | import { ServerFollowCreate } from '@shared/models' | ||
18 | 18 | ||
19 | const listFollowsValidator = [ | 19 | const listFollowsValidator = [ |
20 | query('state') | 20 | query('state') |
@@ -42,7 +42,7 @@ const followValidator = [ | |||
42 | 42 | ||
43 | (req: express.Request, res: express.Response, next: express.NextFunction) => { | 43 | (req: express.Request, res: express.Response, next: express.NextFunction) => { |
44 | // Force https if the administrator wants to follow remote actors | 44 | // Force https if the administrator wants to follow remote actors |
45 | if (isTestInstance() === false && WEBSERVER.SCHEME === 'http') { | 45 | if (isProdInstance() && WEBSERVER.SCHEME === 'http') { |
46 | return res | 46 | return res |
47 | .status(HttpStatusCode.INTERNAL_SERVER_ERROR_500) | 47 | .status(HttpStatusCode.INTERNAL_SERVER_ERROR_500) |
48 | .json({ | 48 | .json({ |
diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts index fc1a294e0..8e7b44a86 100644 --- a/server/middlewares/validators/oembed.ts +++ b/server/middlewares/validators/oembed.ts | |||
@@ -5,7 +5,7 @@ import { loadVideo } from '@server/lib/model-loaders' | |||
5 | import { VideoPlaylistModel } from '@server/models/video/video-playlist' | 5 | import { VideoPlaylistModel } from '@server/models/video/video-playlist' |
6 | import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' | 6 | import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' |
7 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' | 7 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' |
8 | import { isTestInstance } from '../../helpers/core-utils' | 8 | import { isTestOrDevInstance } from '../../helpers/core-utils' |
9 | import { isIdOrUUIDValid, isUUIDValid, toCompleteUUID } from '../../helpers/custom-validators/misc' | 9 | import { isIdOrUUIDValid, isUUIDValid, toCompleteUUID } from '../../helpers/custom-validators/misc' |
10 | import { logger } from '../../helpers/logger' | 10 | import { logger } from '../../helpers/logger' |
11 | import { WEBSERVER } from '../../initializers/constants' | 11 | import { WEBSERVER } from '../../initializers/constants' |
@@ -34,7 +34,7 @@ const isURLOptions = { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | // We validate 'localhost', so we don't have the top level domain | 36 | // We validate 'localhost', so we don't have the top level domain |
37 | if (isTestInstance()) { | 37 | if (isTestOrDevInstance()) { |
38 | isURLOptions.require_tld = false | 38 | isURLOptions.require_tld = false |
39 | } | 39 | } |
40 | 40 | ||