Merge pull request #36 from vanushwashere/feature/max_token_length

Token length changes

Author: cesargb

config/magiclink.php

@@ -8,7 +8,8 @@
         | Token size
         |--------------------------------------------------------------------------
         |
-        | Here you may specifiy the length of token to verify the identify.
+        | Here you may specify the length of token to verify the identify.
+        | Max value is 255 characters, it will be used if bigger value is set.
         |
         */
         'length' => 64,

databases/migrations/2017_07_06_000000_create_table_magic_links.php

@@ -15,7 +15,7 @@ public function up()
     {
         Schema::create(config('magiclink.magiclink_table', 'magic_links'), function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->string('token', 100);
+            $table->string('token', 255);
             $table->text('action');
             $table->unsignedTinyInteger('num_visits')->default(0);
             $table->unsignedTinyInteger('max_visits')->nullable();

src/MagicLink.php

@@ -26,6 +26,13 @@ protected static function boot()
         });
     }
 
+    protected static function getTokenLength()
+    {
+        return config('magiclink.token.length', 64) <= 255
+            ? config('magiclink.token.length', 64)
+            : 255;
+    }
+
     public function getActionAttribute($value)
     {
         if ($this->getConnection()->getDriverName() === 'pgsql') {
@@ -66,7 +73,7 @@ public static function create(ActionInterface $action, ?int $lifetime = 4320, ?i
 
         $magiclink = new static();
 
-        $magiclink->token = Str::random(config('magiclink.token.length', 64));
+        $magiclink->token = Str::random(self::getTokenLength());
         $magiclink->available_at = $lifetime
                                     ? Carbon::now()->addMinute($lifetime)
                                     : null;

tests/ConfigTest.php

@@ -18,6 +18,15 @@ public function test_custom_token_length()
         $this->assertEquals(10, strlen($this->getTokenFromUrl($url)));
     }
 
+    public function test_custom_token_length_bigger_than_max_value()
+    {
+        $this->app['config']->set('magiclink.token.length', 256);
+
+        $url = MagicLink::create(new ResponseAction())->url;
+
+        $this->assertEquals(255, strlen($this->getTokenFromUrl($url)));
+    }
+
     protected function getTokenFromUrl($url)
     {
         $parts = explode(':', $url);