From c9571988a50ef0d988d4d6c9e8562935e998215d Mon Sep 17 00:00:00 2001
From: AVMG20 <rijstenpap1234@hotmail.com>
Date: Sat, 12 Jun 2021 17:11:44 +0200
Subject: [PATCH 1/2] removed the resend verification in the admin panel

---
 app/Http/Controllers/Admin/UserController.php | 14 --------------
 routes/web.php                                |  1 -
 2 files changed, 15 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 3178a6d5..ed690aa2 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -142,19 +142,6 @@ class UserController extends Controller
         return redirect()->route('admin.users.index');
     }
 
-    /**
-     * @param User $user
-     * @return RedirectResponse
-     */
-    public function reSendVerificationEmail(User $user)
-    {
-        if ($user->hasVerifiedEmail())
-            return redirect()->back()->with('error', 'User has already verified their email');
-
-        $user->sendEmailVerificationNotification();
-        return redirect()->back()->with('success', 'User has been emailed again!');
-    }
-
     /**
      *
      * @throws Exception
@@ -187,7 +174,6 @@ class UserController extends Controller
             })
             ->addColumn('actions', function (User $user) {
                 return '
-                <a data-content="Resend verification" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.reSendVerificationEmail', $user->id) . '" class="btn btn-sm text-white btn-light mr-1"><i class="far fa-envelope"></i></a>
                 <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="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>
diff --git a/routes/web.php b/routes/web.php
index ae9ce345..71940edb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -70,7 +70,6 @@ Route::middleware('auth')->group(function () {
 
         Route::resource('activitylogs', ActivityLogController::class);
 
-        Route::get('users/resendverificationemail/{user}', [UserController::class, 'reSendVerificationEmail'])->name('users.reSendVerificationEmail');
         Route::get('users/loginas/{user}', [UserController::class, 'loginAs'])->name('users.loginas');
         Route::get('users/datatable', [UserController::class, 'datatable'])->name('users.datatable');
         Route::resource('users', UserController::class);

From 4b628988ee12bbd3cb50d6a2dc527b9470c1412a Mon Sep 17 00:00:00 2001
From: AVMG20 <rijstenpap1234@hotmail.com>
Date: Sat, 12 Jun 2021 17:29:08 +0200
Subject: [PATCH 2/2] role to discord user

added the ability to give a role to the discord user that has verified there discord
---
 .env.example                                      |  6 ++++--
 app/Http/Controllers/Auth/SocialiteController.php | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index c257ac4f..8b2873e6 100644
--- a/.env.example
+++ b/.env.example
@@ -25,8 +25,10 @@ PAYPAL_EMAIL=
 DISCORD_CLIENT_ID=
 DISCORD_CLIENT_SECRET=
 #set-up will join users automaticly to your discord
-DISCORD_BOT_TOKEN=YOUR_DISCORD_BOT_TOKEN
-DISCORD_GUILD_ID=YOUR_DISCORD_SERVER_ID
+DISCORD_BOT_TOKEN=
+DISCORD_GUILD_ID=
+#set-up will give the verified user the given role
+DISCORD_ROLE_ID=
 
 #nesseary URL's
 PTERODACTYL_URL=https://panel.bitsec.dev
diff --git a/app/Http/Controllers/Auth/SocialiteController.php b/app/Http/Controllers/Auth/SocialiteController.php
index 08b92da8..757900c6 100644
--- a/app/Http/Controllers/Auth/SocialiteController.php
+++ b/app/Http/Controllers/Auth/SocialiteController.php
@@ -29,8 +29,9 @@ class SocialiteController extends Controller
         $discord = Socialite::driver('discord')->user();
         $discordUser = DiscordUser::find($discord->id);
 
-        $guildId = env('DISCORD_GUILD_ID');
         $botToken = env('DISCORD_BOT_TOKEN');
+        $guildId = env('DISCORD_GUILD_ID');
+        $roleId = env('DISCORD_ROLE_ID');
 
         //force user into discord server
         //TODO Add event on failure, to notify ppl involved
@@ -42,6 +43,17 @@ class SocialiteController extends Controller
                 ]
             )->put("https://discord.com/api/guilds/{$guildId}/members/{$discord->id}",
                 ['access_token' => $discord->token]);
+
+            //give user a role in the discord server
+            if (!empty($roleId)){
+                $response = Http::withHeaders(
+                    [
+                        'Authorization' => 'Bot ' . $botToken,
+                        'Content-Type' => 'application/json',
+                    ]
+                )->put("https://discord.com/api/guilds/{$guildId}/members/{$discord->id}/roles/{$roleId}",
+                    ['access_token' => $discord->token]);
+            }
         }