Merge branch 'develop'

recca0120 · Jul 22, 2016 · c4fdc27 · c4fdc27
2 parents 2b160cb + 68fb76e
commit c4fdc27
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
         "illuminate/filesystem": "~5.1",
         "illuminate/routing": "~5.1",
         "paragonie/random_compat": "~1.1",
-        "symfony/finder": "2.7.*|2.8.*|3.0.*"
+        "symfony/finder": "2.7.*|2.8.*|3.0.*",
+        "illuminate/encryption": "^5.2"
     },
     "require-dev": {
         "nesbot/carbon": "~1.20",

diff --git a/public/js/bundle.js b/public/js/bundle.js
diff --git a/resources/assets/js/commands/help.js b/resources/assets/js/commands/help.js
@@ -9,5 +9,6 @@ export default class Help extends Command {
 
     call(cmd) {
         this.api.echo(this.api.options.helpInfo);
+        this.api.serverInfo();
     }
 }
diff --git a/src/Http/Controllers/TerminalController.php b/src/Http/Controllers/TerminalController.php
@@ -2,6 +2,7 @@
 
 namespace Recca0120\Terminal\Http\Controllers;
 
+use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Http\Request;
@@ -36,15 +37,18 @@ public function __construct(ConsoleKernel $consoleKernel)
      * @param \Illuminate\Contracts\Foundation\Application $app
      * @param \Illuminate\Session\SessionManager           $sessionManager
      * @param \Illuminate\Http\Request                     $request
+     * @param \Illuminate\Contracts\Encryption\Encrypter   $encrypter
      * @param string                                       $view
      *
      * @return mixed
      */
-    public function index(ApplicationContract $app, SessionManager $sessionManager, Request $request, $view = 'index')
+    public function index(ApplicationContract $app, SessionManager $sessionManager, Request $request, Encrypter $encrypter, $view = 'index')
     {
         $session = $sessionManager->driver();
         if ($session->isStarted() === false) {
-            $session->setId($request->cookies->get($session->getName()));
+            $sessionName = $request->cookies->get($session->getName());
+            $sessionName = ($session->isValidId($sessionName) === false) ? $encrypter->decrypt($sessionName) : $sessionName;
+            $session->setId($sessionName);
             $session->setRequestOnHandler($request);
             $session->start();
         }