Google2Fa ready to upload
This commit is contained in:
Kevin Adametz
parent
e3495be8b8
commit
73e38a006e
127 changed files with 2637 additions and 589 deletions
|
|
@ -4,15 +4,16 @@ namespace App\Http\Controllers;
|
|||
|
||||
|
||||
|
||||
use App\Mail\MailVerifyContact;
|
||||
use App\Models\Account;
|
||||
use App\Repositories\UserRepository;
|
||||
use App\Services\HTMLHelper;
|
||||
use App\User;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Request;
|
||||
use App\User;
|
||||
use Validator;
|
||||
use DataTables;
|
||||
use App\Models\Account;
|
||||
use App\Services\HTMLHelper;
|
||||
use App\Services\MyGoogle2FA;
|
||||
use App\Mail\MailVerifyContact;
|
||||
use App\Repositories\UserRepository;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class AdminUserController extends Controller
|
||||
{
|
||||
|
|
@ -20,9 +21,8 @@ class AdminUserController extends Controller
|
|||
|
||||
public function __construct(UserRepository $userRepo)
|
||||
{
|
||||
$this->middleware('superadmin');
|
||||
$this->middleware(['superadmin', '2fa']);
|
||||
$this->userRepo = $userRepo;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -34,6 +34,12 @@ class AdminUserController extends Controller
|
|||
//'values' => User::where('admin', 0)->get(),
|
||||
'values' => User::where('confirmation_code_remider', '!=', 2)->get(),
|
||||
];
|
||||
$user = User::findOrFail(8);
|
||||
|
||||
/* $MyGoogle2FA = new MyGoogle2FA();
|
||||
$valid = $MyGoogle2FA->init($user)->check2Fa('676493');
|
||||
dd($valid); */
|
||||
|
||||
return view('admin.users', $data);
|
||||
}
|
||||
|
||||
|
|
@ -121,40 +127,97 @@ class AdminUserController extends Controller
|
|||
public function loadModal($id){
|
||||
|
||||
if(Request::ajax()) {
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
if(isset($data['action'])){
|
||||
if($data['action'] === 'show-user-roles'){
|
||||
$fill = [
|
||||
'user' => $user,
|
||||
'action' => $data['action'],
|
||||
'groups' => config('permissions.groups'),
|
||||
'roles' => config('permissions.roles')
|
||||
];
|
||||
return view("admin.user_modal", $fill )->render();
|
||||
}
|
||||
if($data['action'] === 'show-user-active'){
|
||||
$fill = [
|
||||
'user' => $user,
|
||||
'action' => $data['action'],
|
||||
];
|
||||
return view("admin.active_modal", $fill )->render();
|
||||
}
|
||||
|
||||
|
||||
$data = [
|
||||
'user' => $user,
|
||||
'groups' => config('permissions.groups'),
|
||||
'roles' => config('permissions.roles')
|
||||
];
|
||||
return view("admin.user_modal", $data )->render();
|
||||
if($data['action'] === 'show-user-google2fa'){
|
||||
|
||||
if($user->isGoogle2Fa()){
|
||||
$MyGoogle2FA = new MyGoogle2FA();
|
||||
$MyGoogle2FA->init($user);
|
||||
$fill = [
|
||||
'user' => $user,
|
||||
'action' => 'delete-user-google2fa',
|
||||
'MyGoogle2FA' => $MyGoogle2FA,
|
||||
];
|
||||
return view("admin.google2fa_delete_modal", $fill )->render();
|
||||
}else{
|
||||
$MyGoogle2FA = new MyGoogle2FA();
|
||||
$MyGoogle2FA->init($user)->generate();
|
||||
$fill = [
|
||||
'user' => $user,
|
||||
'action' => 'activate-user-google2fa',
|
||||
'MyGoogle2FA' => $MyGoogle2FA,
|
||||
];
|
||||
return view("admin.google2fa_modal", $fill )->render();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function updateModal($step = false){
|
||||
public function updateModal($action = false){
|
||||
|
||||
if($step == 'user'){
|
||||
if($action=== 'show-user-roles'){
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
|
||||
$user->permissions = isset($data['permissions']) ? $data['permissions'] : [];
|
||||
$user->admin = $data['admin'];
|
||||
$user->confirmed = isset($data['confirmed']) ? true : false;
|
||||
$user->active = isset($data['active']) ? true : false;
|
||||
$user->save();
|
||||
\Session()->flash('alert-save', true);
|
||||
|
||||
}
|
||||
if($action=== 'show-user-active'){
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
$user->active = isset($data['active']) ? true : false;
|
||||
$user->save();
|
||||
\Session()->flash('alert-save', true);
|
||||
|
||||
}
|
||||
if($action=== 'activate-user-google2fa'){
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
$user->google2fa = true;
|
||||
$user->save();
|
||||
\Session()->flash('alert-save', true);
|
||||
}
|
||||
|
||||
if($action=== 'delete-user-google2fa'){
|
||||
$data = Request::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
$user->google2fa = false;
|
||||
$user->secret_key = null;
|
||||
$user->save();
|
||||
\Session()->flash('alert-save', true);
|
||||
}
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect('/admin/users');
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
public function getUsers()
|
||||
{
|
||||
//confirmation_code_remider is delete 2
|
||||
|
|
@ -165,13 +228,20 @@ class AdminUserController extends Controller
|
|||
return '<a href="' . route('admin_user_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('admin', function (User $user) {
|
||||
return '<a href="#" data-url="'.route('admin_user_load_modal', $user->id).'" data-data="'.$user->id.'" class="update_modal_data_show">'.HTMLHelper::getRoleLabel($user->admin, '<i class="fa fa-edit"></i> Rechte + ','').'</a>';
|
||||
return '<a href="#" data-url="'.route('admin_user_load_modal', $user->id).'" data-data="'.$user->id.'" data-action="show-user-roles" class="update_modal_data_show">'.HTMLHelper::getRoleLabel($user->admin, '<i class="fa fa-edit"></i> Rechte + ','').'</a>';
|
||||
})
|
||||
->addColumn('google2fa', function (User $user) {
|
||||
$icon = $user->google2fa ? '<i class="fa fa-check-circle"></i>' : '<i class="fa fa-times-circle"></i>';
|
||||
$color = $user->google2fa ? 'primary' : 'danger';
|
||||
return ' <a href="#" data-url="'.route('admin_user_load_modal', $user->id).'" data-data="'.$user->id.'" data-action="show-user-google2fa" class="update_modal_data_show btn btn-sm btn-'.$color.'">'.$icon.' google2fa</a>';
|
||||
})
|
||||
->addColumn('confirmed', function (User $user) {
|
||||
return $user->confirmed ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
|
||||
})
|
||||
->addColumn('active', function (User $user) {
|
||||
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
|
||||
$active = $user->active ? '<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>';
|
||||
return ' <a href="#" data-url="'.route('admin_user_load_modal', $user->id).'" data-data="'.$user->id.'" data-action="show-user-active" class="update_modal_data_show">'.$active.'</a>';
|
||||
|
||||
})
|
||||
->addColumn('action_delete', function (User $user) {
|
||||
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="fa fa-trash"></span></a>';
|
||||
|
|
@ -179,7 +249,7 @@ class AdminUserController extends Controller
|
|||
->orderColumn('confirmed', 'confirmed $1')
|
||||
->orderColumn('active', 'active $1')
|
||||
->orderColumn('admin', 'active $1')
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'action_delete'])
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'action_delete', 'google2fa'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue