Merge branch 'pterodactyl-release/v1.11.8' into release/v1.11.8
This commit is contained in:
commit
88d6df5fb3
3 changed files with 8 additions and 6 deletions
|
@ -11,7 +11,7 @@ return [
|
||||||
| change this value if you are not maintaining your own internal versions.
|
| change this value if you are not maintaining your own internal versions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'version' => '1.11.7',
|
'version' => '1.11.8',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
@ -21,7 +21,7 @@ return [
|
||||||
| change this value if you are not maintaining your own internal versions.
|
| change this value if you are not maintaining your own internal versions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'fork-version' => '1.3.1',
|
'fork-version' => '1.3.2',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
import http from '@/api/http';
|
import http from '@/api/http';
|
||||||
|
|
||||||
export default (password: string): Promise<void> => {
|
function disableAccountTwoFactor(password: string): Promise<void> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
http.delete('/api/client/account/two-factor', { params: { password } })
|
http.post('/api/client/account/two-factor/disable', { password })
|
||||||
.then(() => resolve())
|
.then(() => resolve())
|
||||||
.catch(reject);
|
.catch(reject);
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
|
export default disableAccountTwoFactor;
|
||||||
|
|
|
@ -24,7 +24,7 @@ Route::prefix('/account')->middleware(AccountSubject::class)->group(function ()
|
||||||
Route::get('/', [Client\AccountController::class, 'index'])->name('api:client.account');
|
Route::get('/', [Client\AccountController::class, 'index'])->name('api:client.account');
|
||||||
Route::get('/two-factor', [Client\TwoFactorController::class, 'index']);
|
Route::get('/two-factor', [Client\TwoFactorController::class, 'index']);
|
||||||
Route::post('/two-factor', [Client\TwoFactorController::class, 'store']);
|
Route::post('/two-factor', [Client\TwoFactorController::class, 'store']);
|
||||||
Route::delete('/two-factor', [Client\TwoFactorController::class, 'delete']);
|
Route::post('/two-factor/disable', [Client\TwoFactorController::class, 'delete']);
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::put('/email', [Client\AccountController::class, 'updateEmail'])->name('api:client.account.update-email');
|
Route::put('/email', [Client\AccountController::class, 'updateEmail'])->name('api:client.account.update-email');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue