Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure user is allowed to migrate (#3468)

Browse Source
This commit is contained in:
Benjamin Beganović 2020-03-10 22:08:10 +01:00 committed by GitHub
parent be96bef3f0
commit d9a3b5453a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Migration/StepsController.php
View File

@ -31,6 +31,11 @@ class StepsController extends BaseController
{ {
use GenerateMigrationResources; use GenerateMigrationResources;
public function __construct()
{
$this->middleware('migration');
}
private $access = [ private $access = [
'auth' => [ 'auth' => [
'steps' => ['MIGRATION_TYPE'], 'steps' => ['MIGRATION_TYPE'],

1
app/Http/Kernel.php
View File

@ -63,5 +63,6 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'lookup' => \App\Http\Middleware\DatabaseLookup::class, 'lookup' => \App\Http\Middleware\DatabaseLookup::class,
'permissions.required' => \App\Http\Middleware\PermissionsRequired::class, 'permissions.required' => \App\Http\Middleware\PermissionsRequired::class,
'migration' => \App\Http\Middleware\EligibleForMigration::class,
]; ];
} }

24
app/Http/Middleware/EligibleForMigration.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace App\Http\Middleware;
use Closure;
class EligibleForMigration
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if (is_null(auth()->user()->public_id)) {
return $next($request);
}
return redirect('/settings/account_management');
}
}

5
app/Models/User.php
View File

@ -493,6 +493,11 @@ class User extends Authenticatable
return array_combine($keys, $values); return array_combine($keys, $values);
} }
public function eligibleForMigration()
{
return is_null($this->public_id);
}
} }
User::created(function ($user) User::created(function ($user)

31
resources/views/accounts/management.blade.php
View File

@ -238,25 +238,28 @@
</div> </div>
</div> </div>
<div class="panel panel-default"> @if(Auth::user()->eligibleForMigration())
<div class="panel-heading"> <div class="panel panel-default">
<h3 class="panel-title">{!! trans('texts.migrate_to_next_version') !!}</h3> <div class="panel-heading">
</div> <h3 class="panel-title">{!! trans('texts.migrate_to_next_version') !!}</h3>
<div class="panel-body">
<div class="col-lg-8 col-sm-8">
<div clasS="form-group">
{!! trans('texts.migrate_intro_text') !!}
</div>
</div> </div>
<div class="panel-body">
<div class="col-md-12"> <div class="col-lg-8 col-sm-8">
<div class="form-group"> <div clasS="form-group">
<a class="btn btn-primary btn-lg" href="/migration/start">{!! trans('texts.start_the_migration') !!}</a> {!! trans('texts.migrate_intro_text') !!}
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<a class="btn btn-primary btn-lg"
href="/migration/start">{!! trans('texts.start_the_migration') !!}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> @endif
{!! Former::close() !!} {!! Former::close() !!}

1
resources/views/users/account_management.blade.php
View File

@ -2,7 +2,6 @@
@section('content') @section('content')
<center> <center>
@if (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5) @if (!session(SESSION_USER_ACCOUNTS) || count(session(SESSION_USER_ACCOUNTS)) < 5)
{!! Button::success(trans('texts.add_company'))->withAttributes(['onclick' => 'showSignUp()']) !!} {!! Button::success(trans('texts.add_company'))->withAttributes(['onclick' => 'showSignUp()']) !!}