MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[UI] Display the 2FA token, show spinner on load (#3367)

Browse Source 
Co-authored-by: Dane Everitt <dane@daneeveritt.com>
This commit is contained in:
Mia
2021-08-03 05:39:12 +02:00
committed by GitHub
parent 924f00ac9a
commit bda1ff50ab
5 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/Client/TwoFactorController.php
View File

@@ -61,9 +61,7 @@ class TwoFactorController extends ClientApiController
}
return new JsonResponse([
'data' => [
'image_url_data' => $this->setupService->handle($request->user()),
],
'data' => $this->setupService->handle($request->user()),
]);
}

17
app/Services/Users/TwoFactorSetupService.php
View File

@@ -49,7 +49,7 @@ class TwoFactorSetupService
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function handle(User $user): string
public function handle(User $user): array
{
$secret = '';
try {
@@ -66,11 +66,14 @@ class TwoFactorSetupService
$company = urlencode(preg_replace('/\s/', '', $this->config->get('app.name')));
return sprintf(
'otpauth://totp/%1$s:%2$s?secret=%3$s&issuer=%1$s',
rawurlencode($company),
rawurlencode($user->email),
rawurlencode($secret)
);
return [
'image_url_data' => sprintf(
'otpauth://totp/%1$s:%2$s?secret=%3$s&issuer=%1$s',
rawurlencode($company),
rawurlencode($user->email),
rawurlencode($secret),
),
'secret' => $secret,
];
}
}