Merge pull request #60 from viralsolani/develop

API Fixes
FTXInfotech · Dec 3, 2017 · 680a941 · 680a941
2 parents 9f610cf + 94ecda8
commit 680a941
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/app/Http/Controllers/Api/V1/ForgotPasswordController.php b/app/Http/Controllers/Api/V1/ForgotPasswordController.php
@@ -43,7 +43,7 @@ public function sendResetLinkEmail(Request $request)
             return $this->respondNotFound(trans('api.messages.forgot_password.validation.email_not_found'));
         }
 
-        $token = $this->repository->createNewToken();
+        $token = $this->repository->saveToken();
 
         $user->notify(new UserNeedsPasswordReset($token));
 

diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
@@ -19,6 +19,7 @@ public function toArray($request)
             'id'            => $this->id,
             'name'          => $this->name,
             'email'         => $this->email,
+            'role'          => $this->roles()->first()->name,
             'registered_at' => $this->created_at->toIso8601String(),
         ];
     }

diff --git a/app/Repositories/Frontend/Access/User/UserRepository.php b/app/Repositories/Frontend/Access/User/UserRepository.php
@@ -293,7 +293,7 @@ public function changePassword($input)
      *
      * @return string
      */
-    public function createNewToken()
+    public function saveToken()
     {
         $token = hash_hmac('sha256', Str::random(40), 'hashKey');
 

diff --git a/composer.lock b/composer.lock
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-  "/js/frontend.js": "/js/frontend.70ee44a92d84e7318a9d.js",
-  "/js/backend.js": "/js/backend.9cdae6ab449e701ce881.js",
+  "/js/frontend.js": "/js/frontend.d3a9d9963b6da237bfe8.js",
+  "/js/backend.js": "/js/backend.51a14fd841ccd198e500.js",
   "/mix.js": "/mix.247ab120fe7680658924.js",
   "/css/frontend.css": "/css/frontend.3af0a6cbd7d1d8d042f2a37e97008b7c.css",
   "/css/backend.css": "/css/backend.f8550f50504e5b8ef6055285205f223a.css",
   "/css/backend-custom.css": "/css/backend-custom.50f14193ab908e3cf471dea6cb6616ae.css",
-  "/js/backend-custom.js": "/js/backend-custom.694670b0d97bf54111bac3bd91ba3fcf.js",
+  "/js/backend-custom.js": "/js/backend-custom.69e7d487a5a38a38520a62a5c53584f9.js",
   "/js/dataTable.js": "/js/dataTable.f968d300a6a0b871f138f114361259c8.js"
 }