Merge pull request #219 from abraham/copilot/fix-218

Override createApp redirect_uris to always be list of URIs

Author: abraham

dist/schema.json

@@ -5115,20 +5115,12 @@
                     "description": "A name for your application"
                   },
                   "redirect_uris": {
-                    "description": "String or Array of Strings. Where the user should be redirected after authorization. To display the authorization code to the user instead of redirecting to a web page, use `urn:ietf:wg:oauth:2.0:oob` in this parameter.",
-                    "oneOf": [
-                      {
-                        "type": "string",
-                        "format": "uri"
-                      },
-                      {
-                        "type": "array",
-                        "items": {
-                          "type": "string",
-                          "format": "uri"
-                        }
-                      }
-                    ]
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "format": "uri"
+                    },
+                    "description": "String or Array of Strings. Where the user should be redirected after authorization. To display the authorization code to the user instead of redirecting to a web page, use `urn:ietf:wg:oauth:2.0:oob` in this parameter."
                   },
                   "scopes": {
                     "type": "string",

src/__tests__/integration/create-app-parameters.test.ts

@@ -59,7 +59,7 @@ describe('Create App Method Parameters', () => {
     expect(scopes!.schema!.enum).toContain('admin:read');
   });
 
-  test('should generate oneOf schema for redirect_uris parameter', () => {
+  test('should generate oneOf schema for redirect_uris parameter in TypeParser', () => {
     // Import required types and utilities
     const { TypeParser } = require('../../generators/TypeParser');
     const { UtilityHelpers } = require('../../generators/UtilityHelpers');
@@ -95,11 +95,13 @@ describe('Create App Method Parameters', () => {
     );
 
     // Convert parameter to schema using TypeParser
+    // Note: This tests the TypeParser in isolation, not the final OpenAPI schema
+    // which gets overridden in MethodConverter for the createApp operation
     const utilityHelpers = new UtilityHelpers();
     const typeParser = new TypeParser(utilityHelpers);
     const schema = typeParser.convertParameterToSchema(redirectUrisParam);
 
-    // Verify oneOf schema is generated
+    // Verify oneOf schema is generated by TypeParser
     expect(schema.oneOf).toBeDefined();
     expect(schema.oneOf).toHaveLength(2);
 

src/__tests__/integration/create-app-redirect-uris-override.test.ts

@@ -0,0 +1,48 @@
+import { MethodParser } from '../../parsers/MethodParser';
+import { EntityParser } from '../../parsers/EntityParser';
+import { OpenAPIGenerator } from '../../generators/OpenAPIGenerator';
+
+describe('CreateApp redirect_uris override', () => {
+  test('should always output redirect_uris as array of URIs for createApp operation', () => {
+    const methodParser = new MethodParser();
+    const entityParser = new EntityParser();
+
+    const entities = entityParser.parseAllEntities();
+    const methodFiles = methodParser.parseAllMethods();
+
+    const generator = new OpenAPIGenerator();
+    const spec = generator.generateSchema(entities, methodFiles);
+
+    // Find the createApp operation (POST /api/v1/apps)
+    const appsPath = spec.paths['/api/v1/apps'];
+    expect(appsPath).toBeDefined();
+    expect(appsPath.post).toBeDefined();
+
+    // Check the request body schema
+    const requestBody = appsPath.post!.requestBody as any;
+    expect(requestBody).toBeDefined();
+    expect(requestBody.content).toBeDefined();
+    expect(requestBody.content['application/json']).toBeDefined();
+
+    const schema = requestBody.content['application/json'].schema as any;
+    expect(schema).toBeDefined();
+    expect(schema.properties).toBeDefined();
+
+    // Verify redirect_uris is always an array of URIs, not oneOf
+    const redirectUrisProperty = schema.properties.redirect_uris;
+    expect(redirectUrisProperty).toBeDefined();
+    expect(redirectUrisProperty.type).toBe('array');
+    expect(redirectUrisProperty.items).toEqual({
+      type: 'string',
+      format: 'uri',
+    });
+
+    // Ensure it's NOT using oneOf pattern
+    expect(redirectUrisProperty.oneOf).toBeUndefined();
+
+    // Verify the description is preserved
+    expect(redirectUrisProperty.description).toContain(
+      'String or Array of Strings'
+    );
+  });
+});

src/generators/MethodConverter.ts

@@ -282,6 +282,36 @@ class MethodConverter {
               },
             },
           };
+        } else if (
+          method.httpMethod === 'POST' &&
+          path === '/api/v1/apps' &&
+          properties.redirect_uris
+        ) {
+          // Special handling for POST /api/v1/apps endpoint
+          // Override redirect_uris to always be array of URIs instead of oneOf
+          properties.redirect_uris = {
+            type: 'array',
+            items: {
+              type: 'string',
+              format: 'uri',
+            },
+            description: properties.redirect_uris.description,
+          };
+
+          // Default behavior for createApp endpoint
+          operation.requestBody = {
+            description: 'JSON request body parameters',
+            required: required.length > 0,
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties,
+                  required: required.length > 0 ? required : undefined,
+                } as OpenAPIProperty,
+              },
+            },
+          };
         } else {
           // Default behavior for all other endpoints
           operation.requestBody = {