diff --git a/app/middleware/Audit.php b/app/middleware/Audit.php index deb99d5..5c321b7 100644 --- a/app/middleware/Audit.php +++ b/app/middleware/Audit.php @@ -102,7 +102,7 @@ class Audit implements MiddlewareInterface ]; } else { if (!isset($user['uname'])) { - $user['uname'] = User::where('id', $user['uid'])->value('name'); + $user['uname'] = User::where('id', $user['id'])->value('name'); } } diff --git a/app/middleware/AuthCheck.php b/app/middleware/AuthCheck.php index 0c44789..2bc9df1 100644 --- a/app/middleware/AuthCheck.php +++ b/app/middleware/AuthCheck.php @@ -24,6 +24,7 @@ class AuthCheck implements MiddlewareInterface try { $authHeader = $request->header('Fdesk-Auth-Token'); $user = User::where('union_id',$authHeader)->first(); + $user['uid'] = $user['id']; if (!$user) { $body = [ 'status' => 'fail', @@ -33,7 +34,7 @@ class AuthCheck implements MiddlewareInterface ]; return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']); } - $request->user = $user; + $request->user = $user->toArray(); return $handler($request); } catch (\Throwable $e) { $body = [