updated core feature

Author: dipaksarkar

Diff for: app/Http/Controllers/Admin/RegistrationController.php

@@ -106,7 +106,7 @@ public function update(Request $request, ClassSchedule $registration)
         if ($request->boolean('has_sign_off')) {
             $request->merge([
                 'sign_off_at' => now(),
-                'admin_id' => auth('admins')->user()->id
+                'admin_id' => current_user()->id
             ]);
         } else {
             $request->merge([

Diff for: app/Http/Controllers/Auth/AuthController.php

@@ -46,7 +46,7 @@ public function login(Request $request, $guard = 'users')
                 // send login alert to user if smtp configured
                 $user->notify(new UserLogin($request));
             } catch (\Throwable $th) {
-                //throw $th;
+                report($th);
             }
 
             // create and return user with token
@@ -68,7 +68,7 @@ public function logout(Request $request, $guard = 'users')
             Auth::guard($guard)->logout();
             $request->user($guard)->currentAccessToken()->delete();
         } catch (\Throwable $th) {
-            //throw $th;
+            report($th);
         }
 
         return response()->json([

Diff for: app/Http/Controllers/Core/AdminController.php

@@ -129,7 +129,7 @@ public function update(Request $request, Admin $admin)
             $request->password = bcrypt($request->password);
         }
 
-        if ($admin->id == $request->user('admins')->id) {
+        if ($admin->id == current_user()->id) {
             $admin->update($request->except(['is_active', 'is_supper_admin']));
         } else {
             $admin->update($request->input());
@@ -265,7 +265,7 @@ public function reset_password_request(Request $request, Admin $admin)
      */
     public function change_admin(Request $request, Admin $admin)
     {
-        if ($admin->id == $request->user('admins')->id) {
+        if ($admin->id == current_user()->id) {
             return response()->json([
                 'message' => 'Staff can not update his/her self account.',
             ], 403);
@@ -288,7 +288,7 @@ public function change_admin(Request $request, Admin $admin)
      */
     public function change_active(Request $request, Admin $admin)
     {
-        if ($admin->id == $request->user('admins')->id) {
+        if ($admin->id == current_user()->id) {
             return response()->json([
                 'message' => 'Staff can not update his/her self account.',
             ], 403);

Diff for: app/Models/Core/Log.php

@@ -111,7 +111,7 @@ protected static function booted()
         parent::booted();
         static::creating(function ($model) {
             if (empty($model->admin_id) && auth('admins')->check()) {
-                $model->admin_id = auth('admins')->user()->id ?? null;
+                $model->admin_id = current_user()->id ?? null;
             }
         });
     }

Diff for: app/Policies/EnquiryPolicy.php

@@ -32,7 +32,7 @@ public function before(Admin $admin, $ability)
      */
     public function viewAny(Admin $admin)
     {
-        if (auth()->check()) {
+        if (is_user()) {
             return true;
         }
         return $admin->can('tickets:list');
@@ -47,8 +47,8 @@ public function viewAny(Admin $admin)
      */
     public function view(Admin $admin, Enquiry $enquiry)
     {
-        if (auth()->check()) {
-            return $enquiry->email == auth()->user()->email;
+        if (is_user()) {
+            return $enquiry->email == current_user()->email;
         }
         return $admin->can('tickets:view');
     }
@@ -61,7 +61,7 @@ public function view(Admin $admin, Enquiry $enquiry)
      */
     public function create(Admin $admin)
     {
-        if (auth()->check()) {
+        if (is_user()) {
             return true;
         }
         return $admin->can('tickets:new');
@@ -76,8 +76,8 @@ public function create(Admin $admin)
      */
     public function update(Admin $admin, Enquiry $enquiry)
     {
-        if (auth()->check()) {
-            return $enquiry->email == auth()->user()->email;
+        if (is_user()) {
+            return $enquiry->email == current_user()->email;
         }
         return $admin->can('tickets:edit');
     }

Diff for: app/Policies/UserPolicy.php

@@ -45,7 +45,7 @@ public function viewAny(Admin $admin)
     public function view(Admin $admin, User $user)
     {
         if (auth()->check()) {
-            return $user->id == auth()->user()->id;
+            return $user->id == current_user()->id;
         }
         return $admin->can('members:view');
     }

Diff for: app/Providers/PermissionsServiceProvider.php

@@ -39,7 +39,7 @@ public function boot()
 
         //Blade directives
         Blade::directive('group', function ($group, $guard = 'users') {
-            return "if(auth({$guard})->check() && auth({$guard})->user()->hasGroup({$group})) :"; //return this if statement inside php tag
+            return "if(current_user()->guard == {$guard} && current_user()->hasGroup({$group})) :"; //return this if statement inside php tag
         });
 
         Blade::directive('endgroup', function ($group) {