Merge pull request #2826 from bodnia/fix-2774

#2774 display scopes for oauth2 password flow
swagger-api · Mar 30, 2017 · 1df4df6 · 1df4df6
2 parents b34e363 + 432cd7f
commit 1df4df6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
diff --git a/dist/swagger-ui.js.map b/dist/swagger-ui.js.map
diff --git a/src/core/components/auth/oauth2.jsx b/src/core/components/auth/oauth2.jsx
@@ -10,14 +10,13 @@ export default class Oauth2 extends React.Component {
   static propTypes = {
     name: PropTypes.string,
     authorized: PropTypes.object,
-    configs: PropTypes.object,
     getComponent: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     authSelectors: PropTypes.object.isRequired,
     authActions: PropTypes.object.isRequired,
     errSelectors: PropTypes.object.isRequired,
     errActions: PropTypes.object.isRequired,
-    getConfigs: PropTypes.function
+    getConfigs: PropTypes.any
   }
 
   constructor(props, context) {
@@ -173,7 +172,7 @@ export default class Oauth2 extends React.Component {
         }
 
         {
-          !isAuthorized && flow !== PASSWORD && scopes && scopes.size ? <div className="scopes">
+          !isAuthorized && scopes && scopes.size ? <div className="scopes">
             <h2>Scopes:</h2>
             { scopes.map((description, name) => {
               return (

diff --git a/src/core/plugins/auth/actions.js b/src/core/plugins/auth/actions.js
@@ -8,6 +8,8 @@ export const PRE_AUTHORIZE_OAUTH2 = "pre_authorize_oauth2"
 export const AUTHORIZE_OAUTH2 = "authorize_oauth2"
 export const VALIDATE = "validate"
 
+const scopeSeparator = " "
+
 export function showDefinitions(payload) {
   return {
     type: SHOW_AUTH_POPUP,
@@ -77,7 +79,8 @@ export const authorizePassword = ( auth ) => ( { fn, authActions, errActions } )
     query: {
       grant_type: "password",
       username,
-      password
+      password,
+      scopes: encodeURIComponent(auth.scopes.join(scopeSeparator))
     }
   }