Page MenuHomePhorge
Files F117932631

D5277.1775467544.diff
No OneTemporary
Actions

Authored By
Unknown
Size
8 KB
Referenced Files
None
Subscribers
None

D5277.1775467544.diff
View Options

diff --git a/src/resources/vue/Admin/User.vue b/src/resources/vue/Admin/User.vue
--- a/src/resources/vue/Admin/User.vue
+++ b/src/resources/vue/Admin/User.vue
@@ -585,7 +585,7 @@
},
reset2FA() {
this.$refs.reset2faDialog.hide()
- axios.post('/api/v4/users/' + this.user.id + '/reset2FA')
+ axios.post('/api/v4/users/' + this.user.id + '/reset-2fa')
.then(response => {
if (response.data.status == 'success') {
this.$toast.success(response.data.message)
@@ -596,7 +596,7 @@
})
},
resetGeoLock() {
- axios.post('/api/v4/users/' + this.user.id + '/resetGeoLock')
+ axios.post('/api/v4/users/' + this.user.id + '/reset-geolock')
.then(response => {
if (response.data.status == 'success') {
this.$toast.success(response.data.message)
diff --git a/src/routes/api.php b/src/routes/api.php
--- a/src/routes/api.php
+++ b/src/routes/api.php
@@ -262,8 +262,8 @@
Route::apiResource('users', API\V4\Admin\UsersController::class);
Route::get('users/{id}/discounts', [API\V4\Admin\DiscountsController::class, 'userDiscounts']);
Route::post('users/{id}/login-as', [API\V4\Admin\UsersController::class, 'loginAs']);
- Route::post('users/{id}/reset2FA', [API\V4\Admin\UsersController::class, 'reset2FA']);
- Route::post('users/{id}/resetGeoLock', [API\V4\Admin\UsersController::class, 'resetGeoLock']);
+ Route::post('users/{id}/reset-2fa', [API\V4\Admin\UsersController::class, 'reset2FA']);
+ Route::post('users/{id}/reset-geolock', [API\V4\Admin\UsersController::class, 'resetGeoLock']);
Route::post('users/{id}/resync', [API\V4\Admin\UsersController::class, 'resync']);
Route::get('users/{id}/skus', [API\V4\Admin\UsersController::class, 'skus']);
Route::post('users/{id}/skus/{sku}', [API\V4\Admin\UsersController::class, 'setSku']);
@@ -328,8 +328,8 @@
Route::apiResource('users', API\V4\Reseller\UsersController::class);
Route::get('users/{id}/discounts', [API\V4\Reseller\DiscountsController::class, 'userDiscounts']);
- Route::post('users/{id}/reset2FA', [API\V4\Reseller\UsersController::class, 'reset2FA']);
- Route::post('users/{id}/resetGeoLock', [API\V4\Reseller\UsersController::class, 'resetGeoLock']);
+ Route::post('users/{id}/reset-2fa', [API\V4\Reseller\UsersController::class, 'reset2FA']);
+ Route::post('users/{id}/reset-geolock', [API\V4\Reseller\UsersController::class, 'resetGeoLock']);
Route::post('users/{id}/resync', [API\V4\Reseller\UsersController::class, 'resync']);
Route::get('users/{id}/skus', [API\V4\Reseller\UsersController::class, 'skus']);
Route::post('users/{id}/skus/{sku}', [API\V4\Reseller\UsersController::class, 'setSku']);
diff --git a/src/tests/Feature/Controller/Admin/UsersTest.php b/src/tests/Feature/Controller/Admin/UsersTest.php
--- a/src/tests/Feature/Controller/Admin/UsersTest.php
+++ b/src/tests/Feature/Controller/Admin/UsersTest.php
@@ -359,7 +359,7 @@
}
/**
- * Test reseting 2FA (POST /api/v4/users/<user-id>/reset2FA)
+ * Test reseting 2FA (POST /api/v4/users/<user-id>/reset-2fa)
*/
public function testReset2FA(): void
{
@@ -373,7 +373,7 @@
SecondFactor::seed('userscontrollertest1@userscontroller.com');
// Test unauthorized access to admin API
- $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(403);
$entitlements = $user->fresh()->entitlements()->where('sku_id', $sku2fa->id)->get();
@@ -383,7 +383,7 @@
$this->assertCount(1, $sf->factors());
// Test reseting 2FA
- $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(200);
$json = $response->json();
@@ -400,7 +400,7 @@
}
/**
- * Test reseting Geo-Lock (POST /api/v4/users/<user-id>/resetGeoLock)
+ * Test reseting Geo-Lock (POST /api/v4/users/<user-id>/reset-geolock)
*/
public function testResetGeoLock(): void
{
@@ -411,11 +411,11 @@
$user->setConfig(['limit_geo' => ['US']]);
// Test unauthorized access to admin API
- $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(403);
// Test reseting Geo-Lock
- $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(200);
$json = $response->json();
diff --git a/src/tests/Feature/Controller/Reseller/UsersTest.php b/src/tests/Feature/Controller/Reseller/UsersTest.php
--- a/src/tests/Feature/Controller/Reseller/UsersTest.php
+++ b/src/tests/Feature/Controller/Reseller/UsersTest.php
@@ -271,7 +271,7 @@
}
/**
- * Test reseting 2FA (POST /api/v4/users/<user-id>/reset2FA)
+ * Test reseting 2FA (POST /api/v4/users/<user-id>/reset-2fa)
*/
public function testReset2FA(): void
{
@@ -287,17 +287,17 @@
SecondFactor::seed('userscontrollertest1@userscontroller.com');
// Test unauthorized access
- $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(403);
- $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(403);
- $response = $this->actingAs($reseller2)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($reseller2)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(404);
// Touching admins is forbidden
- $response = $this->actingAs($reseller1)->post("/api/v4/users/{$admin->id}/reset2FA", []);
+ $response = $this->actingAs($reseller1)->post("/api/v4/users/{$admin->id}/reset-2fa", []);
$response->assertStatus(403);
$entitlements = $user->fresh()->entitlements()->where('sku_id', $sku2fa->id)->get();
@@ -307,7 +307,7 @@
$this->assertCount(1, $sf->factors());
// Test reseting 2FA
- $response = $this->actingAs($reseller1)->post("/api/v4/users/{$user->id}/reset2FA", []);
+ $response = $this->actingAs($reseller1)->post("/api/v4/users/{$user->id}/reset-2fa", []);
$response->assertStatus(200);
$json = $response->json();
@@ -324,7 +324,7 @@
}
/**
- * Test reseting Geo-Lock (POST /api/v4/users/<user-id>/resetGeoLock)
+ * Test reseting Geo-Lock (POST /api/v4/users/<user-id>/reset-geolock)
*/
public function testResetGeoLock(): void
{
@@ -338,21 +338,21 @@
$user->setConfig(['limit_geo' => ['US']]);
// Test unauthorized access
- $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($user)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(403);
- $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($admin)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(403);
- $response = $this->actingAs($reseller2)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($reseller2)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(404);
// Touching admins is forbidden
- $response = $this->actingAs($reseller1)->post("/api/v4/users/{$admin->id}/resetGeoLock", []);
+ $response = $this->actingAs($reseller1)->post("/api/v4/users/{$admin->id}/reset-geolock", []);
$response->assertStatus(403);
// Test reseting Geo-Lock
- $response = $this->actingAs($reseller1)->post("/api/v4/users/{$user->id}/resetGeoLock", []);
+ $response = $this->actingAs($reseller1)->post("/api/v4/users/{$user->id}/reset-geolock", []);
$response->assertStatus(200);
$json = $response->json();

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 9:25 AM (12 h, 37 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18834538
Default Alt Text
D5277.1775467544.diff (8 KB)

Event Timeline