Skip to content

Commit fa58e81

Browse files
committed
Implement forum-user-auth for WI
1 parent 131b121 commit fa58e81

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

app/Http/Controllers/Auth/ServerController.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,26 @@ public function endLogin(Request $request)
8787
}
8888

8989
$client_token = $request->session()->pull('server_client_token');
90+
$byond_key_is_linked = $request->user()->byond_key != null;
9091

91-
if ($request->user()->byond_key == null) {
92-
Log::debug("server.login - Unable to Auth - User has no ckey linked");
93-
return view('auth.server.nokey');
94-
}
9592
$query = new ServerQuery;
9693
try {
97-
Log::debug("server.login - Sending auth_client request to server for ckey: " . $request->user()->byond_key);
94+
Log::debug("server.login - Sending auth_client request to server for ckey and forum account: " . $request->user()->byond_key . ", " . $request->user()->name);
9895
$query->setUp(config('aurora.gameserver_address'), config('aurora.gameserver_port'), config('aurora.gameserver_auth'));
9996
$query->runQuery([
10097
'query' => 'auth_client',
10198
'clienttoken' => $client_token,
102-
'key' => $request->user()->byond_key
99+
'key' => $request->user()->byond_key,
100+
'forumuser' => $request->user()->name,
101+
'use-external-key' => $byond_key_is_linked
103102
]);
104103
} catch (\Exception $e) {
105104
Log::debug("server.login - Error while sending auth_client request to server: " . $e->getMessage());
106105
abort(500, $e->getMessage());
107106
}
108107

109108
if ($query->response->statuscode == '200') {
110-
Log::debug("server.login - Ckey Succesfully logged in: " . $request->user()->byond_key);
109+
Log::debug("server.login - Ckey or external user succesfully logged in: " . $request->user()->byond_key . ", " . $request->user()->name);
111110
return view('auth.server.success');
112111
} else {
113112
Log::debug("server.login - Invalid status-code while sending auth_client request to server: " . $query->response->statuscode);

0 commit comments

Comments
 (0)