From c40f743d6994b36db60bb8f28b821e96a48828d0 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 4 Aug 2022 10:20:24 +0800
Subject: [PATCH] use helper to access user and customer

---
 beike/Admin/View/Components/Header.php               |  4 ++--
 beike/Admin/View/Components/Sidebar.php              |  2 +-
 beike/Helpers.php                                    |  8 ++++----
 .../Http/Controllers/Account/AccountController.php   | 12 +++++-------
 .../Shop/Http/Controllers/Account/EditController.php |  2 +-
 beike/Shop/View/Components/AccountSidebar.php        |  2 +-
 .../beike/admin/views/components/header.blade.php    |  2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php
index 9c5d4197..211ba345 100644
--- a/beike/Admin/View/Components/Header.php
+++ b/beike/Admin/View/Components/Header.php
@@ -8,7 +8,7 @@ use Illuminate\View\Component;
 class Header extends Component
 {
     public array $links = [];
-    private AdminUser $adminUser;
+    private ?AdminUser $adminUser;
 
     /**
      * Create a new component instance.
@@ -17,7 +17,7 @@ class Header extends Component
      */
     public function __construct()
     {
-        $this->adminUser = auth()->user();
+        $this->adminUser = current_user();
     }
 
 
diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php
index 66e8ffbd..00c70797 100644
--- a/beike/Admin/View/Components/Sidebar.php
+++ b/beike/Admin/View/Components/Sidebar.php
@@ -22,7 +22,7 @@ class Sidebar extends Component
     {
         $this->adminName = admin_name();
         $this->routeNameWithPrefix = request()->route()->getName();
-        $this->adminUser = auth(AdminUser::AUTH_GUARD)->user();
+        $this->adminUser = current_user();
     }
 
     /**
diff --git a/beike/Helpers.php b/beike/Helpers.php
index 21670ba2..e8719148 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -135,9 +135,9 @@ function equal_route($routeName): bool
 /**
  * 获取后台当前登录用户
  *
- * @return Authenticatable|null
+ * @return mixed
  */
-function current_user(): ?Authenticatable
+function current_user(): ?AdminUser
 {
     return auth()->guard(AdminUser::AUTH_GUARD)->user();
 }
@@ -145,9 +145,9 @@ function current_user(): ?Authenticatable
 /**
  * 获取前台当前登录客户
  *
- * @return Authenticatable|null
+ * @return mixed
  */
-function current_customer(): ?Authenticatable
+function current_customer(): ?Customer
 {
     return auth()->guard(Customer::AUTH_GUARD)->user();
 }
diff --git a/beike/Shop/Http/Controllers/Account/AccountController.php b/beike/Shop/Http/Controllers/Account/AccountController.php
index 1526e1b7..7088bd22 100644
--- a/beike/Shop/Http/Controllers/Account/AccountController.php
+++ b/beike/Shop/Http/Controllers/Account/AccountController.php
@@ -13,23 +13,21 @@ namespace Beike\Shop\Http\Controllers\Account;
 
 use Beike\Models\Customer;
 use Beike\Repositories\CustomerRepo;
-use Beike\Shop\Http\Controllers\Controller;
-use Beike\Shop\Http\Requests\EditRequest;
-use Beike\Shop\Http\Requests\ForgottenRequest;
-use http\Env\Request;
 use Illuminate\Support\Facades\Hash;
-use function auth;
-use function view;
+use Beike\Shop\Http\Requests\EditRequest;
+use Beike\Shop\Http\Controllers\Controller;
+use Beike\Shop\Http\Requests\ForgottenRequest;
 
 class AccountController extends Controller
 {
     /**
      * 个人中心首页
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
+     * @throws \Exception
      */
     public function index()
     {
-        $data = auth(Customer::AUTH_GUARD)->user()->toArray();
+        $data = current_customer()->toArray();
         $data['avatar'] = image_resize($data['avatar']);
         return view('account/account', $data);
     }
diff --git a/beike/Shop/Http/Controllers/Account/EditController.php b/beike/Shop/Http/Controllers/Account/EditController.php
index 92f40306..c6fe04ef 100644
--- a/beike/Shop/Http/Controllers/Account/EditController.php
+++ b/beike/Shop/Http/Controllers/Account/EditController.php
@@ -19,7 +19,7 @@ class EditController extends Controller
 {
     public function index()
     {
-        $customer = auth(Customer::AUTH_GUARD)->user();
+        $customer = current_customer();
         $data['customer'] = $customer;
         return view('account/edit', $data);
     }
diff --git a/beike/Shop/View/Components/AccountSidebar.php b/beike/Shop/View/Components/AccountSidebar.php
index 1e1a3dd4..46233288 100644
--- a/beike/Shop/View/Components/AccountSidebar.php
+++ b/beike/Shop/View/Components/AccountSidebar.php
@@ -17,7 +17,7 @@ class AccountSidebar extends Component
      */
     public function __construct()
     {
-        $this->customer = auth(Customer::AUTH_GUARD)->user();
+        $this->customer = current_customer();
     }
 
     /**
diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php
index 6e16f8b9..094c99be 100644
--- a/resources/beike/admin/views/components/header.blade.php
+++ b/resources/beike/admin/views/components/header.blade.php
@@ -19,7 +19,7 @@
         <div class="dropdown">
           <a href="#" class="nav-link dropdown-toggle px-2" data-bs-toggle="dropdown">
             <img src="http://dummyimage.com/100x100" class="avatar img-fluid rounded-circle me-1">
-            <span class="text-dark ml-2">{{ auth()->user()->name }}</span>
+            <span class="text-dark ml-2">{{ current_user()->name }}</span>
           </a>
 
           <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuLink">