API Explorer v.1.0.3

makhmoode · makhmoode · commit 3a502bf0bd33 · 2022-01-17T13:35:13.000+03:00
diff --git a/wa-apps/apiexplorer/client/.env.development.local.example b/wa-apps/apiexplorer/client/.env.development.local.example
@@ -0,0 +1,5 @@
+NODE_ENV=development
+VUE_APP_WA_DEV=http://localhost
+VUE_APP_BASE_URL=/webasyst/apiexplorer/
+VUE_APP_I18N_LOCALE=en
+VUE_APP_I18N_FALLBACK_LOCALE=en
diff --git a/wa-apps/apiexplorer/client/.gitignore b/wa-apps/apiexplorer/client/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+package-lock.json
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/wa-apps/apiexplorer/client/package.json b/wa-apps/apiexplorer/client/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "apiexplorer-spa",
-  "version": "0.1.0",
+  "name": "apiexplorer-client",
+  "version": "1.0.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,29 +11,29 @@
     "copymanifest": "copyfiles dist/manifest.json ../js --flat"
   },
   "dependencies": {
-    "@popperjs/core": "^2.11.0",
+    "@popperjs/core": "^2.11.2",
     "axios": "^0.21.4",
     "copyfiles": "^2.4.1",
-    "core-js": "^3.19.0",
-    "marked": "^3.0.8",
+    "core-js": "^3.20.3",
+    "marked": "^4.0.10",
     "mitt": "^3.0.0",
-    "pretty-print-json": "^1.1.1",
-    "swagger-client": "^3.17.0",
+    "pretty-print-json": "^1.1.2",
+    "swagger-client": "^3.18.1",
     "v-calendar": "^3.0.0-alpha.6",
-    "vue": "^3.2.20",
-    "vue-i18n": "^9.2.0-beta.23",
+    "vue": "^3.2.27",
+    "vue-i18n": "^9.2.0-beta.28",
     "vue-router": "^4.0.12",
-    "vuex": "^4.0.0-0"
+    "vuex": "^4.0.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.14",
-    "@vue/cli-plugin-eslint": "^4.5.14",
-    "@vue/cli-plugin-router": "^4.5.14",
-    "@vue/cli-plugin-vuex": "^4.5.14",
-    "@vue/cli-service": "^4.5.14",
-    "@vue/compiler-sfc": "^3.2.20",
+    "@vue/cli-plugin-babel": "^4.5.15",
+    "@vue/cli-plugin-eslint": "^4.5.15",
+    "@vue/cli-plugin-router": "^4.5.15",
+    "@vue/cli-plugin-vuex": "^4.5.15",
+    "@vue/cli-service": "^4.5.15",
+    "@vue/compiler-sfc": "^3.2.27",
     "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
+    "eslint": "^6.8.0",
     "eslint-plugin-vue": "^7.20.0"
   },
   "eslintConfig": {
diff --git a/wa-apps/apiexplorer/client/src/components/SchemaData.vue b/wa-apps/apiexplorer/client/src/components/SchemaData.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import marked from 'marked';
+import { marked } from 'marked';
 import { prettyPrintJson } from 'pretty-print-json';
 export default {
     name: "SchemaData",
@@ -104,7 +104,7 @@ export default {
     },
     computed: {
         descriptionMarkdown() {
-            return marked(this.description);
+            return marked.parse(this.description);
         },
         isSimpleItemsArray() {
             return 'items' in this.schema
@@ -117,7 +117,7 @@ export default {
             if (!str) {
                 return '';
             }
-            return marked(str);
+            return marked.parse(str);
         },
         prettifyJson(obj) {
             return prettyPrintJson.toHtml(obj);
diff --git a/wa-apps/apiexplorer/client/src/components/SchemaInput.vue b/wa-apps/apiexplorer/client/src/components/SchemaInput.vue
@@ -113,7 +113,7 @@
 </template>
 
 <script>
-import marked from 'marked';
+import { marked } from 'marked';
 import { /*Calendar,*/ DatePicker } from 'v-calendar';
 export default {
     name: "SchemaInput",
@@ -159,7 +159,7 @@ export default {
     },
     computed: {
         descriptionMarkdown() {
-            return marked(this.description);
+            return marked.parse(this.description);
         }
     },
     methods: {
diff --git a/wa-apps/apiexplorer/client/src/views/Method.vue b/wa-apps/apiexplorer/client/src/views/Method.vue
@@ -246,7 +246,7 @@
 
 <script>
 import Axios from 'axios';
-import marked from 'marked';
+import { marked } from 'marked';
 import SchemaInput from '@/components/SchemaInput';
 import SchemaData from '@/components/SchemaData';
 import Token from '@/components/Token';
@@ -377,7 +377,7 @@ export default {
             return this.response_tab;
         },
         descriptionMarkdown() {
-            return marked(this.response_info.description);
+            return marked.parse(this.response_info.description);
         },
         methodUrl() {
             return document.location.protocol + '//' + document.location.host + window.appState.rootUrl + 'api.php/' + this.name;
diff --git a/wa-apps/apiexplorer/css/app.css b/wa-apps/apiexplorer/css/app.css
diff --git a/wa-apps/apiexplorer/js/app.js b/wa-apps/apiexplorer/js/app.js
diff --git a/wa-apps/apiexplorer/js/chunk-vendors.js b/wa-apps/apiexplorer/js/chunk-vendors.js
diff --git a/wa-apps/apiexplorer/lib/actions/backend/apiexplorerGetToken.controller.php b/wa-apps/apiexplorer/lib/actions/backend/apiexplorerGetToken.controller.php
@@ -6,8 +6,15 @@ public function execute()
     {
         $login = waRequest::get('user', false, waRequest::TYPE_STRING_TRIM);
         $user = $login && wa()->getUser()->isAdmin() ? waUser::getByLogin($login) : wa()->getUser();
+        
+        $methods = (new apiexplorerAllMethods($user))->getList();
+
+        $scope = waRequest::post('scope', false, waRequest::TYPE_STRING_TRIM);
+        if (!$scope) {
+            $methods = (new apiexplorerAllMethods($user))->getList();
+            $scope = implode(',', array_keys($methods));
+        }
 
-        $scope = waRequest::post('scope', implode(',', array_keys($user->getApps())), waRequest::TYPE_STRING_TRIM);
         $scope = explode(',', $scope);
         sort($scope);
         $scope = implode(',', $scope);
diff --git a/wa-apps/apiexplorer/lib/actions/backend/apiexplorerMethodlist.controller.php b/wa-apps/apiexplorer/lib/actions/backend/apiexplorerMethodlist.controller.php
@@ -6,24 +6,7 @@ public function execute()
     {
         $api_version = waRequest::get('version', 'v1');
         $force_renew = waRequest::get('renew', false);
-        $user = wa()->getUser();
-
-        $key = 'app_methods/' . wa()->getUser()->getId();
-        $cache = new waVarExportCache($key, 3600);
-        $methods = $cache->get();
-
-        if (!$methods || $force_renew) {
-            $methods = [];
-            $apps = array_keys($user->getApps());
-            foreach($apps as $app) {
-                $app2api = new apiexplorerMethods($app);
-                $app_methods = $app2api->getMethods();
-                foreach($app_methods as $name => $method) {
-                    $methods[$app][$name] = ['type' => $method->getType()];
-                }
-            }
-            $cache->set($methods);
-        }
+        $methods = (new apiexplorerAllMethods(wa()->getUser()))->getList($force_renew);
         $this->response = ['methods' => $methods];
     }
 }
diff --git a/wa-apps/apiexplorer/lib/classes/apiexplorerAllMethods.class.php b/wa-apps/apiexplorer/lib/classes/apiexplorerAllMethods.class.php
@@ -0,0 +1,33 @@
+<?php
+
+
+class apiexplorerAllMethods
+{
+	private $user;
+
+	public function __construct($user)
+    {
+        $this->user = $user;
+    }
+
+    public function getList($force_renew = false)
+    {
+    	$key = 'app_methods/' . $this->user->getId();
+        $cache = new waVarExportCache($key, 3600);
+        $methods = $cache->get();
+
+        if (empty($methods) || $force_renew) {
+            $methods = [];
+            $apps = array_keys($this->user->getApps());
+            foreach($apps as $app) {
+                $app2api = new apiexplorerMethods($app);
+                $app_methods = $app2api->getMethods();
+                foreach($app_methods as $name => $method) {
+                    $methods[$app][$name] = ['type' => $method->getType()];
+                }
+            }
+            $cache->set($methods);
+        }
+        return $methods;
+    }
+}
diff --git a/wa-apps/apiexplorer/lib/config/apiexplorerConfig.class.php b/wa-apps/apiexplorer/lib/config/apiexplorerConfig.class.php
@@ -2,5 +2,5 @@
 
 class apiexplorerConfig extends waAppConfig
 {
-	const API_CLIENT_ID = 'apiexplorer';
+	const API_CLIENT_ID = 'API-Explorer';
 }
diff --git a/wa-apps/apiexplorer/lib/config/app.php b/wa-apps/apiexplorer/lib/config/app.php
@@ -4,7 +4,7 @@
   'name' => 'API Explorer',
   'description' => 'REST client for all API-enabled apps',
   'icon' => 'img/apiexplorer.svg',
-  'version' => '1.0.2',
+  'version' => '1.0.3',
   'vendor'  => 'webasyst',
   'ui'      => '2.0',
 );
