Remove social link items and update test email

app/Console/Commands/EmailTest.php

@@ -6,17 +6,20 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
 
-use App\Mail\TestEmail as MailTest;
+use App\Mail\Test;
 use App\Models\{Site,User};
 
-class TestEmail extends Command
+class EmailTest extends Command
 {
 	/**
 	 * The name and signature of the console command.
 	 *
 	 * @var string
 	 */
-	protected $signature = 'test:email {site : Site ID} {id : User ID} {email? : Alternative Email}';
+	protected $signature = 'test-email'
+		.' {--s|site : Site ID}'
+		.' {id : User ID}'
+		.' {email? : Alternative Email}';
 
 	/**
 	 * The console command description.
@@ -25,16 +28,6 @@ class TestEmail extends Command
 	 */
 	protected $description = 'Send a test email';
 
-	/**
-	 * Create a new command instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
 	/**
 	 * Execute the console command.
 	 *
@@ -42,11 +35,20 @@ class TestEmail extends Command
 	 */
 	public function handle()
 	{
-		Config::set('site',Site::findOrFail($this->argument('site')));
+		Config::set(
+			'site',
+			$this->option('site')
+				? Site::findOrFail($this->option('site'))
+				: Site::where('url',config('app.url'))->sole()
+		);
 
 		$uo = User::find($this->argument('id'));
 
-		Mail::to($this->argument('email') ?? $uo->email)
-			->send(new MailTest($uo));
+		$result = Mail::to($this->argument('email') ?? $uo->email)
+			->send(new Test($uo));
+
+		$this->info($result->getMessageId());
+
+		return self::SUCCESS;
 	}
 }

app/Http/Controllers/Auth/SocialLoginController.php

@@ -3,14 +3,10 @@
 namespace App\Http\Controllers\Auth;
 
 use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Mail;
 use Laravel\Socialite\Facades\Socialite;
 
 use App\Http\Controllers\Controller;
-use App\Mail\SocialLink;
 use App\Models\{ProviderOauth,ProviderToken,User,UserOauth};
 
 class SocialLoginController extends Controller
@@ -105,46 +101,4 @@ class SocialLoginController extends Controller
 			->intended('/home')
 			->with('success','Token refreshed.');
 	}
-
-	/**
-	 * We have identified the user and oauth, just need them to confirm the link
-	 *
-	 * @param $provider
-	 * @param UserOauth $ao
-	 * @param User $uo
-	 * @return \Illuminate\View\View
-	 */
-	public function link($provider,UserOauth $ao,User $uo): \Illuminate\View\View
-	{
-		// @note If this is sent now (send()), it results in the caller to be executed a second time (handleProviderCallback()).
-		Mail::to($uo->email)->queue(new SocialLink($ao));
-
-		return view('auth.social_link')
-			->with('oauthid',$ao->id)
-			->with('provider',$provider);
-	}
-
-	public function linkcomplete(Request $request,$provider)
-	{
-		// Load our oauth id
-		$aoo = UserOauth::findOrFail($request->post('oauthid'));
-
-		// Check our email matches
-		if (Arr::get($aoo->oauth_data,'email','invalid') !== $request->post('email'))
-			return redirect('/login')->with('error','Account details didnt match to make link.');
-
-		// Check our token matches
-		if ($aoo->link_token !== $request->post('token'))
-			return redirect('/login')->with('error','Token details didnt match to make link.');
-
-		// Load our email.
-		$uo = User::where('email',$request->post('email'))->firstOrFail();
-
-		$aoo->user_id = $uo->id;
-		$aoo->save();
-		Auth::login($uo);
-
-		return redirect()
-			->intended('/home');
-	}
 }

app/Mail/SocialLink.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Config;
-
-use App\Models\{Site,User,UserOauth};
-
-class SocialLink extends Mailable
-{
-	use Queueable, SerializesModels;
-
-	public string $token;
-	public Site $site;
-	public ?User $user;
-
-	/**
-	 * Create a new message instance.
-	 *
-	 * @param UserOauth $o
-	 */
-	public function __construct(UserOauth $o)
-	{
-		$this->site = $o->site;
-		$this->token = $o->link_token;
-		$this->user = $o->user;
-	}
-
-	/**
-	 * Build the message.
-	 *
-	 * @return $this
-	 */
-	public function build()
-	{
-		Config::set('site',$this->site);
-
-		return $this
-			->markdown('mail.system.social_link')
-			->subject('Link your Account')
-			->with([
-				'site'=>$this->site,
-			]);
-	}
-}

app/Mail/Test.php

@@ -3,14 +3,12 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Config;
 
 use App\Models\User;
 
-class TestEmail extends Mailable
+class Test extends Mailable
 {
 	use Queueable, SerializesModels;
 
@@ -33,10 +31,8 @@ class TestEmail extends Mailable
 	 */
 	public function build()
 	{
-		Config::set('site',$this->user->site);
-
 		return $this
-			->markdown('mail.system.test_email')
+			->markdown('mail.test')
 			->subject('Just a test...')
 			->with([
 				'site'=>$this->user->site,