diff --git a/app/Http/Controllers/AuthenticateController.php b/app/Http/Controllers/AuthenticateController.php index 61ff2444..0dccce1c 100644 --- a/app/Http/Controllers/AuthenticateController.php +++ b/app/Http/Controllers/AuthenticateController.php @@ -76,10 +76,7 @@ class AuthenticateController extends Controller $user = $this->repository->nasToolsApprove($request->data); $resource = new UserResource($user); //temporarily compatible - $data = $resource->response($request)->getData(true)['data']; - $result = $data; - $result['data'] = $data; - return $this->success($result, "Please use data.data"); + return $this->success($this->polyfillArray($resource, $request), "Please use data.data"); } catch (\Exception $exception) { $msg = $exception->getMessage(); $params = $request->all(); @@ -88,6 +85,14 @@ class AuthenticateController extends Controller } } + private function polyfillArray(JsonResource $resource, Request $request) + { + $data = $resource->response($request)->getData(true)['data']; + $result = $data; + $result['data'] = $data; + return $result; + } + public function iyuuApprove(Request $request) { try { @@ -115,7 +120,8 @@ class AuthenticateController extends Controller ]); $user = $this->repository->ammdsApprove($request); $resource = new UserResource($user); - return $this->success($resource); + //temporarily compatible + return $this->success($this->polyfillArray($resource, $request), "Please use data.data"); } catch (\Exception $exception) { $msg = $exception->getMessage(); $params = $request->all();