Merge branch 'release/0.11.0'

Author: hernandev

.travis.yml

@@ -9,6 +9,7 @@ matrix:
   include:
     - php: 7.0
     - php: 7.1
+    - php: 7.2
     - php: nightly
   fast_finish: true
 

src/Auth/Guard.php

@@ -269,24 +269,15 @@ protected function getTokenFromParameter()
      */
     protected function detectedToken()
     {
-        // retrieve the token from the Authorization header.
-        $headerToken = $this->getTokenFromHeader();
+        // retrieve the token from request.
+        $detectedToken = $this->getTokenFromHeader() ?? $this->getTokenFromParameter();
 
-        // if a token was found...
-        if ($headerToken) {
-            // return a new token instance.
-            $this->token = $this->manager()->parseToken($headerToken);
+        if ($detectedToken) {
+            // update the currently used token
+            $this->token = $this->manager()->parseToken($detectedToken);
         }
 
-        // try to find a token passed as parameter on the request.
-        $parameterToken = $this->getTokenFromParameter();
-
-        // if found...
-        if ($parameterToken) {
-            $this->token = $this->manager()->parseToken($parameterToken);
-        }
-
-        // return null if no token could be found.
+        // return current token in use
         return $this->token;
     }
 

src/Console/KeyGenerateCommand.php

@@ -3,6 +3,7 @@
 namespace Codecasts\Auth\JWT\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
 use Symfony\Component\Console\Helper\FormatterHelper;
 
 /**
@@ -12,12 +13,16 @@
  */
 class KeyGenerateCommand extends Command
 {
+    use ConfirmableTrait;
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'jwt:generate';
+    protected $signature = 'jwt:generate
+            {--show : Display the key instead of modifying files}
+            {--force : Force the operation to run when in production}';
 
     /**
      * Make it 5.4 compatible.
@@ -29,26 +34,74 @@ public function fire()
 
     /**
      * Execute the command that will generate and print a key.
-     *
-     * @return void
      */
     public function handle()
     {
         // call the action to generate a new key.
         $key = $this->generateRandomKey();
 
-        // print the success block.
-        $this->printBlock([
-            'JWT Key Generated!',
-            'Please Update your .env file manually with the following key:',
-        ], 'bg=green;fg=black', true);
+        if ($this->option('show')) {
+            // print the success block.
+            $this->printBlock([
+                'JWT Key Generated!',
+                'Please Update your .env file manually with the following key:',
+            ], 'bg=green;fg=black', true);
+
+            // print the key block.
+            return $this->printBlock([
+                "JWT_SECRET={$key}",
+            ], 'bg=yellow;fg=black');
+        }
+
+        // Next, we will replace the application key in the environment file so it is
+        // automatically setup for this developer. This key gets generated using a
+        // secure random byte generator and is later base64 encoded for storage.
+        if (!$this->setKeyInEnvironmentFile($key)) {
+            return;
+        }
+
+        $this->laravel['config']['jwt.secret'] = $key;
 
         // print the key block.
         $this->printBlock([
             "JWT_SECRET={$key}",
         ], 'bg=yellow;fg=black');
     }
 
+    /**
+     * Set the application key in the environment file.
+     *
+     * @param string $key
+     *
+     * @return bool
+     */
+    protected function setKeyInEnvironmentFile($key)
+    {
+        $currentKey = $this->laravel['config']['jwt.secret'];
+
+        if (0 !== strlen($currentKey) && (!$this->confirmToProceed())) {
+            return false;
+        }
+
+        $this->writeNewEnvironmentFileWith($key);
+
+        return true;
+    }
+
+    /**
+     * Write a new environment file with the given key.
+     *
+     * @param string $key
+     */
+    protected function writeNewEnvironmentFileWith($key)
+    {
+        file_put_contents($this->laravel->environmentFilePath(), preg_replace(
+                $this->keyReplacementPattern(),
+                'JWT_SECRET='.$key,
+                file_get_contents($this->laravel->environmentFilePath())
+            ));
+    }
+
     /**
      * Generates a random, 32 bytes long, base64 encoded key.
      *
@@ -88,4 +141,16 @@ protected function printBlock(array $lines, $style, $firstBlock = false)
         // empty ending line.
         $this->line('');
     }
+
+    /**
+     * Get a regex pattern that will match env APP_KEY with any random key.
+     *
+     * @return string
+     */
+    protected function keyReplacementPattern()
+    {
+        $escaped = preg_quote('='.$this->laravel['config']['jwt.secret'], '/');
+
+        return "/^JWT_SECRET{$escaped}/m";
+    }
 }