Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 04:44:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes for contact registration

Browse Source
This commit is contained in:
David Bomba 2021-12-13 15:22:16 +11:00
parent 80af649f7a
commit c6a42b2a90
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ class ContactLoginController extends Controller
return $this->sendLockoutResponse($request); return $this->sendLockoutResponse($request);
} }
if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first()){ if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){
$contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first(); $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first();
@ -132,7 +132,6 @@ class ContactLoginController extends Controller
public function authenticated(Request $request, ClientContact $client) public function authenticated(Request $request, ClientContact $client)
{ {
// Auth::guard('contact')->loginUsingId($client->id, true);
auth()->guard('contact')->loginUsingId($client->id, true); auth()->guard('contact')->loginUsingId($client->id, true);
event(new ContactLoggedIn($client, $client->company, Ninja::eventVars())); event(new ContactLoggedIn($client, $client->company, Ninja::eventVars()));

5
app/Http/Middleware/ContactRegister.php
View File

@ -37,15 +37,14 @@ class ContactRegister
if(! $company->client_can_register) if(! $company->client_can_register)
abort(400, 'Registration disabled'); abort(400, 'Registration disabled');
// $request->merge(['key' => $company->company_key]); session()->put('key', $company->company_key);
session()->put('key', $company->company_key);
return $next($request); return $next($request);
} }
} }
$query = [ $query = [
'portal_domain' => $request->getSchemeAndHttpHost(), 'portal_domain' => $request->getSchemeAndHttpHost(),
'portal_mode' => 'domain', 'portal_mode' => 'domain',
]; ];

4
resources/views/portal/ninja2020/auth/register.blade.php
View File

@ -11,6 +11,10 @@
<p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p> <p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p>
<form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }"> <form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }">
@if($company)
<input type="hidden" name="company_key" value="{{ $company->company_key }}">
@endif
@csrf @csrf
<div class="grid grid-cols-12 gap-4 mt-10"> <div class="grid grid-cols-12 gap-4 mt-10">