Merge pull request #3928 from shockey/v/3.4.5

v3.4.5

README.md

@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 ------------------ | ------------ | -------------------------- | -----
-3.4.4 | 2017-11-03 | 2.0, 3.0 | [tag v3.4.4](https://github.com/swagger-api/swagger-ui/tree/v3.4.4)
+3.4.5 | 2017-11-03 | 2.0, 3.0 | [tag v3.4.5](https://github.com/swagger-api/swagger-ui/tree/v3.4.5)
 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -81,7 +81,7 @@
     "scroll-to-element": "^2.0.0",
     "serialize-error": "2.0.0",
     "shallowequal": "0.2.2",
-    "swagger-client": "^3.3.3",
+    "swagger-client": "^3.3.4",
     "url-parse": "^1.1.8",
     "whatwg-fetch": "0.11.1",
     "worker-loader": "^0.7.1",

src/core/components/operation.jsx

@@ -54,6 +54,7 @@ export default class Operation extends PureComponent {
 
     let {
       isShown,
+      isAuthorized,
       jumpToKey,
       path,
       method,
@@ -78,9 +79,9 @@ export default class Operation extends PureComponent {
     } = op.operation
 
     let operation = operationProps.getIn(["op", "operation"])
+    let security = operationProps.get("security")
     let responses = operation.get("responses")
     let produces = operation.get("produces")
-    let security = operation.get("security") || specSelectors.security()
     let parameters = getList(operation, ["parameters"])
     let operationScheme = specSelectors.operationScheme(path, method)
     let isShownKey = ["operations", tag, operationId]
@@ -128,7 +129,7 @@ export default class Operation extends PureComponent {
             {
               (!security || !security.count()) ? null :
                 <AuthorizeOperationBtn
-                  isAuthorized={ authSelectors.isAuthorized(security) }
+                  isAuthorized={ isAuthorized }
                   onClick={() => {
                     const applicableDefinitions = authSelectors.definitionsForRequirements(security)
                     authActions.showDefinitions(applicableDefinitions)

src/core/containers/OperationContainer.jsx

@@ -25,9 +25,11 @@ export default class OperationContainer extends PureComponent {
     jumpToKey: PropTypes.string.isRequired,
     allowTryItOut: PropTypes.bool,
     displayOperationId: PropTypes.bool,
+    isAuthorized: PropTypes.bool,
     displayRequestDuration: PropTypes.bool,
     response: PropTypes.instanceOf(Iterable),
     request: PropTypes.instanceOf(Iterable),
+    security: PropTypes.instanceOf(Iterable),
     isDeepLinkingEnabled: PropTypes.bool.isRequired,
 
     getComponent: PropTypes.func.isRequired,
@@ -59,6 +61,7 @@ export default class OperationContainer extends PureComponent {
     const isDeepLinkingEnabled = deepLinking && deepLinking !== "false"
     const allowTryItOut = typeof props.allowTryItOut === "undefined" ?
       props.specSelectors.allowTryItOutFor(props.path, props.method) : props.allowTryItOut
+    const security = op.getIn(["operation", "security"]) || props.specSelectors.security()
 
     return {
       operationId,
@@ -67,6 +70,8 @@ export default class OperationContainer extends PureComponent {
       displayOperationId,
       displayRequestDuration,
       allowTryItOut,
+      security,
+      isAuthorized: props.authSelectors.isAuthorized(security),
       isShown: layoutSelectors.isShown(isShownKey, docExpansion === "full" ),
       jumpToKey: `paths.${props.path}.${props.method}`,
       response: props.specSelectors.responseFor(props.path, props.method),
@@ -123,6 +128,8 @@ export default class OperationContainer extends PureComponent {
       tag,
       path,
       method,
+      security,
+      isAuthorized,
       operationId,
       showSummary,
       isShown,
@@ -152,6 +159,8 @@ export default class OperationContainer extends PureComponent {
       tag,
       path,
       method,
+      security,
+      isAuthorized,
       operationId,
       showSummary,
       isShown,

src/style/_layout.scss

@@ -565,6 +565,7 @@
         p
         {
             margin: 0;
+            @include text_code($response-col-description-inner-markdown-font-color);
         }
 
         a