oatpp · doufu3344 · Oct 17, 2023 · Oct 17, 2023 · Oct 19, 2023
diff --git a/res/README.md b/res/README.md
@@ -0,0 +1,22 @@
+# Swagger UI Dist
+[![NPM version](https://badge.fury.io/js/swagger-ui-dist.svg)](http://badge.fury.io/js/swagger-ui-dist)
+
+# API
+
+This module, `swagger-ui-dist`, exposes Swagger-UI's entire dist folder as a dependency-free npm module.
+Use `swagger-ui` instead, if you'd like to have npm install dependencies for you.
+
+`SwaggerUIBundle` and `SwaggerUIStandalonePreset` can be imported:
+```javascript
+  import { SwaggerUIBundle, SwaggerUIStandalonePreset } from "swagger-ui-dist"
+```
+
+To get an absolute path to this directory for static file serving, use the exported `getAbsoluteFSPath` method:
+
+```javascript
+const swaggerUiAssetPath = require("swagger-ui-dist").getAbsoluteFSPath()
+
+// then instantiate server that serves files from the swaggerUiAssetPath
+```
+
+For anything else, check the [Swagger-UI](https://github.com/swagger-api/swagger-ui) repository.
diff --git a/res/absolute-path.js b/res/absolute-path.js
@@ -0,0 +1,14 @@
+/*
+ * getAbsoluteFSPath
+ * @return {string} When run in NodeJS env, returns the absolute path to the current directory
+ *                  When run outside of NodeJS, will return an error message
+ */
+const getAbsoluteFSPath = function () {
+  // detect whether we are running in a browser or nodejs
+  if (typeof module !== "undefined" && module.exports) {
+    return require("path").resolve(__dirname)
+  }
+  throw new Error('getAbsoluteFSPath can only be called within a Nodejs environment');
+}
+
+module.exports = getAbsoluteFSPath
diff --git a/res/index.html b/res/index.html
@@ -4,7 +4,7 @@
   <head>
     <meta charset="UTF-8">
     <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
     <style>
@@ -41,6 +41,7 @@
       const ui = SwaggerUIBundle({
         url: "/%%API.JSON%%",
         dom_id: '#swagger-ui',
+        validatorUrl: 'none',
         deepLinking: true,
         presets: [
           SwaggerUIBundle.presets.apis,
@@ -50,11 +51,11 @@
           SwaggerUIBundle.plugins.DownloadUrl
         ],
         layout: "StandaloneLayout"
-      })
+      });
       // End Swagger UI call region
 
-      window.ui = ui
-    }
+      window.ui = ui;
+    };
   </script>
   </body>
 </html>
diff --git a/res/index.js b/res/index.js
@@ -0,0 +1,17 @@
+try {
+  module.exports.SwaggerUIBundle = require("./swagger-ui-bundle.js")
+  module.exports.SwaggerUIStandalonePreset = require("./swagger-ui-standalone-preset.js")
+} catch(e) {
+  // swallow the error if there's a problem loading the assets.
+  // allows this module to support providing the assets for browserish contexts,
+  // without exploding in a Node context.
+  //
+  // see https://github.com/swagger-api/swagger-ui/issues/3291#issuecomment-311195388
+  // for more information.
+}
+
+// `absolutePath` and `getAbsoluteFSPath` are both here because at one point,
+// we documented having one and actually implemented the other.
+// They were both retained so we don't break anyone's code.
+module.exports.absolutePath = require("./absolute-path.js")
+module.exports.getAbsoluteFSPath = require("./absolute-path.js")
diff --git a/res/oauth2-redirect.html b/res/oauth2-redirect.html
@@ -4,8 +4,6 @@
     <title>Swagger UI: OAuth2 Redirect</title>
 </head>
 <body>
-</body>
-</html>
 <script>
     'use strict';
     function run () {
@@ -20,19 +18,20 @@
             qp = location.search.substring(1);
         }
 
-        arr = qp.split("&")
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
         qp = qp ? JSON.parse('{' + arr.join() + '}',
                 function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value)
+                    return key === "" ? value : decodeURIComponent(value);
                 }
-        ) : {}
+        ) : {};
 
-        isValid = qp.state === sentState
+        isValid = qp.state === sentState;
 
         if ((
-          oauth2.auth.schema.get("flow") === "accessCode"||
-          oauth2.auth.schema.get("flow") === "authorizationCode"
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
         ) && !oauth2.auth.code) {
             if (!isValid) {
                 oauth2.errCb({
@@ -48,7 +47,7 @@
                 oauth2.auth.code = qp.code;
                 oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
             } else {
-                let oauthErrorMsg
+                let oauthErrorMsg;
                 if (qp.error) {
                     oauthErrorMsg = "["+qp.error+"]: " +
                         (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
@@ -72,3 +71,5 @@
       run();
     });
 </script>
+</body>
+</html>
diff --git a/res/package.json b/res/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "swagger-ui-dist",
+  "version": "3.52.5",
+  "main": "index.js",
+  "repository": "[email protected]:swagger-api/swagger-ui.git",
+  "contributors": [
+    "(in alphabetical order)",
+    "Anna Bodnia <[email protected]>",
+    "Buu Nguyen <[email protected]>",
+    "Josh Ponelat <[email protected]>",
+    "Kyle Shockey <[email protected]>",
+    "Robert Barnwell <[email protected]>",
+    "Sahar Jafari <[email protected]>"
+  ],
+  "license": "Apache-2.0",
+  "dependencies": {},
+  "devDependencies": {}
+}
diff --git a/res/swagger-ui-bundle.js b/res/swagger-ui-bundle.js
diff --git a/res/swagger-ui-bundle.js.map b/res/swagger-ui-bundle.js.map
diff --git a/res/swagger-ui-es-bundle-core.js b/res/swagger-ui-es-bundle-core.js
diff --git a/res/swagger-ui-es-bundle-core.js.map b/res/swagger-ui-es-bundle-core.js.map
diff --git a/res/swagger-ui-es-bundle.js b/res/swagger-ui-es-bundle.js
diff --git a/res/swagger-ui-es-bundle.js.map b/res/swagger-ui-es-bundle.js.map
diff --git a/res/swagger-ui-standalone-preset.js b/res/swagger-ui-standalone-preset.js
diff --git a/res/swagger-ui-standalone-preset.js.map b/res/swagger-ui-standalone-preset.js.map
diff --git a/res/swagger-ui.css b/res/swagger-ui.css
diff --git a/res/swagger-ui.css.map b/res/swagger-ui.css.map
diff --git a/res/swagger-ui.js b/res/swagger-ui.js
diff --git a/res/swagger-ui.js.map b/res/swagger-ui.js.map
diff --git a/src/oatpp-swagger/Generator.cpp b/src/oatpp-swagger/Generator.cpp
@@ -383,6 +383,7 @@ void Generator::generatePathItemData(const std::shared_ptr<Endpoint>& endpoint,
     operation->operationId = info->name;
     operation->summary = info->summary;
     operation->description = info->description;
+    operation->deprecated = info->deprecated;
 
     if(info->tags.size() > 0) {
       operation->tags = oatpp::List<String>({});

diff --git a/src/oatpp-swagger/oas3/Model.hpp b/src/oatpp-swagger/oas3/Model.hpp
@@ -638,6 +638,11 @@ class PathItemOperation : public oatpp::DTO {
    */
   DTO_FIELD(String, operationId);
 
+  /**
+   * Is operation deprecated.
+   */
+  DTO_FIELD(Boolean, deprecated);
+
   /**
    * Request Body.
    */