Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the way we harvest the company entity

Browse Source
This commit is contained in:
David Bomba 2019-06-12 09:15:17 +10:00
parent 49a48db8a0
commit 79907e6206
9 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ClientController.php
View File

@ -34,6 +34,7 @@ use App\Transformers\ClientTransformer;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
/**
* Class ClientController
@ -140,7 +141,7 @@ class ClientController extends BaseController
*/
public function store(StoreClientRequest $request)
{
$client = $this->client_repo->save($request->all(), ClientFactory::create(auth()->user()->company()->id, auth()->user()->id));
$client->load('contacts', 'primary_contact');

16
app/Http/Middleware/TokenAuth.php
View File

@ -28,10 +28,22 @@ class TokenAuth
public function handle($request, Closure $next)
{
if( $request->header('X-API-TOKEN') && ($user = CompanyToken::whereRaw("BINARY `token`= ?",[$request->header('X-API-TOKEN')])->first()->user ) )
if( $request->header('X-API-TOKEN') && ($company_token = CompanyToken::with(['user','company'])->whereRaw("BINARY `token`= ?",[$request->header('X-API-TOKEN')])->first() ) )
{
$user = $company_token->user;
auth()->login($user);
/*
|
| Necessary evil here: As we are authenticating on CompanyToken,
| we need to link the company to the user manually. This allows
| us to decouple a $user and their attached companies completely.
|
*/
$user->setCompany($company_token->company);
//stateless, don't remember the user.
auth()->login($user, false);
event(new UserLoggedIn($user));
}
else {

7
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -13,6 +13,7 @@ namespace App\Http\Requests\Client;
use App\Http\Requests\Request;
use App\Models\Client;
use Illuminate\Support\Facades\Log;
class StoreClientRequest extends Request
{
@ -24,7 +25,9 @@ class StoreClientRequest extends Request
public function authorize() : bool
{
return auth()->user()->can('create', Client::class);
}
public function rules()
@ -32,7 +35,7 @@ class StoreClientRequest extends Request
// $this->sanitize();
/* Ensure we have a client name, and that all emails are unique*/
$rules['name'] = 'required';
$rules['name'] = 'required|min:1';
$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id;
$contacts = request('contacts');
@ -46,6 +49,8 @@ class StoreClientRequest extends Request
}
Log::error($rules);
return $rules;

3
app/Http/Requests/User/UpdateUserRequest.php
View File

@ -13,6 +13,7 @@ namespace App\Http\Requests\User;
use App\Http\Requests\Request;
use App\Http\ValidationRules\UniqueUserRule;
use Illuminate\Support\Facades\Log;
class UpdateUserRequest extends Request
{
@ -24,7 +25,7 @@ class UpdateUserRequest extends Request
public function authorize() : bool
{
Log::error($this->user);
return auth()->user()->can('edit', $this->user);
}

43
app/Models/User.php
View File

@ -44,6 +44,9 @@ class User extends Authenticatable implements MustVerifyEmail
protected $presenter = 'App\Models\Presenters\UserPresenter';
protected $with = ['companies','user_companies'];
public $company;
/**
* The attributes that are mass assignable.
*
@ -85,7 +88,7 @@ class User extends Authenticatable implements MustVerifyEmail
}
/**
* Returns all company tokens.
* Returns all one company token.
*
* @return Collection
*/
@ -95,14 +98,14 @@ class User extends Authenticatable implements MustVerifyEmail
}
/**
* Return first user token
*
* @return token object
* Returns all company tokens.
*
* @return Collection
*/
//public function token()
//{
// return $this->tokens()->first();
//}
public function tokens()
{
return $this->hasMany(CompanyToken::class)->orderBy('id', 'ASC');
}
/**
* Returns all companies a user has access to.
@ -114,14 +117,34 @@ class User extends Authenticatable implements MustVerifyEmail
return $this->belongsToMany(Company::class)->using(CompanyUser::class)->withPivot('permissions', 'settings', 'is_admin', 'is_owner', 'is_locked');
}
/**
*
* As we are authenticating on CompanyToken,
* we need to link the company to the user manually. This allows
* us to decouple a $user and their attached companies.
*
*/
public function setCompany($company)
{
$this->company = $company;
}
/**
* Returns the currently set Company
*/
public function getCompany()
{
return $this->company;
}
/**
* Returns the current company
*
* @return Collection
*/
*/
public function company()
{
return $this->token->whereRaw("BINARY `token`= ?", [request()->header('X-API-TOKEN')])->first()->company;
return $this->getCompany();
}
/**

3
app/Policies/EntityPolicy.php
View File

@ -48,7 +48,6 @@ class EntityPolicy
*/
public function edit(User $user, $entity) : bool
{
Log::error('trying to edit');
return ($user->isAdmin() && $entity->company_id == $user->companyId())
|| ($user->hasPermission('edit_' . strtolower(class_basename($entity))) && $entity->company_id == $user->companyId())
@ -67,7 +66,7 @@ class EntityPolicy
*/
public function view(User $user, $entity) : bool
{
Log::error('trying to view');
return ($user->isAdmin() && $entity->company_id == $user->companyId())
|| ($user->hasPermission('view_' . strtolower(class_basename($entity))) && $entity->company_id == $user->companyId())
|| $user->owns($entity);

11
app/Policies/UserPolicy.php
View File

@ -31,4 +31,15 @@ class UserPolicy extends EntityPolicy
return $user->isAdmin() || $user->hasPermission('create_user');
}
//we need to override as User does not have the company_id property!!!!!
public function edit(User $user, $entity) : bool
{
return ($user->isAdmin() && $entity->company_id == $user->companyId())
|| ($user->hasPermission('edit_' . strtolower(class_basename($entity))) && $entity->company_id == $user->companyId())
|| $user->owns($entity);
}
}

4
app/Providers/RouteServiceProvider.php
View File

@ -17,6 +17,7 @@ use App\Models\RecurringInvoiceInvitation;
use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Log;
class RouteServiceProvider extends ServiceProvider
{
@ -37,7 +38,8 @@ class RouteServiceProvider extends ServiceProvider
*/
public function boot()
{
//
//
parent::boot();

4
routes/web.php
View File

@ -61,7 +61,7 @@ Route::group(['middleware' => ['auth:user', 'web_db']], function () {
Route::post('clients/bulk', 'ClientController@bulk')->name('clients.bulk');
Route::resource('client_statement', 'ClientStatementController@statement'); // name = (client_statement. index / create / show / update / destroy / edit
/*
Route::resource('tasks', 'TaskController'); // name = (tasks. index / create / show / update / destroy / edit
Route::post('tasks/bulk', 'TaskController@bulk')->name('tasks.bulk');
@ -81,7 +81,7 @@ Route::group(['middleware' => ['auth:user', 'web_db']], function () {
Route::resource('user', 'UserProfileController'); // name = (clients. index / create / show / update / destroy / edit
Route::get('settings', 'SettingsController@index')->name('user.settings');
*/
});