- Update logged in user's password #8

- CS fixes.

Author: joselfonseca

app/Console/Kernel.php

@@ -25,7 +25,6 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-
     }
 
     /**

app/Entities/Role.php

@@ -18,5 +18,4 @@ class Role extends \Spatie\Permission\Models\Role
      * @var array
      */
     protected $fillable = ['name', 'uuid'];
-
 }

app/Entities/User.php

@@ -44,8 +44,7 @@ class User extends Authenticatable
      */
     public static function create(array $attributes = [])
     {
-
-        if(array_key_exists('password', $attributes)) {
+        if (array_key_exists('password', $attributes)) {
             $attributes['password'] = bcrypt($attributes['password']);
         }
 

app/Exceptions/Handler.php

@@ -64,7 +64,6 @@ public function render($request, Exception $exception)
      */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
-
         if ($request->expectsJson()) {
             return response()->json(['message' => 'Unauthenticated.'], 401);
         }

app/Http/Controllers/Api/Users/PermissionsController.php

@@ -42,5 +42,4 @@ public function index(Request $request)
     {
         return $this->response->paginator($this->model->paginate($request->get('limit', config('app.pagination_limit'))), new PermissionTransformer());
     }
-
 }

app/Http/Controllers/Api/Users/ProfileController.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Http\Request;
 use Dingo\Api\Routing\Helpers;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Hashing\Hasher;
+use Dingo\Api\Exception\ResourceException;
 use App\Transformers\Users\UserTransformer;
 
 /**
@@ -36,7 +38,7 @@ public function update(Request $request)
             'name' => 'required',
             'email' => 'required|email|unique:users,email,'.$user->id,
         ];
-        if($request->method() == "PATCH") {
+        if ($request->method() == "PATCH") {
             $rules = [
                 'name' => 'sometimes|required',
                 'email' => 'sometimes|required|email|unique:users,email,'.$user->id,
@@ -48,4 +50,25 @@ public function update(Request $request)
         return $this->response->item($user->fresh(), new UserTransformer());
     }
 
+    /**
+     * @param Request $request
+     * @return \Dingo\Api\Http\Response
+     */
+    public function updatePassword(Request $request)
+    {
+        $user = Auth::user();
+        $this->validate($request, [
+            'current_password' => 'required',
+            'password' => 'required|min:8|confirmed'
+        ]);
+        // verify the old password given is valid
+        if (!app(Hasher::class)->check($request->get('current_password'), $user->password)) {
+            throw new ResourceException('Validation Issue', [
+                'old_password' => 'The current password is incorrect'
+            ]);
+        }
+        $user->password = bcrypt($request->get('password'));
+        $user->save();
+        return $this->response->item($user->fresh(), new UserTransformer());
+    }
 }

app/Http/Controllers/Api/Users/RolesController.php

@@ -70,7 +70,7 @@ public function store(Request $request)
             'name' => 'required'
         ]);
         $role = $this->model->create($request->all());
-        if($request->has('permissions')) {
+        if ($request->has('permissions')) {
             $role->syncPermissions($request['permissions']);
         }
         return $this->response->created(url('api/roles/'.$role->uuid));
@@ -89,7 +89,7 @@ public function update(Request $request, $uuid)
             'name' => 'required'
         ]);
         $role->update($request->except('_token'));
-        if($request->has('permissions')) {
+        if ($request->has('permissions')) {
             $role->syncPermissions($request['permissions']);
         }
         return $this->response->item($role->fresh(), new RoleTransformer());

app/Http/Controllers/Api/Users/UsersController.php

@@ -74,7 +74,7 @@ public function store(Request $request)
             'password' => 'required|min:8|confirmed'
         ]);
         $user = $this->model->create($request->all());
-        if($request->has('roles')) {
+        if ($request->has('roles')) {
             $user->syncRoles($request['roles']);
         }
         return $this->response->created(url('api/users/'.$user->uuid));
@@ -93,7 +93,7 @@ public function update(Request $request, $uuid)
             'name' => 'required',
             'email' => 'required|email|unique:users,email,'.$user->id,
         ];
-        if($request->method() == "PATCH") {
+        if ($request->method() == "PATCH") {
             $rules = [
                 'name' => 'sometimes|required',
                 'email' => 'sometimes|required|email|unique:users,email,'.$user->id,
@@ -102,7 +102,7 @@ public function update(Request $request, $uuid)
         $this->validate($request, $rules);
         // Except password as we don't want to let the users change a password from this endpoint
         $user->update($request->except('_token', 'password'));
-        if($request->has('roles')) {
+        if ($request->has('roles')) {
             $user->syncRoles($request['roles']);
         }
         return $this->response->item($user->fresh(), new UserTransformer());

app/Providers/AppServiceProvider.php

@@ -23,6 +23,5 @@ public function boot()
      */
     public function register()
     {
-
     }
 }

app/Services/Installation/InstallAppHandler.php

@@ -108,7 +108,7 @@ public function createAdminUser(array $attributes = [])
             'email' => 'required|email|unique:users,email',
             'password' => 'required|min:8|confirmed'
         ]);
-        if($validator->fails()) {
+        if ($validator->fails()) {
             throw new ValidationException($validator);
         }
         $this->adminUser = User::create([