Add automatic linking of fake ckeys to the WI

Author: skull-test

app/Http/Controllers/Auth/ServerController.php

@@ -6,6 +6,7 @@
 
 use App\Models\User;
 use App\Services\Server\ServerQuery;
+use App\Services\Server\Helpers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -89,6 +90,13 @@ public function endLogin(Request $request)
         $client_token = $request->session()->pull('server_client_token');
         $byond_key_is_linked = $request->user()->byond_key != null;
 
+        $ckey_is_external = False;
+        if ($byond_key_is_linked) {
+            $ckey_is_external = ServerPlayer::where('ckey', $request->user()->byond_key)->select('ckey_is_external')->firstOrFail();
+        } else {
+            $ckey_is_external = True;
+        }
+
         $query = new ServerQuery;
         try {
             Log::debug("server.login - Sending auth_client request to server for ckey and forum account: " . $request->user()->byond_key . ", " . $request->user()->name);
@@ -98,7 +106,7 @@ public function endLogin(Request $request)
                 'clienttoken' => $client_token,
                 'key' => $request->user()->byond_key,
                 'forumuser' => $request->user()->name,
-                'use-external-key' =>  $byond_key_is_linked
+                'use-external-key' => $ckey_is_external
             ]);
         } catch (\Exception $e) {
             Log::debug("server.login - Error while sending auth_client request to server: " . $e->getMessage());
@@ -107,6 +115,13 @@ public function endLogin(Request $request)
 
         if ($query->response->statuscode == '200') {
             Log::debug("server.login - Ckey or external user succesfully logged in: " . $request->user()->byond_key . ", " . $request->user()->name);
+
+            // User was authorized but no BYOND key is linked yet. Ergo, external ckey was used. Link it.
+            if ($byond_key_is_linked == False) {
+                $fake_ckey = "GuestF-" . Helpers::sanitize_ckey($request->user()->name);
+                $request->user()->linkWithCkey($fake_ckey);
+            }
+
             return view('auth.server.success');
         } else {
             Log::debug("server.login - Invalid status-code while sending auth_client request to server: " . $query->response->statuscode);

app/Http/Controllers/User/LinkController.php

@@ -49,20 +49,8 @@ public function index(Request $request)
             //Check if the linking request is set to something other than new
             if ($linking_request->status == "confirmed") {
                 //If its confirmed write it to the forum db
-                $sanitized_key = Helpers::sanitize_ckey($linking_request->player_ckey);
-                $request->user()->byond_key = $sanitized_key;
-                $request->user()->save();
-
-                //Update the forum
-                $base_url = config('aurora.forum_url');
-                if ($base_url) {
-                    $request_url = $base_url . 'api/core/members/' . $request->user()->id .
-                        '?key=' . config('aurora.forum_api_key') .
-                        '&customFields[' . config('aurora.forum_byond_attribute') . ']=' . $sanitized_key;
-                    $client = new \GuzzleHttp\Client();
-                    $client->request('POST', $request_url);
-                }
 
+                $request->user()->linkWithCkey($byond_key);
 
                 //Set the status of the linking request to linked and set the deleted_at date
                 DB::connection('server')->table('player_linking')

app/Models/User.php

@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use App\Models\ServerPlayer;
 use App\Models\SiteRole;
+use App\Services\Server\Helpers;
 
 class User extends Authenticatable
 {
@@ -149,4 +150,33 @@ public function checkPlayerChar($char_id)
             return NULL;
         }
     }
+
+    /**
+     * Linked the user account to a specified ckey. Will also create the link in the forums.
+     * 
+     * Will throw if the user is already linked with a byond key.
+     * 
+     * @param $byond_key
+     */
+    public function linkWithCkey($byond_key)
+    {
+        if ($this->byond_linked == True) {
+            throw new \Exception("User already linked with a ckey.");
+        }
+
+        $sanitized_key = Helpers::sanitize_ckey($byond_key);
+        $this->byond_key = $sanitized_key;
+        $this->byond_linked = True;
+        $this->save();
+
+        //Update the forum
+        $base_url = config('aurora.forum_url');
+        if ($base_url) {
+            $request_url = $base_url . 'api/core/members/' . $this->id .
+                '?key=' . config('aurora.forum_api_key') .
+                '&customFields[' . config('aurora.forum_byond_attribute') . ']=' . $sanitized_key;
+            $client = new \GuzzleHttp\Client();
+            $client->request('POST', $request_url);
+        }
+    }
 }