echoapi-converter 0.0.40 → 0.0.42

package/dist/index.d.ts

@@ -204,6 +204,7 @@ declare class InsomniaToApipost {
 declare class PostmanToApipost {
     apis: any;
     project: any;
+    source: 'vscode' | 'workbench' | string;
     constructor();
     private clear;
     private completionApiRequestAuth;
@@ -216,7 +217,9 @@ declare class PostmanToApipost {
     private completionApis;
     private initApis;
     private initProject;
-    convert(json: any, project_id: string): {
+    convert(json: any, project_id: string, option?: {
+        source: string;
+    }): {
         status: "error" | "success";
         message: string;
         data: any;
@@ -248,6 +251,7 @@ declare class ThunderToApipost {
     folders: any;
     project: any;
     global: any;
+    source: 'vscode' | 'workbench' | string;
     constructor();
     private clear;
     private initProject;
@@ -266,7 +270,9 @@ declare class ThunderToApipost {
     private initApis;
     private initGlobal;
     private buildFolderApiTree;
-    convert(json: any, project_id: string): {
+    convert(json: any, project_id: string, option?: {
+        source: string;
+    }): {
         status: "error" | "success";
         message: string;
         data: any;

package/dist/index.js

@@ -250,6 +250,12 @@ const API_METHODS = [
     'PROPFIND',
     'VIEW',
 ];
+const APIPOST_GRANT_TYPES = ['authorization_code', 'password_credentials', 'authorization_code_with_pkce'];
+const THUNDER_CLIENT_GRANT_TYPES = {
+    "password": 'password_credentials',
+    "authorization_code": "authorization_code",
+    "authorization_code_with_pkce": "authorization_code_with_pkce"
+};
 
 // @ts-nocheck
 const splicedPath = (name, version) => {
@@ -5474,7 +5480,6 @@ class InsomniaToApipost {
 
 // @ts-nocheck
 const DEFAULT_FIELD_TYPE = ["string", "file"];
-const APIPOST_GRANT_TYPES = ['authorization_code', 'password_credentials', 'authorization_code_with_pkce'];
 class PostmanToApipost {
     constructor() {
         Object.defineProperty(this, "apis", {
@@ -5489,12 +5494,20 @@ class PostmanToApipost {
             writable: true,
             value: void 0
         });
+        // 转换的来源端
+        Object.defineProperty(this, "source", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.apis = [];
         this.project = {
             name: "",
             intro: "",
             project_id: "",
         };
+        this.source = 'workbench';
     }
     clear() {
         this.apis = [];
@@ -5503,6 +5516,7 @@ class PostmanToApipost {
             intro: "",
             project_id: "",
         };
+        this.source = 'workbench';
     }
     completionApiRequestAuth(auth) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -5568,11 +5582,22 @@ class PostmanToApipost {
             }
             else if ((auth === null || auth === void 0 ? void 0 : auth.type) === "oauth2") {
                 customAuth["type"] = "oauth2";
+                const getGrantType = (postman_grant_type) => {
+                    if (APIPOST_GRANT_TYPES.includes(postman_grant_type)) {
+                        return postman_grant_type;
+                    }
+                    else if (this.source === 'vscode') {
+                        return 'password_credentials';
+                    }
+                    else {
+                        return 'authorization_code';
+                    }
+                };
                 customAuth["oauth2"] = {
                     addTokenTo: (authMap === null || authMap === void 0 ? void 0 : authMap.addTokenTo) || 'header',
                     headerPrefix: (authMap === null || authMap === void 0 ? void 0 : authMap.headerPrefix) || 'Bearer',
                     access_token: '',
-                    grant_type: APIPOST_GRANT_TYPES.includes(authMap === null || authMap === void 0 ? void 0 : authMap.grant_type) ? authMap === null || authMap === void 0 ? void 0 : authMap.grant_type : 'authorization_code',
+                    grant_type: getGrantType(authMap === null || authMap === void 0 ? void 0 : authMap.grant_type),
                     redirect_uri: (authMap === null || authMap === void 0 ? void 0 : authMap.redirect_uri) || '',
                     authUrl: (authMap === null || authMap === void 0 ? void 0 : authMap.authUrl) || '',
                     accessTokenUrl: (authMap === null || authMap === void 0 ? void 0 : authMap.accessTokenUrl) || '',
@@ -6005,9 +6030,10 @@ class PostmanToApipost {
         this.project.intro = ((_b = json === null || json === void 0 ? void 0 : json.info) === null || _b === void 0 ? void 0 : _b.description) || "";
         this.project.project_id = project_id;
     }
-    convert(json, project_id) {
+    convert(json, project_id, option) {
         this.clear();
         try {
+            this.source = (option === null || option === void 0 ? void 0 : option.source) || 'workbench';
             this.initProject(json, project_id);
             this.initApis(json === null || json === void 0 ? void 0 : json.item);
             const data = Object.assign(Object.assign({}, this.project), { apis: this.apis });
@@ -6314,6 +6340,13 @@ class ThunderToApipost {
             writable: true,
             value: void 0
         });
+        // 转换的来源端
+        Object.defineProperty(this, "source", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "diyScript", {
             enumerable: true,
             configurable: true,
@@ -6482,6 +6515,7 @@ class ThunderToApipost {
             intro: "",
             project_id: "",
         };
+        this.source = 'vscode';
     }
     clear() {
         this.apis = [];
@@ -6493,6 +6527,7 @@ class ThunderToApipost {
             intro: "",
             project_id: "",
         };
+        this.source = 'workbench';
     }
     initProject(json, project_id) {
         var _a;
@@ -6577,11 +6612,22 @@ class ThunderToApipost {
         }
         else if ((auth === null || auth === void 0 ? void 0 : auth.type) === "oauth2") {
             customAuth["type"] = "oauth2";
+            const getGrantType = (thunder_grant_type) => {
+                if (THUNDER_CLIENT_GRANT_TYPES[thunder_grant_type]) {
+                    return THUNDER_CLIENT_GRANT_TYPES[thunder_grant_type];
+                }
+                else if (this.source === 'vscode') {
+                    return 'password_credentials';
+                }
+                else {
+                    return 'authorization_code';
+                }
+            };
             customAuth["oauth2"] = {
                 addTokenTo: "header",
                 headerPrefix: "Bearer",
                 access_token: "",
-                grant_type: ((_m = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _m === void 0 ? void 0 : _m.grantType) || "authorization_code",
+                grant_type: getGrantType((_m = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _m === void 0 ? void 0 : _m.grantType),
                 redirect_uri: ((_o = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _o === void 0 ? void 0 : _o.callbackUrl) || "",
                 authUrl: ((_p = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _p === void 0 ? void 0 : _p.authUrl) || "",
                 accessTokenUrl: ((_q = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _q === void 0 ? void 0 : _q.tokenUrl) || "",
@@ -7018,9 +7064,10 @@ class ThunderToApipost {
             return throwResult$1("error", "Must contain a ThunderJson field", {});
         }
     }
-    convert(json, project_id) {
+    convert(json, project_id, option) {
         this.clear();
         try {
+            this.source = (option === null || option === void 0 ? void 0 : option.source) || 'vscode';
             this.initProject(json, project_id);
             this.initGlobal(json === null || json === void 0 ? void 0 : json.settings);
             const folders = lodash.map(json === null || json === void 0 ? void 0 : json.folders, (it) => (Object.assign(Object.assign({}, it), { type: "folder" })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-converter",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "description": "echoapi to swagger",
   "main": "dist/index.js",
   "files": [