Merge pull request #136 from skull132/feature/unlinked-server-auth

Implement forum-user-auth for WI

Author: Arrow768

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;
@@ -87,27 +88,40 @@ public function endLogin(Request $request)
         }
 
         $client_token = $request->session()->pull('server_client_token');
+        $byond_key_is_linked = $request->user()->byond_key != null;
 
-        if ($request->user()->byond_key == null) {
-            Log::debug("server.login - Unable to Auth - User has no ckey linked");
-            return view('auth.server.nokey');
+        $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: " . $request->user()->byond_key);
+            Log::debug("server.login - Sending auth_client request to server for ckey and forum account: " . $request->user()->byond_key . ", " . $request->user()->name);
             $query->setUp(config('aurora.gameserver_address'), config('aurora.gameserver_port'), config('aurora.gameserver_auth'));
             $query->runQuery([
                 'query' => 'auth_client',
                 'clienttoken' => $client_token,
-                'key' => $request->user()->byond_key
+                'key' => $request->user()->byond_key,
+                'forumuser' => $request->user()->name,
+                'use-external-key' => $ckey_is_external
             ]);
         } catch (\Exception $e) {
             Log::debug("server.login - Error while sending auth_client request to server: " . $e->getMessage());
             abort(500, $e->getMessage());
         }
 
         if ($query->response->statuscode == '200') {
-            Log::debug("server.login - Ckey Succesfully logged in: " . $request->user()->byond_key);
+            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')
@@ -118,13 +106,17 @@ public function add(Request $request)
 
         $ckey = Helpers::sanitize_ckey($request->input("Byond_Username"));
 
-        #Check if a player with that ckey exists
-        $player_count = ServerPlayer::where('ckey', $ckey)->count();
+        $player = ServerPlayer::where('ckey', $ckey)->first();
 
-        if ($player_count != 1) {
+        #Check if a player with that ckey exists
+        if (is_null($player)) {
             return redirect()->route('user.link')->withErrors(array("Could not find player with the ckey" . $ckey . ". You need to join on the server before you can link your account."));
         }
 
+        if ($player->ckey_is_external) {
+            return redirect()->route('user.link')->withErrors(array("Your ckey " . $ckey . " is an external ckey. Linking forum accounts to these keys is currently not supported."));
+        }
+
         //Only add a new linking request if there is no existing one (where the deleted_at date is not set)
         if (DB::connection('server')->table('player_linking')->where('forum_id', '=', $request->user()->user_id)->where('deleted_at', '=', NULL)->count() == 0) {
 

app/Models/ServerPlayer.php

@@ -28,7 +28,7 @@ class ServerPlayer extends Model
     public $timestamps = FALSE;
     protected $connection = 'server';
     protected $table = 'player';
-    protected $fillable = ['ckey', 'ip', 'whitelist_status'];
+    protected $fillable = ['ckey', 'ip', 'whitelist_status', 'ckey_is_external'];
     protected $primaryKey = 'id';
     protected $dates = ['firstseen', 'lastseen'];
 

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);
+        }
+    }
 }