Global token + update code

garbuzivan · Oct 23, 2021 · b73123f · b73123f
1 parent 0bfc820
commit b73123f
Show file tree

Hide file tree

Showing 18 changed files with 291 additions and 41 deletions.
diff --git a/database/migrations/2021_10_20_065457_create_garbuz_ivan_laravel_token_table.php b/database/migrations/2021_10_20_065457_create_garbuz_ivan_laravel_token_table.php
@@ -42,6 +42,7 @@ public function up()
             $table->string('token')->unique();
             $table->string('title')->nullable();
             $table->datetime('expiration')->nullable();
+            $table->datetime('last_use')->nullable();
             $table->index('token');
             $table->timestamps();
         });

diff --git a/src/Commands/CreateGlobalTokenCommand.php b/src/Commands/CreateGlobalTokenCommand.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Garbuzivan\Laraveltokens\Commands;
+
+use Carbon\Carbon;
+use Garbuzivan\Laraveltokens\Exceptions\UserNotExistsException;
+use Garbuzivan\Laraveltokens\TokenManager;
+use Illuminate\Console\Command;
+use Illuminate\Support\Composer;
+
+class CreateGlobalTokenCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'tokens:global-create {title} {day}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Создать новый токен (tokens:create {title} {количество дней действия или 0 - бессрочно})';
+
+    /**
+     * The console command signature.
+     *
+     * @var string
+     */
+    protected $signature = 'tokens:global-create {title} {day}';
+
+    /**
+     * @var Composer
+     */
+    public Composer $composer;
+
+    /**
+     * @var TokenManager
+     */
+    public TokenManager $TokenManager;
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct(TokenManager $TokenManager)
+    {
+        parent::__construct();
+        $this->TokenManager = $TokenManager;
+    }
+
+    /**
+     * Execute the command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $arguments = $this->arguments();
+        $title = $arguments['title'] ?? date('Y-m-d H:i:s');
+        $day = intval($arguments['day']);
+        $expiration = $day > 0 ? Carbon::now()->addDays($day) : null;
+        $token = $this->TokenManager->createGlobalToken($title, $expiration);
+        $date = is_null($expiration) ? 'навсегда' : 'до ' . $expiration->format('Y-m-d H:i:s');
+        $this->line('Глобальный токен ' . $token->token . ' создан '. $date . '.');
+        return 1;
+    }
+}
diff --git a/src/Commands/CreateTokenCommand.php b/src/Commands/CreateTokenCommand.php
@@ -72,7 +72,8 @@ public function handle()
             $this->line('Пользователь ID ' . $user_id . ' не найден.');
             return 1;
         }
-        $this->line('Персональный токен ' . $token->token . ' создан до ' . $token->expiration . '.');
+        $date = is_null($expiration) ? 'навсегда' : 'до ' . $expiration->format('Y-m-d H:i:s');
+        $this->line('Персональный токен ' . $token->token . ' создан '. $date . '.');
         return 1;
     }
 }
diff --git a/src/Exceptions/TokenIsNotNalidException.php → src/Exceptions/TokenIsNotValidException.php b/src/Exceptions/TokenIsNotNalidException.php → src/Exceptions/TokenIsNotValidException.php
@@ -4,7 +4,7 @@
 
 namespace Garbuzivan\Laraveltokens\Exceptions;
 
-class TokenIsNotNalidException extends \Exception
+class TokenIsNotValidException extends \Exception
 {
 
 }
diff --git a/src/Interfaces/AccessTokenRepositoryInterface.php b/src/Interfaces/AccessTokenRepositoryInterface.php
@@ -155,11 +155,11 @@ public function getAccessToken(string $token): ?AccessToken;
     /**
      * Фиксация последней активности токена
      *
-     * @param string $token
+     * @param int $token_id
      *
      * @return bool
      */
-    public function setLastUseAccessToken(string $token): bool;
+    public function setLastUseAccessToken(int $token_id): bool;
 
     /**
      * Проверка полиморфной связи

diff --git a/src/Interfaces/GlobalTokenRepositoryInterface.php b/src/Interfaces/GlobalTokenRepositoryInterface.php
@@ -108,9 +108,9 @@ public function getGlobalToken(string $token): ?GlobalToken;
     /**
      * Фиксация последней активности токена
      *
-     * @param string $token
+     * @param int $token_id
      *
      * @return bool
      */
-    public function setLastUseGlobalToken(string $token): bool;
+    public function setLastUseGlobalToken(int $token_id): bool;
 }
diff --git a/src/Interfaces/ModelToken.php b/src/Interfaces/ModelToken.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Garbuzivan\Laraveltokens\Interfaces;
+
+interface ModelToken
+{
+
+}
diff --git a/src/Middleware/LaravelTokens.php b/src/Middleware/LaravelTokens.php
@@ -6,7 +6,7 @@
 
 use Closure;
 use Garbuzivan\Laraveltokens\Exceptions\EmptyTokenException;
-use Garbuzivan\Laraveltokens\Exceptions\TokenIsNotNalidException;
+use Garbuzivan\Laraveltokens\Exceptions\TokenIsNotValidException;
 use Garbuzivan\Laraveltokens\TokenManager;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Http\Request;
@@ -52,7 +52,7 @@ public function handle($request, Closure $next)
         }
         try {
             $token = $this->TokenManager->auth($token);
-        } catch (TokenIsNotNalidException $e) {
+        } catch (TokenIsNotValidException $e) {
             abort(403);
         }
         if ($token->user instanceof Authenticatable) {

diff --git a/src/Models/AccessToken.php b/src/Models/AccessToken.php
@@ -5,11 +5,12 @@
 namespace Garbuzivan\Laraveltokens\Models;
 
 use Carbon\Carbon;
+use Garbuzivan\Laraveltokens\Interfaces\ModelToken;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-class AccessToken extends Model
+class AccessToken extends Model implements ModelToken
 {
     use HasFactory;
 

diff --git a/src/Models/GlobalToken.php b/src/Models/GlobalToken.php
@@ -5,10 +5,11 @@
 namespace Garbuzivan\Laraveltokens\Models;
 
 use Carbon\Carbon;
+use Garbuzivan\Laraveltokens\Interfaces\ModelToken;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class GlobalToken extends Model
+class GlobalToken extends Model implements ModelToken
 {
     use HasFactory;
 
@@ -21,13 +22,15 @@ class GlobalToken extends Model
         'token',
         'title',
         'expiration',
+        'last_use',
     ];
 
     /**
      * @var string[]
      */
     protected $dates = [
         'expiration',
+        'last_use',
         'created_at',
         'updated_at',
     ];
@@ -49,6 +52,7 @@ class GlobalToken extends Model
         'token' => 'string',
         'title' => 'string',
         'expiration' => 'datetime',
+        'last_use' => 'datetime',
     ];
 
     /**

diff --git a/src/Models/RefreshToken.php b/src/Models/RefreshToken.php
@@ -5,12 +5,13 @@
 namespace Garbuzivan\Laraveltokens\Models;
 
 use Carbon\Carbon;
+use Garbuzivan\Laraveltokens\Interfaces\ModelToken;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-class RefreshToken extends Model
+class RefreshToken extends Model implements ModelToken
 {
     use HasFactory;
 

diff --git a/src/Repositories/AccessTokenRepository.php b/src/Repositories/AccessTokenRepository.php
@@ -9,7 +9,6 @@
 use Garbuzivan\Laraveltokens\Exceptions\UserNotExistsException;
 use Garbuzivan\Laraveltokens\Interfaces\AccessTokenRepositoryInterface;
 use Garbuzivan\Laraveltokens\Models\AccessToken;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 
@@ -219,13 +218,13 @@ public function getAccessToken(string $token): ?AccessToken
     /**
      * Фиксация последней активности токена
      *
-     * @param string $token
+     * @param int $token_id
      *
      * @return bool
      */
-    public function setLastUseAccessToken(string $token): bool
+    public function setLastUseAccessToken(int $token_id): bool
     {
-        return (bool)AccessToken::where('token', $token)->update([
+        return (bool)AccessToken::where('id', $token_id)->update([
             'last_use' => Carbon::now()->subMinutes(),
         ]);
     }

diff --git a/src/Repositories/GlobalTokenRepository.php b/src/Repositories/GlobalTokenRepository.php
@@ -149,13 +149,13 @@ public function getGlobalToken(string $token): ?GlobalToken
     /**
      * Фиксация последней активности токена
      *
-     * @param string $token
+     * @param int $token_id
      *
      * @return bool
      */
-    public function setLastUseGlobalToken(string $token): bool
+    public function setLastUseGlobalToken(int $token_id): bool
     {
-        return (bool)GlobalToken::where('token', $token)->update([
+        return (bool)GlobalToken::where('id', $token_id)->update([
             'last_use' => Carbon::now()->subMinutes(),
         ]);
     }

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -4,6 +4,7 @@
 
 namespace Garbuzivan\Laraveltokens;
 
+use Garbuzivan\Laraveltokens\Commands\CreateGlobalTokenCommand;
 use Garbuzivan\Laraveltokens\Commands\CreateTokenCommand;
 use Garbuzivan\Laraveltokens\Commands\DeactivationByIDCommand;
 use Garbuzivan\Laraveltokens\Commands\DeactivationByUserCommand;
@@ -48,6 +49,7 @@ public function boot()
                 ProlongationByIDCommand::class,
                 ProlongationByUserCommand::class,
                 ProlongationByTokenCommand::class,
+                CreateGlobalTokenCommand::class,
             ]);
         }
     }