Merge pull request #1474 from denisdulici/master

Redirect from signed url if user logged in

app/Http/Kernel.php

@@ -102,6 +102,7 @@ class Kernel extends HttpKernel
             'session.errors',
             'csrf',
             'signature',
+            'signed.redirect',
             'company.signed',
             'bindings',
             'header.x',
@@ -139,6 +140,7 @@ class Kernel extends HttpKernel
 
         // Akaunting
         'api.company' => \App\Http\Middleware\ApiCompany::class,
+        'api.key' => \App\Http\Middleware\CanApiKey::class,
         'auth.disabled' => \App\Http\Middleware\LogoutIfUserDisabled::class,
         'auth.redirect' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'company.currencies' => \App\Http\Middleware\LoadCurrencies::class,
@@ -151,8 +153,8 @@ class Kernel extends HttpKernel
         'install.can' => \App\Http\Middleware\CanInstall::class,
         'install.redirect' => \App\Http\Middleware\RedirectIfNotInstalled::class,
         'money' => \App\Http\Middleware\Money::class,
+        'signed.redirect' => \App\Http\Middleware\RedirectSignedIfAuthenticated::class,
         'wizard.redirect' => \App\Http\Middleware\RedirectIfWizardNotCompleted::class,
-        'api.key' => \App\Http\Middleware\CanApiKey::class,
 
         // Vendor
         'ability' => \Laratrust\Middleware\LaratrustAbility::class,

app/Http/Middleware/RedirectSignedIfAuthenticated.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\Sale\Invoice;
+use Closure;
+
+class RedirectSignedIfAuthenticated
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (!$user = user()) {
+            return $next($request);
+        }
+
+        $prefix = $user->contact ? 'portal.' : '';
+        $page = 'dashboard';
+        $params = [];
+
+        if ($request->segment(2) == 'invoices') {
+            $page = 'invoices.show';
+
+            $invoice = Invoice::find($request->segment(3));
+
+            $params = [$invoice->id];
+        }
+
+        redirect()->route($prefix . $page, $params)->send();
+    }
+}