Browse Source

Reformat some responses

Bubka 3 years ago
parent
commit
297b55f66f

+ 6 - 0
app/Exceptions/Handler.php

@@ -4,6 +4,7 @@ namespace App\Exceptions;
 
 use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class Handler extends ExceptionHandler
 {
@@ -48,10 +49,15 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
+        if ($exception instanceof ModelNotFoundException) {
+            return response()->json([
+                'message' => str_replace('App\\', '', $exception->getModel()).' not found'], 404);
+        }
         if ($exception instanceof InvalidQrCodeException) {
             return response()->json([
                 'message' => 'not a valid QR code'], 400);
         }
+        
         return parent::render($request, $exception);
     }
 }

+ 5 - 1
app/Http/Controllers/Auth/LoginController.php

@@ -76,7 +76,11 @@ class LoginController extends Controller
 
         $this->authenticated($request, $this->guard()->user());
 
-        return response()->json(['message' => $success], Response::HTTP_OK);
+        return response()->json([
+            'message' => 'authenticated',
+            'token' => $success['token'],
+            'name' => $success['name']
+        ], Response::HTTP_OK);
     }
 
     /**

+ 5 - 7
app/Http/Controllers/Auth/RegisterController.php

@@ -58,13 +58,11 @@ class RegisterController extends Controller
 
         //$this->guard()->login($user);
 
-        $success['token'] = $user->createToken('MyApp')->accessToken;
-        $success['name'] = $user->name;
-
-        return response()->json(['message' => $success]);
-
-        // return $this->registered($request, $user)
-        //                 ?: redirect($this->redirectPath());
+        return response()->json([
+            'message' => 'account created',
+            'token' => $user->createToken('MyApp')->accessToken,
+            'name' => $user->name,
+        ]);
     }
 
     /**

+ 2 - 1
app/Http/Controllers/IconController.php

@@ -24,8 +24,9 @@ class IconController extends Controller
         ]);
         
         $path = $request->file('icon')->store('public/icons');
+        $response['filename'] = pathinfo($path)['basename'];
 
-        return response()->json(pathinfo($path)['basename'], 201);
+        return response()->json($response, 201);
     }