fix(@whook/http-router): fix compatibility issue

nfroidure · Mar 3, 2021 · e0b3a60 · e0b3a60
1 parent bf5ed69
commit e0b3a60
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/packages/whook-example/src/handlers/getTime.ts b/packages/whook-example/src/handlers/getTime.ts
@@ -9,7 +9,10 @@ export const timeSchema: WhookAPISchemaDefinition<Components.Schemas.TimeSchema>
     type: 'object',
     additionalProperties: false,
     properties: {
-      currentDate: { type: 'string', format: 'date-time' },
+      currentDate: {
+        type: 'string',
+        // format: 'date-time'
+      },
     },
   },
 };

diff --git a/packages/whook-example/src/services/__snapshots__/API.test.ts.snap b/packages/whook-example/src/services/__snapshots__/API.test.ts.snap
@@ -117,7 +117,6 @@ Object {
           "additionalProperties": false,
           "properties": Object {
             "currentDate": Object {
-              "format": "date-time",
               "type": "string",
             },
           },

diff --git a/packages/whook-http-router/src/index.ts b/packages/whook-http-router/src/index.ts
@@ -565,10 +565,18 @@ async function _createRouters({
         if (p.style) {
           log('warning', '⚠️ - Only a style subset is supported currently!');
         }
+
         return {
           ...p,
-          pattern: '^.*$',
+          // TODO: Remove when this issue is tackled:
+          // https://github.com/nfroidure/siso/issues/45
+          ...((p.schema as OpenAPIV3.SchemaObject)?.enum
+            ? {}
+            : {
+                pattern: '^.*$',
+              }),
           ...p.schema,
+          schema: undefined,
         };
       });
     const ammendedParameters = extractOperationSecurityParameters(

diff --git a/packages/whook-oauth2/src/handlers/postOAuth2Acknowledge.ts b/packages/whook-oauth2/src/handlers/postOAuth2Acknowledge.ts
@@ -82,7 +82,7 @@ export const definition: WhookAPIHandlerDefinition = {
               properties: {
                 redirectURI: {
                   type: 'string',
-                  format: 'uri',
+                  // format: 'uri',
                 },
               },
             },