Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:27:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge: We can't find a user with that e-mail address

Browse Source
This commit is contained in:
Hillel Coren 2018-02-24 22:21:30 +02:00
parent 1633f30a38
commit 1bd99880bd
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Middleware/Authenticate.php
View File

@ -2,10 +2,12 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Models\Account;
use App\Models\Contact; use App\Models\Contact;
use App\Models\Invitation; use App\Models\Invitation;
use App\Models\ProposalInvitation; use App\Models\ProposalInvitation;
use Auth; use Auth;
use Utils;
use Closure; use Closure;
use Session; use Session;
@ -99,7 +101,21 @@ class Authenticate
if ($request->ajax()) { if ($request->ajax()) {
return response('Unauthorized.', 401); return response('Unauthorized.', 401);
} else { } else {
return redirect()->guest($guard == 'client' ? '/client/login' : '/login'); if ($guard == 'client') {
$url = '/client/login';
if (Utils::isNinja()) {
if ($account && Utils::getSubdomain() == 'app') {
$url .= '?account_key=' . $account->account_key;
}
} else {
if ($account && Account::count() > 1) {
$url .= '?account_key=' . $account->account_key;
}
}
} else {
$url = '/login';
}
return redirect()->guest($url);
} }
} }

6
app/Libraries/Utils.php
View File

@ -1003,8 +1003,12 @@ class Utils
return $str; return $str;
} }
public static function getSubdomain($url) public static function getSubdomain($url = false)
{ {
if (! $url) {
$url = Request::server('HTTP_HOST');
}
$parts = parse_url($url); $parts = parse_url($url);
$subdomain = ''; $subdomain = '';