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

Merge pull request #6567 from turbo124/v5-develop

Browse Source 
Fixes for client portal login with custom domains
This commit is contained in:
David Bomba 2021-09-04 11:09:50 +10:00 committed by GitHub
commit 3e2d8f512a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Auth/ContactLoginController.php
View File

@ -37,9 +37,11 @@ class ContactLoginController extends Controller
public function showLoginForm(Request $request) public function showLoginForm(Request $request)
{ {
//if we are on the root domain invoicing.co do not show any company logos //if we are on the root domain invoicing.co do not show any company logos
if(Ninja::isHosted() && count(explode('.', request()->getHost())) == 2){ // if(Ninja::isHosted() && count(explode('.', request()->getHost())) == 2){
$company = null; // $company = null;
}elseif (strpos($request->getHost(), 'invoicing.co') !== false) { // }else
if (strpos($request->getHost(), 'invoicing.co') !== false) {
$subdomain = explode('.', $request->getHost())[0]; $subdomain = explode('.', $request->getHost())[0];
MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]); MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);

7
app/Http/Controllers/Auth/ContactResetPasswordController.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Libraries\MultiDB;
use App\Models\Account; use App\Models\Account;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
@ -65,14 +66,18 @@ class ContactResetPasswordController extends Controller
{ {
$account_id = $request->get('account_id'); $account_id = $request->get('account_id');
$account = Account::find($account_id); $account = Account::find($account_id);
$db = $account->companies->first()->db;
return $this->render('auth.passwords.reset')->with( return $this->render('auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email, 'account' => $account] ['token' => $token, 'email' => $request->email, 'account' => $account, 'db' => $db]
); );
} }
public function reset(Request $request) public function reset(Request $request)
{ {
if($request->has('db'))
MultiDB::setDb($request->input('db'));
$request->validate($this->rules(), $this->validationErrorMessages()); $request->validate($this->rules(), $this->validationErrorMessages());
// Here we will attempt to reset the user's password. If it is successful we // Here we will attempt to reset the user's password. If it is successful we

2
resources/views/portal/ninja2020/auth/login.blade.php
View File

@ -52,7 +52,7 @@
<a class="text-xs text-gray-600 hover:text-gray-800 ease-in duration-100" <a class="text-xs text-gray-600 hover:text-gray-800 ease-in duration-100"
href="{{ route('client.password.request') }}">{{ trans('texts.forgot_password') }}</a> href="{{ route('client.password.request') }}">{{ trans('texts.forgot_password') }}</a>
</div> </div>
@if($company) @if(isset($company) && !is_null($company))
<input type="hidden" name="db" value="{{$company->db}}"> <input type="hidden" name="db" value="{{$company->db}}">
@endif @endif
<input type="password" name="password" id="password" <input type="password" name="password" id="password"

3
resources/views/portal/ninja2020/auth/passwords/reset.blade.php
View File

@ -30,6 +30,9 @@
<form action="{{ route('client.password.update') }}" method="post" class="mt-6"> <form action="{{ route('client.password.update') }}" method="post" class="mt-6">
@csrf @csrf
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">
@if($db)
<input type="hidden" name="db" value="{{$db}}">
@endif
<div class="flex flex-col"> <div class="flex flex-col">
<label for="email" class="input-label">{{ ctrans('texts.email_address') }}</label> <label for="email" class="input-label">{{ ctrans('texts.email_address') }}</label>
<input type="email" name="email" id="email" <input type="email" name="email" id="email"