fix: support all oauth2 flows in sdk auth

hey-api · Jan 21, 2025 · 194f941 · 194f941
1 parent 1b73773
commit 194f941
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 40 deletions.
diff --git a/.changeset/rotten-rabbits-bow.md b/.changeset/rotten-rabbits-bow.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: support all oauth2 flows in sdk auth
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/plugin.ts
@@ -128,8 +128,12 @@ const securitySchemeObjectToAuthObject = ({
   securitySchemeObject: IR.SecurityObject;
 }): Auth | undefined => {
   if (securitySchemeObject.type === 'oauth2') {
-    // TODO: parser - handle more/multiple oauth2 flows
-    if (securitySchemeObject.flows.password) {
+    if (
+      securitySchemeObject.flows.password ||
+      securitySchemeObject.flows.authorizationCode ||
+      securitySchemeObject.flows.clientCredentials ||
+      securitySchemeObject.flows.implicit
+    ) {
       return {
         scheme: 'bearer',
         type: 'http',

diff --git a/packages/openapi-ts/test/3.1.x.test.ts b/packages/openapi-ts/test/3.1.x.test.ts
@@ -522,7 +522,7 @@ describe(`OpenAPI ${version}`, () => {
     },
     {
       config: createConfig({
-        input: 'security-oauth2.json',
+        input: 'security-oauth2.yaml',
         output: 'security-oauth2',
         plugins: [
           {
@@ -535,7 +535,7 @@ describe(`OpenAPI ${version}`, () => {
     },
     {
       config: createConfig({
-        input: 'security-oauth2.json',
+        input: 'security-oauth2.yaml',
         output: 'security-false',
         plugins: [
           {

diff --git a/packages/openapi-ts/test/spec/3.1.x/security-oauth2.json b/packages/openapi-ts/test/spec/3.1.x/security-oauth2.json
diff --git a/packages/openapi-ts/test/spec/3.1.x/security-oauth2.yaml b/packages/openapi-ts/test/spec/3.1.x/security-oauth2.yaml
@@ -0,0 +1,20 @@
+openapi: 3.1.1
+info:
+  title: OpenAPI 3.1.1 security oauth2 example
+  version: '1'
+paths:
+  /foo:
+    get:
+      responses:
+        '200':
+          description: OK
+      security:
+        - foo: []
+components:
+  securitySchemes:
+    foo:
+      flows:
+        password:
+          scopes: {}
+          tokenUrl: '/'
+      type: 'oauth2'