From 266057b666c9ba518e1f595f3305234f03873c36 Mon Sep 17 00:00:00 2001
From: Jozef Bonnar <42479938+jozefbonnar@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:11:02 +0100
Subject: [PATCH 1/2] Add forced email verify for admins

---
 app/Http/Controllers/Admin/UserController.php | 12 ++++++++++++
 app/Models/User.php                           |  7 +++++++
 public/install/index.php                      |  2 +-
 routes/web.php                                |  1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 3deae9d1..61edbdbc 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -160,6 +160,17 @@ class UserController extends Controller
         $user->delete();
         return redirect()->back()->with('success', __('user has been removed!'));
     }
+    /**
+     * Verifys the users email
+     *
+     * @param User $user
+     * @return RedirectResponse
+     */
+    public function verifyEmail(Request $request, User $user)
+    {
+        $user->verifyEmail();
+        return redirect()->back()->with('success', __('Email has been verified!'));
+    }
 
     /**
      * @param Request $request
@@ -285,6 +296,7 @@ class UserController extends Controller
                 $suspendText = $user->isSuspended() ? __("Unsuspend") : __("Suspend");
                 return '
                 <a data-content="' . __("Login as User") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.loginas', $user->id) . '" class="btn btn-sm btn-primary mr-1"><i class="fas fa-sign-in-alt"></i></a>
+                <a data-content="' . __("Verify") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.verifyEmail', $user->id) . '" class="btn btn-sm btn-primary mr-1"><i class="fas fa-sign-in-alt"></i></a>
                 <a data-content="' . __("Show") . '" data-toggle="popover" data-trigger="hover" data-placement="top"  href="' . route('admin.users.show', $user->id) . '" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-eye"></i></a>
                 <a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top"  href="' . route('admin.users.edit', $user->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
                <form class="d-inline" method="post" action="' . route('admin.users.togglesuspend', $user->id) . '">
diff --git a/app/Models/User.php b/app/Models/User.php
index 5f8af024..2885c5ba 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -259,4 +259,11 @@ class User extends Authenticatable implements MustVerifyEmail
         $status = str_replace(' ', '/', $status);
         return $status;
     }
+
+        public function verifyEmail()
+        {
+            $this->forceFill([
+                'email_verified_at' => now(),
+            ])->save();
+        }
 }
diff --git a/public/install/index.php b/public/install/index.php
index 562e4a3b..70a7fb18 100644
--- a/public/install/index.php
+++ b/public/install/index.php
@@ -448,7 +448,7 @@ echo $cardheader;
                             ?>
                             <p class="login-box-msg">All done!</p>
                             <p class="login-box-msg">You may navigate to your Dashboard now and log in!</p>
-                            <a href="<?php echo "https://" . $_SERVER['SERVER_NAME']; ?>">
+                            <a href="<?php echo getEnvironmentValue("APP_URL"); ?>">
                                 <button class="btn btn-success">Lets go!</button>
                             </a>
                             </div>
diff --git a/routes/web.php b/routes/web.php
index 168549f7..1f296199 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -103,6 +103,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
         #users
         Route::get("users.json", [UserController::class, "json"])->name('users.json');
         Route::get('users/loginas/{user}', [UserController::class, 'loginAs'])->name('users.loginas');
+        Route::get('users/verifyEmail/{user}', [UserController::class, 'verifyEmail'])->name('users.verifyEmail');
         Route::get('users/datatable', [UserController::class, 'datatable'])->name('users.datatable');
         Route::get('users/notifications', [UserController::class, 'notifications'])->name('users.notifications');
         Route::post('users/notifications', [UserController::class, 'notify'])->name('users.notifications');

From 62700a91f6dce889a69c9b13e689b0a62d8a2b97 Mon Sep 17 00:00:00 2001
From: Jozef Bonnar <42479938+jozefbonnar@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:14:07 +0100
Subject: [PATCH 2/2] fixed formatting

---
 app/Models/User.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 2885c5ba..8d9c9848 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -260,10 +260,10 @@ class User extends Authenticatable implements MustVerifyEmail
         return $status;
     }
 
-        public function verifyEmail()
-        {
-            $this->forceFill([
-                'email_verified_at' => now(),
-            ])->save();
-        }
+    public function verifyEmail()
+    {
+        $this->forceFill([
+            'email_verified_at' => now(),
+        ])->save();
+    }
 }