Don't escape [ and ] in query param keys (#2107)

rails' default naming for arrays is name[]=...&name[]=... It doesn't recognize the escaped forms %5B + %5D but fails silently
OpenAPITools · Feb 11, 2019 · ba9c12f · ba9c12f
1 parent 73d309b
commit ba9c12f
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 14 deletions.
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache
@@ -14,7 +14,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);
@@ -31,7 +33,9 @@ export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
 export class CustomQueryEncoderHelper extends QueryEncoder {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v2/default/encoder.ts b/samples/client/petstore/typescript-angular-v2/default/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomQueryEncoderHelper extends QueryEncoder {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomQueryEncoderHelper extends QueryEncoder {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts b/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v4/npm/encoder.ts b/samples/client/petstore/typescript-angular-v4/npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomQueryEncoderHelper extends QueryEncoder {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/...les/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts b/...les/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/...les/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts b/...les/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);

diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts
@@ -8,7 +8,9 @@
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
     encodeKey(k: string): string {
         k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return k.replace(/\+/gi, '%2B')
+            .replace(/%5B/, "[").replace(/%5D/, "]")
+            ;
     }
     encodeValue(v: string): string {
         v = super.encodeValue(v);