refactor: input and security out

stoplightio · Oct 29, 2019 · 006a15e · 006a15e
1 parent 0843f93
commit 006a15e
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/packages/core/src/factory.ts b/packages/core/src/factory.ts
@@ -18,6 +18,20 @@ export function factory<Resource, Input, Output, Config extends IPrismConfig>(
   defaultConfig: Config,
   components: IPrismComponents<Resource, Input, Output, Config>
 ): IPrism<Resource, Input, Output, Config> {
+  const validateInputAndSecurity = (config: Config, resource: Resource, input: Input) =>
+    pipe(
+      sequenceValidation(
+        config.validateRequest ? components.validateInput({ resource, element: input }) : Either.right(input),
+        config.checkSecurity ? validateSecurity(input, resource) : Either.right(input)
+      ),
+      Either.map(() => ({ resource, inputValidations: [] })),
+      Either.orElse<
+        NonEmptyArray<IPrismDiagnostic>,
+        { resource: Resource; inputValidations: IPrismDiagnostic[] },
+        Error
+      >(inputValidations => Either.right({ resource, inputValidations }))
+    );
+
   return {
     request: (input: Input, resources: Resource[], c?: Config) => {
       // build the config for this request
@@ -27,20 +41,7 @@ export function factory<Resource, Input, Output, Config extends IPrismConfig>(
         TaskEither.fromEither(
           pipe(
             components.route({ resources, input }),
-            Either.chain(resource =>
-              pipe(
-                sequenceValidation(
-                  config.validateRequest ? components.validateInput({ resource, element: input }) : Either.right(input),
-                  config.checkSecurity ? validateSecurity(input, resource) : Either.right(input)
-                ),
-                Either.map(() => ({ resource, inputValidations: [] })),
-                Either.orElse<
-                  NonEmptyArray<IPrismDiagnostic>,
-                  { resource: Resource; inputValidations: IPrismDiagnostic[] },
-                  Error
-                >(inputValidations => Either.right({ resource, inputValidations }))
-              )
-            )
+            Either.chain(resource => validateInputAndSecurity(config, resource, input))
           )
         ),
         TaskEither.chain(({ resource, inputValidations }) => {