Update default json format

Author: Addin Gama Bertaqwa

app/Http/Controllers/Controller.php

@@ -3,27 +3,44 @@
 namespace App\Http\Controllers;
 
 use Exception;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     /**
-     * Default formatter for error response API
-     *
+     * @param Request $request
      * @param Exception $e
      * @return \Illuminate\Http\JsonResponse
      */
-    public function responseError(Exception $e) {
-        return response()->json(['error' => true, 'code' => $e->getCode(), 'message' => $e->getMessage()], $e->getCode());
+    public function responseError(Request $request, Exception $e)
+    {
+        return response()->json([
+            'error' => true,
+            'code' => $e->getCode(),
+            'url' => $request->url(),
+            'message' => $e->getMessage()
+        ], $e->getCode());
     }
 
 
-    public function responseSuccess($response) {
-        return response()->json(['error' => false, 'response' => $response]);
+    /**
+     * @param Request $request
+     * @param $response
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function responseSuccess(Request $request, $response)
+    {
+        return response()->json([
+            'error' => false,
+            'url' => $request->url(),
+            'response' => $response
+        ]);
+
     }
 }

app/Http/Controllers/TMoney/GeneralController.php

@@ -21,7 +21,7 @@ public function __construct()
         $this->client = new Client();
     }
 
-    public function getAccessToken() {
+    public function getAccessToken(Request $request) {
         try {
             $response = getAccessToken();
             $tokenRequest = $response->getBody();
@@ -33,19 +33,19 @@ public function getAccessToken() {
                 return  response()->json(['error' => false, 'access_token' => $json->access_token]);
             }
         } catch (BadResponseException $e) {
-            return $this->responseError($e);
+            return $this->responseError($request, $e);
         }
 
     }
 
-    public function emailCheck($email) {
+    public function emailCheck(Request $request, $email) {
         try {
             $response = emailCheck($email);
             $body = $response->getBody();
             $json = json_decode($body);
-            return response()->json(['error' => false, 'response' => $json]);
+            return $this->responseSuccess($request, $json);
         } catch (BadResponseException $e) {
-            return $this->responseError($e);
+            return $this->responseError($request, $e);
         }
     }
 }

app/Http/helpers.php

@@ -27,7 +27,8 @@ function emailCheck($email) {
     $client = new Client();
     return $client->post(Config::get('tmoney.base_url').'/email-check', [
         'headers' => [
-            'Authorization' => Config::get('tmoney.authorization')
+            'Authorization' => Config::get('tmoney.authorization'),
+            'Accept' => 'application/json'
         ],
         'form_params' => [
             'userName' => $email,