Merge pull request #14 from stormpath/HEAD

Version 0.1.0.RC2

CHANGELOG.md

@@ -3,6 +3,15 @@ Change Log
 
 All library changes, in descending order.
 
+Version 0.1.0.RC2
+--------------------
+
+**Released on December 23, 2015.**
+
+- Added JSON Responses to Login, Register, Change Password Routes.
+- Add ability to specify what Accept methods you want to allow via config
+
+
 Version 0.1.0.RC1
 --------------------
 

docs/changelog.rst

@@ -5,6 +5,14 @@ Change Log
 
 All library changes, in descending order. something
 
+Version 0.1.0.RC2
+--------------------
+
+**Released on December 23, 2015.**
+
+- Added JSON Responses to Login, Register, Change Password Routes.
+- Add ability to specify what Accept methods you want to allow via config
+
 Version 0.1.0.RC1
 --------------------
 

docs/upgrading.rst

@@ -6,6 +6,11 @@ Upgrade Guide
 This page contains specific upgrading instructions to help you migrate between
 Stormpath-Laravel releases.
 
+Version 0.1.0.RC1 -> Version 0.1.0.RC2
+--------------------------------------
+Republish vendor config file.
+Specify what Accept header you want to respond to in config.
+
 Version 0.1.0.alpha2 -> Version 0.1.0.RC1
 -----------------------------------------
 Begin installing the package as stormpath/laravel instead of stormpath/laravel-auth

src/Http/Controllers/ChangePasswordController.php

@@ -65,12 +65,17 @@ public function getChangePassword()
 
     public function postChangePassword()
     {
-        $newPassword = $this->request->get('password');
-        $token = $this->request->get('spToken');
+        $newPassword = $this->request->input('password');
+        $token = $this->request->input('spToken');
 
         $validator = $this->loginValidator();
 
         if($validator->fails()) {
+
+            if($this->request->wantsJson()) {
+                return $this->respondWithError('Validation Failed', 400, ['validatonErrors' => $validator->errors()]);
+            }
+
             return redirect()
                 ->to(config('stormpath.web.changePassword.uri').'?spToken='.$token)
                 ->withErrors($validator);
@@ -81,10 +86,16 @@ public function postChangePassword()
         try {
             $application->resetPassword($token, $newPassword);
 
+            if($this->request->wantsJson()) {
+                return $this->respondOk();
+            }
             return redirect()
                 ->to(config('stormpath.web.changePassword.nextUri'));
 
         } catch (\Stormpath\Resource\ResourceError $re) {
+            if($this->request->wantsJson()) {
+                return $this->respondWithError($re->getMessage(), $re->getStatus());
+            }
             return redirect()
                 ->to(config('stormpath.web.changePassword.errorUri'))
                 ->withErrors(['errors'=>[$re->getMessage()]]);
@@ -119,4 +130,23 @@ private function loginValidator()
         return $validator;
     }
 
+    private function respondOk()
+    {
+        return response()->json();
+    }
+
+    private function respondWithError($message, $statusCode = 400, $extra = [])
+    {
+        $error = [
+            'errors' => [
+                'message' => $message
+            ]
+        ];
+
+        if(!empty($extra)) {
+            $error['errors'] = array_merge($error['errors'], $extra);
+        }
+        return response()->json($error, $statusCode);
+    }
+
 }

src/Http/Controllers/LoginController.php

@@ -49,20 +49,24 @@ class LoginController extends Controller
      */
     public function __construct(Request $request, Validator $validator)
     {
+        $this->middleware('stormpath.produces');
         $this->request = $request;
         $this->validator = $validator;
     }
 
     public function getLogin()
     {
+        if($this->request->wantsJson()) {
+            return $this->respondWithForm();
+        }
+
         $status = $this->request->get('status');
 
         return view( config('stormpath.web.login.view'), compact('status') );
     }
 
     public function postLogin()
     {
-
         $validator = $this->loginValidator();
 
         if($validator->fails()) {
@@ -73,7 +77,12 @@ public function postLogin()
         }
 
         try {
-            $result = $this->authenticate($this->request->get('login'), $this->request->get('password'));
+            $result = $this->authenticate($this->request->input('login'), $this->request->input('password'));
+
+            if($this->request->wantsJson()) {
+                $account = $result->getAccessToken()->getAccount();
+                return $this->respondWithAccount($account);
+            }
 
             return redirect()
                 ->intended(config('stormpath.web.login.nextUri'))
@@ -103,6 +112,11 @@ public function postLogin()
                 );
 
         } catch (\Stormpath\Resource\ResourceError $re) {
+
+            if($this->request->wantsJson()) {
+                return $this->respondWithError($re->getMessage(), $re->getStatus());
+            }
+
             return redirect()
                 ->to(config('stormpath.web.login.uri'))
                 ->withErrors(['errors'=>[$re->getMessage()]])
@@ -137,4 +151,98 @@ private function loginValidator()
 
         return $validator;
     }
+
+    private function respondWithForm()
+    {
+        $application = app('stormpath.application');
+        $accountStoreArray = [];
+        $accountStores = $application->getAccountStoreMappings();
+        foreach($accountStores as $accountStore) {
+            $store = $accountStore->accountStore;
+            $provider = $store->provider;
+            $accountStoreArray[] = [
+                'href' => $store->href,
+                'name' => $store->name,
+                'provider' => [
+                    'href' => $provider->href,
+                    'providerId' => $provider->providerId,
+                    'clientId' => $provider->clientId
+                ]
+            ];
+        }
+
+        $data = [
+            'form' => [
+                'fields' => [
+                    [
+                        'label' => 'Username or Email',
+                        'name' => 'login',
+                        'placeholder' => 'Username or Email',
+                        'required' => true,
+                        'type' => 'text'
+                    ],
+                    [
+                        'label' => 'Password',
+                        'name' => 'password',
+                        'placeholder' => 'Password',
+                        'required' => true,
+                        'type' => 'password'
+                    ],
+                    [
+                        'label' => 'csrf',
+                        'name' => '_token',
+                        'placeholder' => '',
+                        'value' => csrf_token(),
+                        'required' => true,
+                        'type' => 'hidden'
+                    ]
+                ]
+            ],
+            'accountStores' => [
+                $accountStoreArray
+            ],
+
+        ];
+
+        return response()->json($data);
+
+    }
+
+    private function respondWithError($message, $statusCode = 400)
+    {
+        $error = [
+            'errors' => [
+                'message' => $message
+            ]
+        ];
+        return response()->json($error, $statusCode);
+    }
+
+    private function respondWithAccount($account)
+    {
+        $properties = [];
+        $blacklistProperties = [
+            'providerData',
+            'httpStatus',
+            'createdAt',
+            'modifiedAt'
+        ];
+
+        $propNames = $account->getPropertyNames();
+        foreach($propNames as $prop) {
+            if(in_array($prop, $blacklistProperties)) continue;
+            $properties[$prop] = $this->getPropertyValue($account, $prop);
+        }
+
+        return response()->json($properties);
+    }
+
+    private function getPropertyValue($account, $propName)
+    {
+        if(is_object($account->{$propName})) {
+            return ['href'=>$account->{$propName}->href];
+        }
+
+        return $account->{$propName};
+    }
 }