updated from master

2015-02-18 21:18:53 -08:00
parent c847551ac4
commit 9d0c6c50e7
12 changed files with 1204 additions and 757 deletions
--- a/lib/swagger-oauth.js
+++ b/lib/swagger-oauth.js
@@ -15,8 +15,8 @@ function handleLogin() {
    var defs = auths;
    for(key in defs) {
      var auth = defs[key];
-      oauth2KeyName = key;
      if(auth.type === 'oauth2' && auth.scopes) {
+        oauth2KeyName = key;
        var scope;
        if(Array.isArray(auth.scopes)) {
          // 1.2 support