Merge pull request #1 from topechelon/master

Update from topechelon
chadhutchins182 · Jul 26, 2021 · 8e46517 · 8e46517
2 parents 9349490 + 05d9c2a
commit 8e46517
Show file tree

Hide file tree

Showing 41 changed files with 826 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 bower_components/
 coverage/
 .idea/
-dist/
 test/1.2/test-specs-browser.js
 test/2.0/test-specs-browser.js
 test/*/browser

diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -0,0 +1,3 @@
+import { ExpressAppConfig } from "./middleware/express.app.config";
+import { Oas3AppOptions } from "./middleware/oas3.options";
+export declare function expressAppConfig(definitionPath: string, appOptions: Oas3AppOptions): ExpressAppConfig;
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/middleware/express.app.config.d.ts b/dist/middleware/express.app.config.d.ts
@@ -0,0 +1,13 @@
+import * as express from 'express';
+import { Oas3AppOptions } from './oas3.options';
+export declare class ExpressAppConfig {
+    private app;
+    private routingOptions;
+    private definitionPath;
+    private openApiValidatorOptions;
+    constructor(definitionPath: string, appOptions: Oas3AppOptions);
+    private setOpenApiValidatorOptions;
+    configureLogger(loggerOptions: any): any;
+    private errorHandler;
+    getApp(): express.Application;
+}
diff --git a/dist/middleware/express.app.config.js b/dist/middleware/express.app.config.js
diff --git a/dist/middleware/express.app.config.js.map b/dist/middleware/express.app.config.js.map
diff --git a/dist/middleware/helpers.d.ts b/dist/middleware/helpers.d.ts
@@ -0,0 +1,2 @@
+export declare function debugError(err: any, debug: any): void;
+export declare function removeDashElementToCamelCase(str: any): any;
diff --git a/dist/middleware/helpers.js b/dist/middleware/helpers.js
diff --git a/dist/middleware/helpers.js.map b/dist/middleware/helpers.js.map
diff --git a/dist/middleware/logging.options.d.ts b/dist/middleware/logging.options.d.ts
@@ -0,0 +1,5 @@
+export declare class LoggingOptions {
+    format: string;
+    errorLimit: string | number;
+    constructor(format: string, errorLimit: string | number);
+}
diff --git a/dist/middleware/logging.options.js b/dist/middleware/logging.options.js
diff --git a/dist/middleware/logging.options.js.map b/dist/middleware/logging.options.js.map
diff --git a/dist/middleware/oas3.options.d.ts b/dist/middleware/oas3.options.d.ts
@@ -0,0 +1,10 @@
+import { OpenApiValidatorOpts } from 'express-openapi-validator/dist/framework/types';
+import { LoggingOptions } from './logging.options';
+import { SwaggerUiOptions } from './swagger.ui.options';
+export declare class Oas3AppOptions {
+    routing: any;
+    openApiValidator: OpenApiValidatorOpts;
+    logging: LoggingOptions;
+    swaggerUI: SwaggerUiOptions;
+    constructor(routingOpts: any, openApiValidatorOpts: OpenApiValidatorOpts, logging: LoggingOptions, swaggerUI: SwaggerUiOptions);
+}
diff --git a/dist/middleware/oas3.options.js b/dist/middleware/oas3.options.js
diff --git a/dist/middleware/oas3.options.js.map b/dist/middleware/oas3.options.js.map
diff --git a/dist/middleware/swagger-ui/favicon-16x16.png b/dist/middleware/swagger-ui/favicon-16x16.png
diff --git a/dist/middleware/swagger-ui/favicon-32x32.png b/dist/middleware/swagger-ui/favicon-32x32.png
diff --git a/dist/middleware/swagger-ui/index.html b/dist/middleware/swagger-ui/index.html
@@ -0,0 +1,73 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Swagger UI</title>
+    <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>
+      html
+      {
+        box-sizing: border-box;
+        overflow: -moz-scrollbars-vertical;
+        overflow-y: scroll;
+      }
+
+      *,
+      *:before,
+      *:after
+      {
+        box-sizing: inherit;
+      }
+
+      body
+      {
+        margin:0;
+        background: #fafafa;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="swagger-ui"></div>
+
+    <script src="swagger-ui-bundle.js"> </script>
+    <script src="swagger-ui-standalone-preset.js"> </script>
+    <script>
+      window.onload = function() {
+        function initSwaggerUi (url) {
+          window.ui = SwaggerUIBundle({
+            url: url,
+            dom_id: '#swagger-ui',
+            deepLinking: true,
+            presets: [
+              SwaggerUIBundle.presets.apis,
+              SwaggerUIStandalonePreset
+            ],
+            plugins: [
+              SwaggerUIBundle.plugins.DownloadUrl
+            ],
+            layout: "StandaloneLayout",
+            validatorUrl: null
+          });
+        }
+        var xhr = new XMLHttpRequest();
+        xhr.open('HEAD', document.location.href);
+        xhr.onreadystatechange = function () {
+          var url = '/api-docs';
+          if (xhr.readyState === XMLHttpRequest.DONE) {
+            url = xhr.getResponseHeader('Swagger-API-Docs-URL');
+          } else {
+            console.log('Unable to get the Swagger UI URL from the server (%s): %s', xhr.status, xhr.responseText);
+          }
+          initSwaggerUi(url);
+        };
+        xhr.send(null);
+      }
+    </script>
+
+
+  </body>
+</html>
diff --git a/dist/middleware/swagger-ui/oauth2-redirect.html b/dist/middleware/swagger-ui/oauth2-redirect.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html lang="en-US">
+<body onload="run()">
+</body>
+</html>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1);
+        } else {
+            qp = location.search.substring(1);
+        }
+
+        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)
+                }
+        ) : {}
+
+        isValid = qp.state === sentState
+
+        if ((
+          oauth2.auth.schema.get("flow") === "accessCode"||
+          oauth2.auth.schema.get("flow") === "authorizationCode"
+        ) && !oauth2.auth.code) {
+            if (!isValid) {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "warning",
+                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                });
+            }
+
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                let oauthErrorMsg
+                if (qp.error) {
+                    oauthErrorMsg = "["+qp.error+"]: " +
+                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
+                        (qp.error_uri ? "More info: "+qp.error_uri : "");
+                }
+
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+</script>
diff --git a/dist/middleware/swagger-ui/swagger-ui-bundle.js b/dist/middleware/swagger-ui/swagger-ui-bundle.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export declare function debugError(err: any, debug: any): void;
		export declare function removeDashElementToCamelCase(str: any): any;