Merge pull request #356 from clhodapp/master

Fix OAuth2 Grant Types

Author: jisoldi

Gruntfile.js

@@ -47,7 +47,7 @@ module.exports = function (grunt) {
     connect: {
       options: {
         hostname: '0.0.0.0',
-        port:     9000
+        port:     grunt.option('port') || 9000
       },
 
       livereload: {

dist/scripts/api-console.js

@@ -3086,7 +3086,7 @@
         };
 
         $scope.ownerOptionsEnabled = function () {
-          return $scope.credentials.grant === 'owner';
+          return $scope.credentials.grant === 'password';
         };
 
         $scope.isImplicitEnabled = function () {
@@ -3110,18 +3110,10 @@
             label: 'Authorization Code',
             value: 'authorization_code'
           },
-          {
-            label: 'Resource Owner Password Credentials',
-            value: 'owner'
-          },
           {
             label: 'Resource Owner Password Credentials',
             value: 'password'
           },
-          {
-            label: 'Client Credentials',
-            value: 'credentials'
-          },
           {
             label: 'Client Credentials',
             value: 'client_credentials'
@@ -3684,7 +3676,7 @@
       popup(auth[grantType].getUri());
     }
 
-    if (grantType === 'owner' || grantType === 'password') {
+    if (grantType === 'password') {
       auth.owner.getToken(this.credentials.username, this.credentials.password, function (err, user, raw) {
         if (err) {
           done(raw, err);
@@ -3698,7 +3690,7 @@
       });
     }
 
-    if (grantType === 'credentials'|| grantType === 'client_credentials') {
+    if (grantType === 'client_credentials') {
       auth.credentials.getToken(function (err, user, raw) {
         if (err) {
           done(raw, err);