Merge pull request #17 from arefebsh/support-custom-indicator

mohammad-fouladgar · web-flow · commit 92688b3ce447 · 2025-02-01T18:49:00.000+03:30
add support custom indicator
diff --git a/README.md b/README.md
@@ -72,6 +72,18 @@ OTP()->useProvider('users')
 */
 OTP()->onlyConfirmToken()   
      ->validate('+98900000000', 'token_123');
+
+/*
+|--------------------------------------------------------------------------
+| You may wish to use a custom indicator
+|--------------------------------------------------------------------------
+*/
+OTP()->indicator('custom_indicator')   
+     ->send('+98900000000');
+     
+OTP()->indicator('custom_indicator')
+     ->onlyConfirmToken() 
+     ->validate('+98900000000', 'token_123');
 ```
 ## Installation
 
diff --git a/database/migrations/2025_01_28_000000_add_indicator_to_otp_tokens_table.php b/database/migrations/2025_01_28_000000_add_indicator_to_otp_tokens_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIndicatorToOTPTokensTable extends Migration
+{
+    private string $tokenTable;
+
+    private string $defaultIndicator;
+
+    public function __construct()
+    {
+        $this->tokenTable = config('otp.token_table', 'otp_tokens');
+        $this->defaultIndicator = config('otp.prefix', 'otp_tokens');
+    }
+
+    public function up(): void
+    {
+        if (Schema::hasTable($this->tokenTable)) {
+            Schema::table($this->tokenTable, function (Blueprint $table): void {
+                $table->string('indicator')->default($this->defaultIndicator);
+            });
+        }
+    }
+
+    public function down(): void
+    {
+        if (Schema::hasTable($this->tokenTable)) {
+            Schema::table($this->tokenTable, static function (Blueprint $table): void {
+                $table->dropColumn('indicator');
+            });
+        }
+    }
+}
diff --git a/src/Contracts/AbstractTokenRepository.php b/src/Contracts/AbstractTokenRepository.php
@@ -12,15 +12,15 @@ public function __construct(protected int $expires, protected int $tokenLength)
     {
     }
 
-    public function create(OTPNotifiable $user): string
+    public function create(OTPNotifiable $user, string $indicator): string
     {
         $mobile = $user->getMobileForOTPNotification();
 
-        $this->deleteExisting($user);
+        $this->deleteExisting($user, $indicator);
 
         $token = $this->createNewToken();
 
-        $this->save($mobile, $token);
+        $this->save($mobile, $indicator, $token);
 
         return $token;
     }
@@ -35,13 +35,13 @@ protected function tokenExpired(string $expiresAt): bool
         return Carbon::parse($expiresAt)->isPast();
     }
 
-    protected function getPayload(string $mobile, string $token): array
+    protected function getPayload(string $mobile, string $indicator, string $token): array
     {
-        return ['mobile' => $mobile, 'token' => $token, 'sent_at' => now()->toDateTimeString()];
+        return ['mobile' => $mobile, 'indicator' => $indicator, 'token' => $token, 'sent_at' => now()->toDateTimeString()];
     }
 
     /**
      * Insert into token storage.
      */
-    abstract protected function save(string $mobile, string $token): bool;
+    abstract protected function save(string $mobile, string $indicator, string $token): bool;
 }
diff --git a/src/Contracts/TokenRepositoryInterface.php b/src/Contracts/TokenRepositoryInterface.php
@@ -7,20 +7,20 @@ interface TokenRepositoryInterface
     /**
      * Create a new token record.
      */
-    public function create(OTPNotifiable $user): string;
+    public function create(OTPNotifiable $user, string $indicator): string;
 
     /**
      * Determine if a token record exists and is valid.
      */
-    public function exists(string $mobile): bool;
+    public function exists(string $mobile, string $indicator): bool;
 
     /**
      * Determine if the given token matches the provided one.
      */
-    public function isTokenMatching(OTPNotifiable $user, string $token): bool;
+    public function isTokenMatching(OTPNotifiable $user, string $indicator, string $token): bool;
 
     /**
      * Delete all existing tokens from the storage.
      */
-    public function deleteExisting(OTPNotifiable $user): bool;
+    public function deleteExisting(OTPNotifiable $user, string $indicator): bool;
 }
diff --git a/src/OTPBroker.php b/src/OTPBroker.php
@@ -16,6 +16,8 @@ class OTPBroker
 {
     private array $channel;
 
+    private string $indicator;
+
     private ?string $token = null;
 
     private bool $onlyConfirm = false;
@@ -27,6 +29,7 @@ public function __construct(
         private UserProviderResolver $providerResolver
     ) {
         $this->channel = $this->getDefaultChannel();
+        $this->indicator = $this->getDefaultIndicator();
         $this->userRepository = $this->resolveUserRepository();
     }
 
@@ -42,7 +45,7 @@ public function send(string $mobile, bool $userExists = false): OTPNotifiable
 
         $notifiable = $user ?? $this->makeNotifiable($mobile);
 
-        $this->token = $this->tokenRepository->create($notifiable);
+        $this->token = $this->tokenRepository->create($notifiable, $this->indicator);
 
         $notifiable->sendOTPNotification(
             $this->token,
@@ -77,6 +80,13 @@ public function onlyConfirmToken(bool $confirm = true): static
         return $this;
     }
 
+    public function indicator(string $indicator): static
+    {
+        $this->indicator = $indicator;
+
+        return $this;
+    }
+
     public function getToken(): ?string
     {
         return $this->token;
@@ -101,7 +111,7 @@ public function channel($channel = ['']): static
 
     public function revoke(OTPNotifiable $user): bool
     {
-        return $this->tokenRepository->deleteExisting($user);
+        return $this->tokenRepository->deleteExisting($user, $this->indicator);
     }
 
     /**
@@ -126,7 +136,7 @@ private function findOrCreateUser(string $mobile): OTPNotifiable
 
     private function findUserByMobile(string $mobile): ?OTPNotifiable
     {
-        return $this->userRepository->findByMobile($mobile);
+        return $this->userRepository->findByMobile($mobile, $this->indicator);
     }
 
     private function getDefaultChannel(): array
@@ -138,12 +148,12 @@ private function getDefaultChannel(): array
 
     public function verifyToken(OTPNotifiable $user, string $token): bool
     {
-        return $this->tokenRepository->isTokenMatching($user, $token);
+        return $this->tokenRepository->isTokenMatching($user, $this->indicator, $token);
     }
 
     private function tokenExists(string $mobile): bool
     {
-        return $this->tokenRepository->exists($mobile);
+        return $this->tokenRepository->exists($mobile, $this->indicator);
     }
 
     private function makeNotifiable(string $mobile): OTPNotifiable
@@ -152,4 +162,9 @@ private function makeNotifiable(string $mobile): OTPNotifiable
 
         return $this->userRepository->getModel()->make([$mobileColumn => $mobile]);
     }
+
+    private function getDefaultIndicator()
+    {
+        return config('otp.prefix');
+    }
 }
diff --git a/src/Token/CacheTokenRepository.php b/src/Token/CacheTokenRepository.php
@@ -7,47 +7,53 @@
 use Fouladgar\OTP\Contracts\AbstractTokenRepository;
 use Fouladgar\OTP\Contracts\OTPNotifiable;
 use Illuminate\Contracts\Cache\Repository as Cache;
+use Psr\SimpleCache\InvalidArgumentException;
 
 class CacheTokenRepository extends AbstractTokenRepository
 {
     public function __construct(
         protected Cache $cache,
         protected int $expires,
         protected int $tokenLength,
-        protected string $prefix
     ) {
         parent::__construct($expires, $tokenLength);
     }
 
-    public function deleteExisting(OTPNotifiable $user): bool
+    public function deleteExisting(OTPNotifiable $user, string $indicator): bool
     {
-        return $this->cache->forget($this->getSignatureKey($user->getMobileForOTPNotification()));
+        return $this->cache->forget($this->getSignatureKey($user->getMobileForOTPNotification(), $indicator));
     }
 
-    public function exists(string $mobile): bool
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function exists(string $mobile, string $indicator): bool
     {
-        return $this->cache->has($this->getSignatureKey($mobile));
+        return $this->cache->has($this->getSignatureKey($mobile, $indicator));
     }
 
-    public function isTokenMatching(OTPNotifiable $user, string $token): bool
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function isTokenMatching(OTPNotifiable $user, string $indicator, string $token): bool
     {
-        $exist = $this->exists($user->getMobileForOTPNotification());
-        $signature = $this->getSignatureKey($user->getMobileForOTPNotification());
+        $exist = $this->exists($user->getMobileForOTPNotification(), $indicator);
+        $signature = $this->getSignatureKey($user->getMobileForOTPNotification(), $indicator);
 
         return $exist && $this->cache->get($signature)['token'] === $token;
     }
 
-    protected function save(string $mobile, string $token): bool
+    protected function save(string $mobile, string $indicator, string $token): bool
     {
         return $this->cache->add(
-            $this->getSignatureKey($mobile),
-            $this->getPayload($mobile, $token),
+            $this->getSignatureKey($mobile, $indicator),
+            $this->getPayload($mobile, $indicator, $token),
             now()->addMinutes($this->expires)
         );
     }
 
-    protected function getSignatureKey($mobile): string
+    protected function getSignatureKey($mobile, string $indicator): string
     {
-        return $this->prefix.$mobile;
+        return sprintf('%s%s', $indicator, $mobile);
     }
 }
diff --git a/src/Token/DatabaseTokenRepository.php b/src/Token/DatabaseTokenRepository.php
@@ -13,16 +13,19 @@ class DatabaseTokenRepository extends AbstractTokenRepository
 {
     public function __construct(
         protected ConnectionInterface $connection,
-        protected int $expires,
-        protected int $tokenLength,
-        protected string $table
+        protected int                 $expires,
+        protected int                 $tokenLength,
+        protected string              $table
     ) {
         parent::__construct($expires, $tokenLength);
     }
 
-    public function deleteExisting(OTPNotifiable $user): bool
+    public function deleteExisting(OTPNotifiable $user, string $indicator): bool
     {
-        return (bool) optional($this->getTable()->where('mobile', $user->getMobileForOTPNotification()))->delete();
+        return (bool)optional($this->getTable()->where([
+            'mobile' => $user->getMobileForOTPNotification(),
+            'indicator' => $indicator,
+        ]))->delete();
     }
 
     protected function getLatestRecord(array $filters): ?array
@@ -32,21 +35,22 @@ protected function getLatestRecord(array $filters): ?array
             ->latest()
             ->first();
 
-        return $record ? (array) $record : null;
+        return $record ? (array)$record : null;
     }
 
-    public function exists(string $mobile): bool
+    public function exists(string $mobile, string $indicator): bool
     {
-        $record = $this->getLatestRecord(['mobile' => $mobile]);
+        $record = $this->getLatestRecord(['mobile' => $mobile, 'indicator' => $indicator]);
 
         return $record && ! $this->tokenExpired($record['expires_at']);
     }
 
-    public function isTokenMatching(OTPNotifiable $user, string $token): bool
+    public function isTokenMatching(OTPNotifiable $user, string $indicator, string $token): bool
     {
         $record = $this->getLatestRecord([
             'mobile' => $user->getMobileForOTPNotification(),
             'token' => $token,
+            'indicator' => $indicator,
         ]);
 
         return $record && ! $this->tokenExpired($record['expires_at']);
@@ -57,13 +61,14 @@ protected function getTable(): Builder
         return $this->connection->table($this->table);
     }
 
-    protected function save(string $mobile, string $token): bool
+    protected function save(string $mobile, string $indicator, string $token): bool
     {
-        return $this->getTable()->insert($this->getPayload($mobile, $token));
+        return $this->getTable()->insert($this->getPayload($mobile, $indicator, $token));
     }
 
-    protected function getPayload(string $mobile, string $token): array
+    protected function getPayload(string $mobile, string $indicator, string $token): array
     {
-        return parent::getPayload($mobile, $token) + ['expires_at' => now()->addMinutes($this->expires)];
+        return parent::getPayload($mobile, $indicator, $token) +
+            ['expires_at' => now()->addMinutes($this->expires), 'indicator' => $indicator];
     }
 }
diff --git a/src/Token/TokenRepositoryManager.php b/src/Token/TokenRepositoryManager.php
@@ -20,7 +20,6 @@ protected function createCacheDriver(): TokenRepositoryInterface
             $this->container->make(CacheRepository::class),
             $this->config->get('otp.token_lifetime', 5),
             $this->config->get('otp.token_length', 5),
-            $this->config->get('otp.prefix'),
         );
     }
 
diff --git a/tests/CacheTokenRepositoryTest.php b/tests/CacheTokenRepositoryTest.php
diff --git a/tests/DatabaseTokenRepositoryTest.php b/tests/DatabaseTokenRepositoryTest.php
diff --git a/tests/OTPBrokerTest.php b/tests/OTPBrokerTest.php
diff --git a/tests/database/migrations/2021_10_02_000001_create_otp_tokens_test_table.php b/tests/database/migrations/2021_10_02_000001_create_otp_tokens_test_table.php

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,15 @@ public function __construct(protected int $expires, protected int $tokenLength)`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- public function create(OTPNotifiable $user): string`
	`15`	`+ public function create(OTPNotifiable $user, string $indicator): string`
`16`	`16`	`{`
`17`	`17`	`$mobile = $user->getMobileForOTPNotification();`
`18`	`18`
`19`		`- $this->deleteExisting($user);`
	`19`	`+ $this->deleteExisting($user, $indicator);`
`20`	`20`
`21`	`21`	`$token = $this->createNewToken();`
`22`	`22`
`23`		`- $this->save($mobile, $token);`
	`23`	`+ $this->save($mobile, $indicator, $token);`
`24`	`24`
`25`	`25`	`return $token;`
`26`	`26`	`}`
`@@ -35,13 +35,13 @@ protected function tokenExpired(string $expiresAt): bool`
`35`	`35`	`return Carbon::parse($expiresAt)->isPast();`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected function getPayload(string $mobile, string $token): array`
	`38`	`+ protected function getPayload(string $mobile, string $indicator, string $token): array`
`39`	`39`	`{`
`40`		`- return ['mobile' => $mobile, 'token' => $token, 'sent_at' => now()->toDateTimeString()];`
	`40`	`+ return ['mobile' => $mobile, 'indicator' => $indicator, 'token' => $token, 'sent_at' => now()->toDateTimeString()];`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* Insert into token storage.`
`45`	`45`	`*/`
`46`		`- abstract protected function save(string $mobile, string $token): bool;`
	`46`	`+ abstract protected function save(string $mobile, string $indicator, string $token): bool;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class OTPBroker`
`16`	`16`	`{`
`17`	`17`	`private array $channel;`
`18`	`18`
	`19`	`+ private string $indicator;`
	`20`	`+`
`19`	`21`	`private ?string $token = null;`
`20`	`22`
`21`	`23`	`private bool $onlyConfirm = false;`
`@@ -27,6 +29,7 @@ public function __construct(`
`27`	`29`	`private UserProviderResolver $providerResolver`
`28`	`30`	`) {`
`29`	`31`	`$this->channel = $this->getDefaultChannel();`
	`32`	`+ $this->indicator = $this->getDefaultIndicator();`
`30`	`33`	`$this->userRepository = $this->resolveUserRepository();`
`31`	`34`	`}`
`32`	`35`
`@@ -42,7 +45,7 @@ public function send(string $mobile, bool $userExists = false): OTPNotifiable`
`42`	`45`
`43`	`46`	`$notifiable = $user ?? $this->makeNotifiable($mobile);`
`44`	`47`
`45`		`- $this->token = $this->tokenRepository->create($notifiable);`
	`48`	`+ $this->token = $this->tokenRepository->create($notifiable, $this->indicator);`
`46`	`49`
`47`	`50`	`$notifiable->sendOTPNotification(`
`48`	`51`	`$this->token,`
`@@ -77,6 +80,13 @@ public function onlyConfirmToken(bool $confirm = true): static`
`77`	`80`	`return $this;`
`78`	`81`	`}`
`79`	`82`
	`83`	`+ public function indicator(string $indicator): static`
	`84`	`+ {`
	`85`	`+ $this->indicator = $indicator;`
	`86`	`+`
	`87`	`+ return $this;`
	`88`	`+ }`
	`89`	`+`
`80`	`90`	`public function getToken(): ?string`
`81`	`91`	`{`
`82`	`92`	`return $this->token;`
`@@ -101,7 +111,7 @@ public function channel($channel = ['']): static`
`101`	`111`
`102`	`112`	`public function revoke(OTPNotifiable $user): bool`
`103`	`113`	`{`
`104`		`- return $this->tokenRepository->deleteExisting($user);`
	`114`	`+ return $this->tokenRepository->deleteExisting($user, $this->indicator);`
`105`	`115`	`}`
`106`	`116`
`107`	`117`	`/**`
`@@ -126,7 +136,7 @@ private function findOrCreateUser(string $mobile): OTPNotifiable`
`126`	`136`
`127`	`137`	`private function findUserByMobile(string $mobile): ?OTPNotifiable`
`128`	`138`	`{`
`129`		`- return $this->userRepository->findByMobile($mobile);`
	`139`	`+ return $this->userRepository->findByMobile($mobile, $this->indicator);`
`130`	`140`	`}`
`131`	`141`
`132`	`142`	`private function getDefaultChannel(): array`
`@@ -138,12 +148,12 @@ private function getDefaultChannel(): array`
`138`	`148`
`139`	`149`	`public function verifyToken(OTPNotifiable $user, string $token): bool`
`140`	`150`	`{`
`141`		`- return $this->tokenRepository->isTokenMatching($user, $token);`
	`151`	`+ return $this->tokenRepository->isTokenMatching($user, $this->indicator, $token);`
`142`	`152`	`}`
`143`	`153`
`144`	`154`	`private function tokenExists(string $mobile): bool`
`145`	`155`	`{`
`146`		`- return $this->tokenRepository->exists($mobile);`
	`156`	`+ return $this->tokenRepository->exists($mobile, $this->indicator);`
`147`	`157`	`}`
`148`	`158`
`149`	`159`	`private function makeNotifiable(string $mobile): OTPNotifiable`
`@@ -152,4 +162,9 @@ private function makeNotifiable(string $mobile): OTPNotifiable`
`152`	`162`
`153`	`163`	`return $this->userRepository->getModel()->make([$mobileColumn => $mobile]);`
`154`	`164`	`}`
	`165`	`+`
	`166`	`+ private function getDefaultIndicator()`
	`167`	`+ {`
	`168`	`+ return config('otp.prefix');`
	`169`	`+ }`
`155`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,47 +7,53 @@`
`7`	`7`	`use Fouladgar\OTP\Contracts\AbstractTokenRepository;`
`8`	`8`	`use Fouladgar\OTP\Contracts\OTPNotifiable;`
`9`	`9`	`use Illuminate\Contracts\Cache\Repository as Cache;`
	`10`	`+use Psr\SimpleCache\InvalidArgumentException;`
`10`	`11`
`11`	`12`	`class CacheTokenRepository extends AbstractTokenRepository`
`12`	`13`	`{`
`13`	`14`	`public function __construct(`
`14`	`15`	`protected Cache $cache,`
`15`	`16`	`protected int $expires,`
`16`	`17`	`protected int $tokenLength,`
`17`		`- protected string $prefix`
`18`	`18`	`) {`
`19`	`19`	`parent::__construct($expires, $tokenLength);`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function deleteExisting(OTPNotifiable $user): bool`
	`22`	`+ public function deleteExisting(OTPNotifiable $user, string $indicator): bool`
`23`	`23`	`{`
`24`		`- return $this->cache->forget($this->getSignatureKey($user->getMobileForOTPNotification()));`
	`24`	`+ return $this->cache->forget($this->getSignatureKey($user->getMobileForOTPNotification(), $indicator));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function exists(string $mobile): bool`
	`27`	`+ /**`
	`28`	`+ * @throws InvalidArgumentException`
	`29`	`+ */`
	`30`	`+ public function exists(string $mobile, string $indicator): bool`
`28`	`31`	`{`
`29`		`- return $this->cache->has($this->getSignatureKey($mobile));`
	`32`	`+ return $this->cache->has($this->getSignatureKey($mobile, $indicator));`
`30`	`33`	`}`
`31`	`34`
`32`		`- public function isTokenMatching(OTPNotifiable $user, string $token): bool`
	`35`	`+ /**`
	`36`	`+ * @throws InvalidArgumentException`
	`37`	`+ */`
	`38`	`+ public function isTokenMatching(OTPNotifiable $user, string $indicator, string $token): bool`
`33`	`39`	`{`
`34`		`- $exist = $this->exists($user->getMobileForOTPNotification());`
`35`		`- $signature = $this->getSignatureKey($user->getMobileForOTPNotification());`
	`40`	`+ $exist = $this->exists($user->getMobileForOTPNotification(), $indicator);`
	`41`	`+ $signature = $this->getSignatureKey($user->getMobileForOTPNotification(), $indicator);`
`36`	`42`
`37`	`43`	`return $exist && $this->cache->get($signature)['token'] === $token;`
`38`	`44`	`}`
`39`	`45`
`40`		`- protected function save(string $mobile, string $token): bool`
	`46`	`+ protected function save(string $mobile, string $indicator, string $token): bool`
`41`	`47`	`{`
`42`	`48`	`return $this->cache->add(`
`43`		`- $this->getSignatureKey($mobile),`
`44`		`- $this->getPayload($mobile, $token),`
	`49`	`+ $this->getSignatureKey($mobile, $indicator),`
	`50`	`+ $this->getPayload($mobile, $indicator, $token),`
`45`	`51`	`now()->addMinutes($this->expires)`
`46`	`52`	`);`
`47`	`53`	`}`
`48`	`54`
`49`		`- protected function getSignatureKey($mobile): string`
	`55`	`+ protected function getSignatureKey($mobile, string $indicator): string`
`50`	`56`	`{`
`51`		`- return $this->prefix.$mobile;`
	`57`	`+ return sprintf('%s%s', $indicator, $mobile);`
`52`	`58`	`}`
`53`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,19 @@ class DatabaseTokenRepository extends AbstractTokenRepository`
`13`	`13`	`{`
`14`	`14`	`public function __construct(`
`15`	`15`	`protected ConnectionInterface $connection,`
`16`		`- protected int $expires,`
`17`		`- protected int $tokenLength,`
`18`		`- protected string $table`
	`16`	`+ protected int $expires,`
	`17`	`+ protected int $tokenLength,`
	`18`	`+ protected string $table`
`19`	`19`	`) {`
`20`	`20`	`parent::__construct($expires, $tokenLength);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function deleteExisting(OTPNotifiable $user): bool`
	`23`	`+ public function deleteExisting(OTPNotifiable $user, string $indicator): bool`
`24`	`24`	`{`
`25`		`- return (bool) optional($this->getTable()->where('mobile', $user->getMobileForOTPNotification()))->delete();`
	`25`	`+ return (bool)optional($this->getTable()->where([`
	`26`	`+ 'mobile' => $user->getMobileForOTPNotification(),`
	`27`	`+ 'indicator' => $indicator,`
	`28`	`+ ]))->delete();`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`protected function getLatestRecord(array $filters): ?array`
`@@ -32,21 +35,22 @@ protected function getLatestRecord(array $filters): ?array`
`32`	`35`	`->latest()`
`33`	`36`	`->first();`
`34`	`37`
`35`		`- return $record ? (array) $record : null;`
	`38`	`+ return $record ? (array)$record : null;`
`36`	`39`	`}`
`37`	`40`
`38`		`- public function exists(string $mobile): bool`
	`41`	`+ public function exists(string $mobile, string $indicator): bool`
`39`	`42`	`{`
`40`		`- $record = $this->getLatestRecord(['mobile' => $mobile]);`
	`43`	`+ $record = $this->getLatestRecord(['mobile' => $mobile, 'indicator' => $indicator]);`
`41`	`44`
`42`	`45`	`return $record && ! $this->tokenExpired($record['expires_at']);`
`43`	`46`	`}`
`44`	`47`
`45`		`- public function isTokenMatching(OTPNotifiable $user, string $token): bool`
	`48`	`+ public function isTokenMatching(OTPNotifiable $user, string $indicator, string $token): bool`
`46`	`49`	`{`
`47`	`50`	`$record = $this->getLatestRecord([`
`48`	`51`	`'mobile' => $user->getMobileForOTPNotification(),`
`49`	`52`	`'token' => $token,`
	`53`	`+ 'indicator' => $indicator,`
`50`	`54`	`]);`
`51`	`55`
`52`	`56`	`return $record && ! $this->tokenExpired($record['expires_at']);`
`@@ -57,13 +61,14 @@ protected function getTable(): Builder`
`57`	`61`	`return $this->connection->table($this->table);`
`58`	`62`	`}`
`59`	`63`
`60`		`- protected function save(string $mobile, string $token): bool`
	`64`	`+ protected function save(string $mobile, string $indicator, string $token): bool`
`61`	`65`	`{`
`62`		`- return $this->getTable()->insert($this->getPayload($mobile, $token));`
	`66`	`+ return $this->getTable()->insert($this->getPayload($mobile, $indicator, $token));`
`63`	`67`	`}`
`64`	`68`
`65`		`- protected function getPayload(string $mobile, string $token): array`
	`69`	`+ protected function getPayload(string $mobile, string $indicator, string $token): array`
`66`	`70`	`{`
`67`		`- return parent::getPayload($mobile, $token) + ['expires_at' => now()->addMinutes($this->expires)];`
	`71`	`+ return parent::getPayload($mobile, $indicator, $token) +`
	`72`	`+ ['expires_at' => now()->addMinutes($this->expires), 'indicator' => $indicator];`
`68`	`73`	`}`
`69`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ protected function createCacheDriver(): TokenRepositoryInterface`
`20`	`20`	`$this->container->make(CacheRepository::class),`
`21`	`21`	`$this->config->get('otp.token_lifetime', 5),`
`22`	`22`	`$this->config->get('otp.token_length', 5),`
`23`		`- $this->config->get('otp.prefix'),`
`24`	`23`	`);`
`25`	`24`	`}`
`26`	`25`