Enter your email account to recover it.
+
+ Enter your email account to recover it.
+ @if (config('app.recovery_code_expiration_minutes') > 0)
+
The code will be available {{ config('app.recovery_code_expiration_minutes') }} minutes.
+ @endif
+
Enter your phone number to recover your account.
+
+ Enter your phone number to recover your account.
+ @if (config('app.recovery_code_expiration_minutes') > 0)
+
The code will be available {{ config('app.recovery_code_expiration_minutes') }} minutes.
+ @endif
+
@yield('message')
-
+
Go back to the homepage
diff --git a/flexiapi/resources/views/mails/authentication.blade.php b/flexiapi/resources/views/mails/authentication.blade.php
index d55ed25..cc7e60b 100644
--- a/flexiapi/resources/views/mails/authentication.blade.php
+++ b/flexiapi/resources/views/mails/authentication.blade.php
@@ -11,6 +11,11 @@
+ The code is only available {{ $expiration_minutes }} minutes. +
+ @endif
You can as well configure your new device using the following code or by directly flashing the QRCode:
diff --git a/flexiapi/resources/views/mails/authentication_text.blade.php b/flexiapi/resources/views/mails/authentication_text.blade.php
index 6589fca..196a95b 100644
--- a/flexiapi/resources/views/mails/authentication_text.blade.php
+++ b/flexiapi/resources/views/mails/authentication_text.blade.php
@@ -5,6 +5,10 @@ Please enter the code bellow to finish the authentication process.
{{ $recovery_code }}
+@if ($expiration_minutes > 0)
+The code is only available {{ $expiration_minutes }} minutes.
+@endif
+
You can as well configure your new device using the following code or by directly flashing the QRCode in the following link:
{{ $provisioning_qrcode}}
diff --git a/flexiapi/tests/Feature/AccountProvisioningTest.php b/flexiapi/tests/Feature/AccountProvisioningTest.php
index 42fa7bd..e143bc3 100644
--- a/flexiapi/tests/Feature/AccountProvisioningTest.php
+++ b/flexiapi/tests/Feature/AccountProvisioningTest.php
@@ -22,6 +22,8 @@ namespace Tests\Feature;
use App\Account;
use App\AuthToken;
use App\Password;
+use App\ProvisioningToken;
+use Illuminate\Support\Facades\DB;
use Tests\TestCase;
class AccountProvisioningTest extends TestCase
@@ -134,9 +136,6 @@ class AccountProvisioningTest extends TestCase
// Regenerate a new provisioning token from the authenticated account
$this->keyAuthenticated($password->account)
- ->withHeaders([
- 'x-linphone-provisioning' => true,
- ])
->get('/api/accounts/me/provision')
->assertStatus(200)
->assertSee('provisioning_token')
@@ -230,9 +229,6 @@ class AccountProvisioningTest extends TestCase
$admin->generateApiKey();
$this->keyAuthenticated($admin)
- ->withHeaders([
- 'x-linphone-provisioning' => true,
- ])
->json($this->method, '/api/accounts/' . $password->account->id . '/provision')
->assertStatus(200)
->assertSee('provisioning_token')
@@ -255,10 +251,7 @@ class AccountProvisioningTest extends TestCase
public function testAuthTokenProvisioning()
{
// Generate a public auth_token and attach it
- $response = $this->withHeaders([
- 'x-linphone-provisioning' => true,
- ])
- ->json('POST', '/api/accounts/auth_token')
+ $response = $this->json('POST', '/api/accounts/auth_token')
->assertStatus(201)
->assertJson([
'token' => true
@@ -270,9 +263,6 @@ class AccountProvisioningTest extends TestCase
$password->account->generateApiKey();
$this->keyAuthenticated($password->account)
- ->withHeaders([
- 'x-linphone-provisioning' => true,
- ])
->json($this->method, '/api/accounts/auth_token/' . $authToken . '/attach')
->assertStatus(200);
@@ -296,4 +286,38 @@ class AccountProvisioningTest extends TestCase
->get($this->route . '/auth_token/' . $authToken)
->assertStatus(404);
}
+
+ public function testTokenExpiration()
+ {
+ $account = Account::factory()->create();
+ $account->generateApiKey();
+ $expirationMinutes = 10;
+
+ $this->keyAuthenticated($account)
+ ->get('/api/accounts/me/provision')
+ ->assertStatus(200)
+ ->assertJson([
+ 'provisioning_token_expire_at' => null
+ ]);
+
+ config()->set('app.provisioning_token_expiration_minutes', $expirationMinutes);
+
+ $this->keyAuthenticated($account)
+ ->get('/api/accounts/me/provision')
+ ->assertStatus(200)
+ ->assertJson([
+ 'provisioning_token_expire_at' => $account->currentProvisioningToken->created_at->addMinutes($expirationMinutes)->toJSON()
+ ]);
+
+ $account->refresh();
+
+ ProvisioningToken::where('id', $account->currentProvisioningToken->id)
+ ->update(['created_at' => $account->currentProvisioningToken->created_at->subMinutes(1000)]);
+
+ $this->withHeaders([
+ 'x-linphone-provisioning' => true,
+ ])
+ ->get($this->route . '/' . $account->provisioning_token)
+ ->assertStatus(410);
+ }
}
diff --git a/flexiapi/tests/Feature/ApiAccountCreationTokenTest.php b/flexiapi/tests/Feature/ApiAccountCreationTokenTest.php
index 0d50360..aea80ff 100644
--- a/flexiapi/tests/Feature/ApiAccountCreationTokenTest.php
+++ b/flexiapi/tests/Feature/ApiAccountCreationTokenTest.php
@@ -91,11 +91,19 @@ class ApiAccountCreationTokenTest extends TestCase
$response = $this->keyAuthenticated($admin)
->json($this->method, $this->adminRoute)
- ->assertStatus(201);
+ ->assertStatus(201)
+ ->assertJson(['expire_at' => null]);
$this->assertDatabaseHas('account_creation_tokens', [
'token' => $response->json()['token']
]);
+
+ config()->set('app.account_creation_token_expiration_minutes', 10);
+
+ $response = $this->keyAuthenticated($admin)
+ ->json($this->method, $this->adminRoute)
+ ->assertStatus(201)
+ ->assertJson(['expire_at' => AccountCreationToken::latest()->first()->expire_at]);
}
public function testInvalidToken()
@@ -103,31 +111,28 @@ class ApiAccountCreationTokenTest extends TestCase
$token = AccountCreationToken::factory()->create();
// Invalid token
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'username',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => '0123456789abc'
- ]);
- $response->assertStatus(422);
+ ])->assertStatus(422);
// Valid token
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'username',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => $token->token
- ]);
- $response->assertStatus(200);
+ ])->assertStatus(200);
// Expired token
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'username2',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => $token->token
- ]);
- $response->assertStatus(422);
+ ])->assertStatus(422);
$this->assertDatabaseHas('account_creation_tokens', [
'used' => true,
@@ -135,6 +140,21 @@ class ApiAccountCreationTokenTest extends TestCase
]);
}
+ public function testTokenExpiration()
+ {
+ $token = AccountCreationToken::factory()->expired()->create();
+
+ config()->set('app.account_creation_token_expiration_minutes', 10);
+
+ $this->json($this->method, $this->accountRoute, [
+ 'username' => 'username',
+ 'algorithm' => 'SHA-256',
+ 'password' => '123',
+ 'account_creation_token' => $token->token
+ ])->assertStatus(422)
+ ->assertJsonValidationErrors(['account_creation_token']);
+ }
+
public function testBlacklistedUsername()
{
$token = AccountCreationToken::factory()->create();
@@ -142,33 +162,28 @@ class ApiAccountCreationTokenTest extends TestCase
config()->set('app.blacklisted_usernames', 'foobar,blacklisted,username-.*');
// Blacklisted username
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'blacklisted',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => $token->token
- ]);
- $response->assertJsonValidationErrors(['username']);
+ ])->assertJsonValidationErrors(['username']);
// Blacklisted regex username
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'username-gnap',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => $token->token
- ]);
-
- $response->assertJsonValidationErrors(['username']);
+ ])->assertJsonValidationErrors(['username']);
// Valid username
- $response = $this->json($this->method, $this->accountRoute, [
+ $this->json($this->method, $this->accountRoute, [
'username' => 'valid-username',
'algorithm' => 'SHA-256',
'password' => '123',
'account_creation_token' => $token->token
- ]);
-
- $response->assertStatus(200);
+ ])->assertStatus(200);
}
public function testAccountCreationRequestToken()
diff --git a/flexiapi/tests/Feature/ApiAccountEmailChangeTest.php b/flexiapi/tests/Feature/ApiAccountEmailChangeTest.php
index dde1834..d7459ef 100644
--- a/flexiapi/tests/Feature/ApiAccountEmailChangeTest.php
+++ b/flexiapi/tests/Feature/ApiAccountEmailChangeTest.php
@@ -74,6 +74,29 @@ class ApiAccountEmailChangeTest extends TestCase
])->assertJsonValidationErrors(['email']);
}
+ public function testCodeExpiration()
+ {
+ $account = Account::factory()->withConsumedAccountCreationToken()->create();
+ $account->generateApiKey();
+
+ $this->keyAuthenticated($account)
+ ->json($this->method, $this->route.'/request', [
+ 'email' => 'new@email.com'
+ ])
+ ->assertStatus(200);
+
+ config()->set('app.email_change_code_expiration_minutes', 10);
+
+ EmailChangeCode::where('id', $account->emailChangeCode->id)
+ ->update(['created_at' => $account->emailChangeCode->created_at->subMinutes(1000)]);
+
+ $this->keyAuthenticated($account)
+ ->json($this->method, $this->route, [
+ 'code' => $account->emailChangeCode->code
+ ])
+ ->assertStatus(410);
+ }
+
public function testUnvalidatedAccount()
{
$account = Account::factory()->create();
diff --git a/flexiapi/tests/Feature/ApiAccountPhoneChangeTest.php b/flexiapi/tests/Feature/ApiAccountPhoneChangeTest.php
index 8a95bf7..1988f3f 100644
--- a/flexiapi/tests/Feature/ApiAccountPhoneChangeTest.php
+++ b/flexiapi/tests/Feature/ApiAccountPhoneChangeTest.php
@@ -48,6 +48,29 @@ class ApiAccountPhoneChangeTest extends TestCase
->assertStatus(200);*/
}
+ public function testCodeExpiration()
+ {
+ $account = Account::factory()->withConsumedAccountCreationToken()->create();
+ $account->generateApiKey();
+
+ $this->keyAuthenticated($account)
+ ->json($this->method, $this->route.'/request', [
+ 'phone' => '+123123'
+ ])
+ ->assertStatus(200);
+
+ config()->set('app.phone_change_code_expiration_minutes', 10);
+
+ PhoneChangeCode::where('id', $account->phoneChangeCode->id)
+ ->update(['created_at' => $account->phoneChangeCode->created_at->subMinutes(1000)]);
+
+ $this->keyAuthenticated($account)
+ ->json($this->method, $this->route, [
+ 'code' => $account->phoneChangeCode->code
+ ])
+ ->assertStatus(410);
+ }
+
public function testUnvalidatedAccount()
{
$account = Account::factory()->create();