Merge pull request #41 from klickagent/patch-1

Passwort grant type integration

Author: dakota

src/Auth/OAuthAuthenticate.php

@@ -65,6 +65,7 @@ public function __construct(ComponentRegistry $registry, $config)
 
         if ($this->config('server')) {
             $this->Server = $this->config('server');
+            
             return;
         }
 
@@ -131,6 +132,7 @@ public function unauthenticated(Request $request, Response $response)
                     ]
                 )
             );
+            
             return $response;
         }
         $message = __d('authenticate', 'You are not authenticated.');
@@ -147,6 +149,7 @@ public function getUser(Request $request)
             $this->Server->isValidRequest(true, $request->query('access_token'));
         } catch (OAuthException $e) {
             $this->_exception = $e;
+            
             return false;
         }
         $ownerModel = $this->Server

src/Controller/Component/OAuthComponent.php

@@ -21,14 +21,14 @@ class OAuthComponent extends Component
      *
      * @var array
      */
-    protected $_allowedGrants = ['AuthCode', 'RefreshToken', 'ClientCredentials'];
+    protected $_allowedGrants = ['AuthCode', 'RefreshToken', 'ClientCredentials', 'Password'];
 
     /**
      * @var array
      */
     protected $_defaultConfig = [
         'tokenTTL' => 2592000, //TTL 30 * 24 * 60 * 60 in seconds
-        'supportedGrants' => ['AuthCode', 'RefreshToken', 'ClientCredentials'],
+        'supportedGrants' => ['AuthCode', 'RefreshToken', 'ClientCredentials', 'Password'],
         'storages' => [
             'session' => [
                 'className' => 'OAuthServer.Session'
@@ -61,6 +61,7 @@ protected function _getAuthorizationServer()
     {
         $serverConfig = $this->config('authorizationServer');
         $serverClassName = App::className($serverConfig['className']);
+        
         return new $serverClassName();
     }
 
@@ -85,7 +86,23 @@ public function initialize(array $config)
             }
 
             $className = '\\League\\OAuth2\\Server\\Grant\\' . $grant . 'Grant';
-            $server->addGrantType(new $className());
+            $objGrant = new $className();
+            if ($grant === 'Password') {
+                $objGrant->setVerifyCredentialsCallback(function ($username, $password) {
+                    $controller = $this->_registry->getController();
+                    $controller->Auth->constructAuthenticate();
+                    $userfield = $controller->components['Auth']['authenticate']['Form']['fields']['username'];
+                    $controller->request->data[$userfield] = $username;
+                    $controller->request->data['password'] = $password;
+                    $loginOk = $controller->Auth->identify();
+                    if ($loginOk) {
+                        return $loginOk['id'];
+                    } else {
+                        return false;
+                    }
+                });
+            }
+            $server->addGrantType($objGrant);
         }
 
         $server->setAccessTokenTTL($this->config('tokenTTL'));
@@ -111,6 +128,7 @@ public function checkAuthParams($authGrant)
             $controller->response->statusCode($e->httpStatusCode);
             $controller->response->header($e->getHttpHeaders());
             $controller->set('response', $e);
+            
             return false;
         }
     }

src/Controller/OAuthController.php

@@ -124,6 +124,7 @@ public function authorize()
             $redirectUri = $this->OAuth->Server->getGrantType('authorization_code')->newAuthorizeRequest($ownerModel, $ownerId, $authParams);
             $event = new Event('OAuthServer.afterAuthorize', $this);
             EventManager::instance()->dispatch($event);
+            
             return $this->redirect($redirectUri);
         } elseif ($this->request->is('post')) {
             $event = new Event('OAuthServer.afterDeny', $this);

src/Model/Entity/Client.php

@@ -29,6 +29,7 @@ protected function _getParent()
             return null;
         }
         $parentTable = TableRegistry::get($this->parent_model);
+        
         return $parentTable->get($this->parent_id);
     }
 

src/Traits/GetStorageTrait.php

@@ -20,6 +20,7 @@ protected function _resolveClassName($class)
         if (!$className) {
             throw new Exception(sprintf('Storage class "%s" was not found.', $class));
         }
+        
         return $className;
     }
 
@@ -39,6 +40,7 @@ protected function _getStorage($name)
         }
 
         $className = $this->_resolveClassName($config['className']);
+        
         return new $className();
     }
 }