Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
90cd2847a5 | ||
|
0b97350ca5 | ||
375463fc77 | |||
a30879a337 |
@ -18,6 +18,8 @@
|
||||
$table->string('email')->unique();
|
||||
$table->timestamp('email_verified_at')->nullable();
|
||||
$table->string('password');
|
||||
$table->foreignId('directorat_id')->nullable();
|
||||
$table->foreignId('sub_directorat_id')->nullable();
|
||||
$table->rememberToken();
|
||||
$table->timestamps();
|
||||
$table->softDeletes();
|
||||
|
@ -28,7 +28,12 @@
|
||||
return [
|
||||
['name' => 'User'],
|
||||
['name' => 'Role'],
|
||||
['name' => 'Permission']
|
||||
['name' => 'Permission'],
|
||||
['name' => 'system'],
|
||||
['name' => 'master'],
|
||||
['name' => 'document'],
|
||||
['name' => 'setting'],
|
||||
['name' => 'logs']
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
{
|
||||
//app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions();
|
||||
|
||||
$data = $this->data();
|
||||
/*$data = $this->data();
|
||||
|
||||
foreach ($data as $value) {
|
||||
$permission = Permission::updateOrCreate([
|
||||
@ -27,7 +27,7 @@
|
||||
'permission_group_id' => $value['group']
|
||||
]);
|
||||
|
||||
$roles = Role::all();
|
||||
$roles = Role::all();
|
||||
foreach ($roles as $role) {
|
||||
if ($role->name == 'administrator') {
|
||||
$role->givePermissionTo($permission);
|
||||
@ -37,22 +37,49 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
$roles = Role::all();
|
||||
foreach ($roles as $role) {
|
||||
$data = $this->data($role->name);
|
||||
foreach ($data as $value) {
|
||||
$permission = Permission::updateOrCreate([
|
||||
'name' => $value['name'],
|
||||
'guard_name' => 'web' // or 'api
|
||||
], [
|
||||
'permission_group_id' => $value['group']
|
||||
]);
|
||||
if($role->name=='ad' && explode('.',$value['name'])[0]=='document'){
|
||||
if($permission->name=='document.read'){
|
||||
$role->givePermissionTo($permission);
|
||||
}
|
||||
} else{
|
||||
$role->givePermissionTo($permission);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function data()
|
||||
public function data($role)
|
||||
{
|
||||
$data = [];
|
||||
$model = [];
|
||||
// list of model permission
|
||||
$model = ['user', 'role', 'permission'];
|
||||
if ($role == 'administrator') {
|
||||
$model = [['id' => 1, 'name' => 'user'], ['id' => 2, 'name' => 'role'], ['id' => 3, 'name' => 'permission'], ['id' => 4, 'name' => 'system'], ['id' => 5, 'name' => 'master'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting'], ['id' => 8, 'name' => 'logs']];
|
||||
} elseif($role == 'ad'){
|
||||
$model = [['id' => 4, 'name' => 'system'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting'], ['id' => 8, 'name' => 'logs']];
|
||||
} elseif($role == 'dd'){
|
||||
$model = [['id' => 4, 'name' => 'system'], ['id' => 5, 'name' => 'master'], ['id' => 6, 'name' => 'document'], ['id' => 7, 'name' => 'setting']];
|
||||
} elseif($role == 'eo'){
|
||||
$model = [['id' => 6, 'name' => 'document']];
|
||||
}
|
||||
|
||||
$i = 1;
|
||||
foreach ($model as $value) {
|
||||
foreach ($this->crudActions($value) as $action) {
|
||||
$data[] = ['name' => $action, 'group' => $i];
|
||||
foreach ($this->crudActions($value['name']) as $action) {
|
||||
$data[] = ['name' => $action, 'group' => $value['id']];
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
|
||||
return $data;
|
||||
@ -62,7 +89,7 @@
|
||||
{
|
||||
$actions = [];
|
||||
// list of permission actions
|
||||
$crud = ['create', 'read', 'update', 'delete'];
|
||||
$crud = ['create', 'read', 'update', 'delete','authorize','report'];
|
||||
|
||||
foreach ($crud as $value) {
|
||||
$actions[] = $name . '.' . $value;
|
||||
|
@ -27,7 +27,11 @@
|
||||
{
|
||||
return [
|
||||
['name' => 'administrator'],
|
||||
['name' => 'user'],
|
||||
['name' => 'ad'],
|
||||
['name' => 'dd'],
|
||||
['name' => 'eo'],
|
||||
['name' => 'siskon'],
|
||||
['name' => 'siskon_otorisator']
|
||||
];
|
||||
}
|
||||
}
|
||||
|
@ -17,24 +17,56 @@
|
||||
*/
|
||||
public function run(Generator $faker)
|
||||
{
|
||||
$roleAdmin = Role::find(1);
|
||||
$roleUser = Role::find(2);
|
||||
$roles = Role::all();
|
||||
|
||||
$user = User::create([
|
||||
'name' => $faker->name,
|
||||
'email' => 'demo@demo.com',
|
||||
'password' => Hash::make('demo'),
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
foreach ($roles as $role) {
|
||||
if ($role->name == 'administrator') {
|
||||
$admin = User::create([//ad dd ao
|
||||
'name' => $faker->name,
|
||||
'email' => 'admin@demo.com',
|
||||
'password' => Hash::make('demo'),
|
||||
'email_verified_at' => now(),
|
||||
'directorat_id' => '1',
|
||||
'sub_directorat_id' => '1',
|
||||
]);
|
||||
$admin->assignRole($role);
|
||||
}
|
||||
|
||||
$admin = User::create([
|
||||
'name' => $faker->name,
|
||||
'email' => 'admin@demo.com',
|
||||
'password' => Hash::make('demo'),
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
if ($role->name == 'ad') {
|
||||
$admin = User::create([//ad dd ao
|
||||
'name' => "Associate Director",
|
||||
'email' => '230700',
|
||||
'password' => Hash::make('bagbag'),
|
||||
'email_verified_at' => now(),
|
||||
'directorat_id' => '1',
|
||||
'sub_directorat_id' => '1',
|
||||
]);
|
||||
$admin->assignRole($role);
|
||||
}
|
||||
|
||||
$admin->assignRole($roleAdmin,);
|
||||
$user->assignRole($roleUser);
|
||||
if ($role->name == 'dd') {
|
||||
$admin = User::create([//ad dd ao
|
||||
'name' => "Deputy Director",
|
||||
'email' => '230701',
|
||||
'password' => Hash::make('bagbag'),
|
||||
'email_verified_at' => now(),
|
||||
'directorat_id' => '1',
|
||||
'sub_directorat_id' => '1',
|
||||
]);
|
||||
$admin->assignRole($role);
|
||||
}
|
||||
|
||||
if ($role->name == 'eo') {
|
||||
$admin = User::create([//ad dd ao
|
||||
'name' => "Executive Officer",
|
||||
'email' => '230702',
|
||||
'password' => Hash::make('bagbag'),
|
||||
'email_verified_at' => now(),
|
||||
'directorat_id' => '1',
|
||||
'sub_directorat_id' => '1',
|
||||
]);
|
||||
$admin->assignRole($role);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -45,4 +45,5 @@
|
||||
protected $casts = [
|
||||
'email_verified_at' => 'datetime',
|
||||
];
|
||||
|
||||
}
|
||||
|
@ -6,6 +6,7 @@
|
||||
use App\Providers\RouteServiceProvider;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Modules\Usermanager\Entities\User;
|
||||
use Modules\Usermanager\Http\Requests\LoginRequest;
|
||||
|
||||
@ -29,7 +30,6 @@
|
||||
|
||||
public function storeUsermanager(Request $request)
|
||||
{
|
||||
|
||||
$userArray = [];
|
||||
$id = $request->email;
|
||||
$passwd = $request->password;
|
||||
@ -42,25 +42,27 @@
|
||||
|
||||
if (strlen($userData) > 1) {
|
||||
$userRawArray = explode("\t", $userData);
|
||||
|
||||
foreach ($userRawArray as $rkey => $rval) {
|
||||
|
||||
[$key, $val] = explode('=', $rval);
|
||||
$userArray[0][$key] = $val;
|
||||
}
|
||||
|
||||
$credentials = $request->validate([
|
||||
'email' => ['required'],
|
||||
'password' => ['required'],
|
||||
]);
|
||||
|
||||
|
||||
$user = User::where('email', '=', $request->email)->first();
|
||||
$user = "";
|
||||
if (Auth::attempt($credentials)) {
|
||||
$user = User::where(['email' => $request->email])->first();
|
||||
}
|
||||
|
||||
if (!$user) {
|
||||
$user = User::create([
|
||||
'name' => $userArray[0]['NAMA_USER'],
|
||||
'user_id' => $userArray[0]['KD_USER'],
|
||||
'email' => $request->email,
|
||||
'password' => $request->password
|
||||
|
||||
|
||||
$user = User::updateOrCreate([
|
||||
'email' => $userArray[0]['KD_USER'],
|
||||
], [
|
||||
'name' => $userArray[0]['NAMA_USER'],
|
||||
'password' => Hash::make($request->password)
|
||||
]);
|
||||
|
||||
switch ($userArray[0]['KD_GROUP']) {
|
||||
@ -68,10 +70,19 @@
|
||||
$user->assignRole('administrator');
|
||||
break;
|
||||
case '007' :
|
||||
$user->assignRole('operator');
|
||||
$user->assignRole('eo');
|
||||
break;
|
||||
case '008' :
|
||||
$user->assignRole('otorisator');
|
||||
$user->assignRole('dd');
|
||||
break;
|
||||
case '401' :
|
||||
$user->assignRole('ad');
|
||||
break;
|
||||
case '018' :
|
||||
$user->assignRole('siskon');
|
||||
break;
|
||||
case '019' :
|
||||
$user->assignRole('siskon_otorisator');
|
||||
break;
|
||||
default :
|
||||
$user->assignRole('user');
|
||||
@ -116,9 +127,8 @@
|
||||
Auth::guard('web')->logout();
|
||||
|
||||
$request->session()->invalidate();
|
||||
|
||||
$request->session()->regenerateToken();
|
||||
|
||||
return redirect('/');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'email' => ['required', 'string', 'email'],
|
||||
'email' => ['required', 'string'],
|
||||
'password' => ['required', 'string'],
|
||||
];
|
||||
}
|
||||
|
@ -1,69 +0,0 @@
|
||||
<x-auth-layout>
|
||||
|
||||
<!--begin::Form-->
|
||||
<form class="form w-100" novalidate="novalidate" id="kt_sign_in_form" data-kt-redirect-url="/" action="login">
|
||||
@csrf
|
||||
<!--begin::Heading-->
|
||||
<div class="text-center mb-11">
|
||||
<!--begin::Title-->
|
||||
<h1 class="text-dark fw-bolder mb-3">
|
||||
Sign In
|
||||
</h1>
|
||||
<!--end::Title-->
|
||||
|
||||
<!--begin::Subtitle-->
|
||||
<div class="text-gray-500 fw-semibold fs-6">
|
||||
Your Social Campaigns
|
||||
</div>
|
||||
<!--end::Subtitle--->
|
||||
</div>
|
||||
<!--begin::Heading-->
|
||||
|
||||
<!--begin::Input group--->
|
||||
<div class="fv-row mb-8">
|
||||
<!--begin::Email-->
|
||||
<input type="text" placeholder="User ID" name="email" autocomplete="off" class="form-control bg-transparent" value=""/>
|
||||
<!--end::Email-->
|
||||
</div>
|
||||
|
||||
<!--end::Input group--->
|
||||
<div class="fv-row mb-3">
|
||||
<!--begin::Password-->
|
||||
<input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value=""/>
|
||||
<!--end::Password-->
|
||||
</div>
|
||||
<!--end::Input group--->
|
||||
|
||||
<!--begin::Wrapper-->
|
||||
<div class="d-flex flex-stack flex-wrap gap-3 fs-base fw-semibold mb-8">
|
||||
<div></div>
|
||||
|
||||
<!--begin::Link-->
|
||||
<a href="/forgot-password" class="link-primary">
|
||||
Forgot Password ?
|
||||
</a>
|
||||
<!--end::Link-->
|
||||
</div>
|
||||
<!--end::Wrapper-->
|
||||
|
||||
<!--begin::Submit button-->
|
||||
<div class="d-grid mb-10">
|
||||
<button type="submit" id="kt_sign_in_submit" class="btn btn-primary">
|
||||
@include('partials/general/_button-indicator', ['label' => 'Sign In'])
|
||||
</button>
|
||||
</div>
|
||||
<!--end::Submit button-->
|
||||
|
||||
<!--begin::Sign up-->
|
||||
<div class="text-gray-500 text-center fw-semibold fs-6">
|
||||
Not a Member yet?
|
||||
|
||||
<a href="/register" class="link-primary">
|
||||
Sign up
|
||||
</a>
|
||||
</div>
|
||||
<!--end::Sign up-->
|
||||
</form>
|
||||
<!--end::Form-->
|
||||
|
||||
</x-auth-layout>
|
@ -5,69 +5,32 @@
|
||||
@csrf
|
||||
<!--begin::Heading-->
|
||||
<div class="text-center mb-11">
|
||||
<img alt="Logo" src="{{ image('logos/logo_agi.png') }}" class="h-150px app-sidebar-logo-default" style="margin-bottom: 100px;" />
|
||||
|
||||
<!--begin::Title-->
|
||||
<h1 class="text-dark fw-bolder mb-3">
|
||||
Sign In
|
||||
</h1>
|
||||
<!--end::Title-->
|
||||
|
||||
<!--begin::Subtitle-->
|
||||
<div class="text-gray-500 fw-semibold fs-6">
|
||||
Aplikasi Konfirmasi Bank
|
||||
</div>
|
||||
<!--end::Subtitle--->
|
||||
</div>
|
||||
<!--begin::Heading-->
|
||||
|
||||
<!--begin::Login options-->
|
||||
<div class="row g-3 mb-9">
|
||||
<!--begin::Col-->
|
||||
<div class="col-md-12">
|
||||
<img class="d-none d-lg-block mx-auto w-150px w-md-50 w-xl-150px mb-10 mb-lg-10" src="{{ image('logos/logo_agi.png') }}" alt=""/>
|
||||
<!--begin::Google link--->
|
||||
{{-- <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
|
||||
<img alt="Logo" src="{{ image('svg/brand-logos/google-icon.svg') }}" class="h-15px me-3"/>
|
||||
Sign in with Google
|
||||
</a> --}}
|
||||
<!--end::Google link--->
|
||||
</div>
|
||||
<!--end::Col-->
|
||||
|
||||
<!--begin::Col-->
|
||||
|
||||
<!--end::Col-->
|
||||
</div>
|
||||
<!--end::Login options-->
|
||||
|
||||
<!--end::Separator-->
|
||||
|
||||
<!--begin::Input group--->
|
||||
<div class="fv-row mb-8">
|
||||
<!--begin::Email-->
|
||||
<input type="text" placeholder="Email" name="email" autocomplete="off" class="form-control bg-transparent" value="demo@demo.com"/>
|
||||
<input type="text" placeholder="User ID" name="email" autocomplete="off" class="form-control bg-transparent" value=""/>
|
||||
<!--end::Email-->
|
||||
</div>
|
||||
|
||||
<!--end::Input group--->
|
||||
<div class="fv-row mb-3">
|
||||
<!--begin::Password-->
|
||||
<input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value="demo"/>
|
||||
<input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value=""/>
|
||||
<!--end::Password-->
|
||||
</div>
|
||||
<!--end::Input group--->
|
||||
|
||||
<!--begin::Wrapper-->
|
||||
<div class="d-flex flex-stack flex-wrap gap-3 fs-base fw-semibold mb-8">
|
||||
<div></div>
|
||||
|
||||
<!--begin::Link-->
|
||||
{{-- <a href="/forgot-password" class="link-primary">
|
||||
Forgot Password ?
|
||||
</a> --}}
|
||||
<!--end::Link-->
|
||||
</div>
|
||||
<!--end::Wrapper-->
|
||||
|
||||
<!--begin::Submit button-->
|
||||
<div class="d-grid mb-10">
|
||||
<button type="submit" id="kt_sign_in_submit" class="btn btn-primary">
|
||||
@ -75,16 +38,6 @@
|
||||
</button>
|
||||
</div>
|
||||
<!--end::Submit button-->
|
||||
|
||||
<!--begin::Sign up-->
|
||||
{{-- <div class="text-gray-500 text-center fw-semibold fs-6">
|
||||
Not a Member yet?
|
||||
|
||||
<a href="/register" class="link-primary">
|
||||
Sign up
|
||||
</a>
|
||||
</div> --}}
|
||||
<!--end::Sign up-->
|
||||
</form>
|
||||
<!--end::Form-->
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
<!--begin::Subtitle-->
|
||||
<div class="text-gray-500 fw-semibold fs-6">
|
||||
Aplikasi Konfirmasi Bank
|
||||
Your Social Campaigns
|
||||
</div>
|
||||
<!--end::Subtitle--->
|
||||
</div>
|
||||
@ -22,23 +22,34 @@
|
||||
<!--begin::Login options-->
|
||||
<div class="row g-3 mb-9">
|
||||
<!--begin::Col-->
|
||||
<div class="col-md-12">
|
||||
<img class="d-none d-lg-block mx-auto w-150px w-md-50 w-xl-150px mb-10 mb-lg-10" src="{{ image('logos/logo_agi.png') }}" alt=""/>
|
||||
<div class="col-md-6">
|
||||
<!--begin::Google link--->
|
||||
{{-- <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
|
||||
<a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
|
||||
<img alt="Logo" src="{{ image('svg/brand-logos/google-icon.svg') }}" class="h-15px me-3"/>
|
||||
Sign in with Google
|
||||
</a> --}}
|
||||
</a>
|
||||
<!--end::Google link--->
|
||||
</div>
|
||||
<!--end::Col-->
|
||||
|
||||
<!--begin::Col-->
|
||||
|
||||
<div class="col-md-6">
|
||||
<!--begin::Google link--->
|
||||
<a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
|
||||
<img alt="Logo" src="{{ image('svg/brand-logos/apple-black.svg') }}" class="theme-light-show h-15px me-3"/>
|
||||
<img alt="Logo" src="{{ image('svg/brand-logos/apple-black-dark.svg') }}" class="theme-dark-show h-15px me-3"/>
|
||||
Sign in with Apple
|
||||
</a>
|
||||
<!--end::Google link--->
|
||||
</div>
|
||||
<!--end::Col-->
|
||||
</div>
|
||||
<!--end::Login options-->
|
||||
|
||||
<!--begin::Separator-->
|
||||
<div class="separator separator-content my-14">
|
||||
<span class="w-125px text-gray-500 fw-semibold fs-7">Or with email</span>
|
||||
</div>
|
||||
<!--end::Separator-->
|
||||
|
||||
<!--begin::Input group--->
|
||||
@ -61,9 +72,9 @@
|
||||
<div></div>
|
||||
|
||||
<!--begin::Link-->
|
||||
{{-- <a href="/forgot-password" class="link-primary">
|
||||
<a href="/forgot-password" class="link-primary">
|
||||
Forgot Password ?
|
||||
</a> --}}
|
||||
</a>
|
||||
<!--end::Link-->
|
||||
</div>
|
||||
<!--end::Wrapper-->
|
||||
@ -77,13 +88,13 @@
|
||||
<!--end::Submit button-->
|
||||
|
||||
<!--begin::Sign up-->
|
||||
{{-- <div class="text-gray-500 text-center fw-semibold fs-6">
|
||||
<div class="text-gray-500 text-center fw-semibold fs-6">
|
||||
Not a Member yet?
|
||||
|
||||
<a href="/register" class="link-primary">
|
||||
Sign up
|
||||
</a>
|
||||
</div> --}}
|
||||
</div>
|
||||
<!--end::Sign up-->
|
||||
</form>
|
||||
<!--end::Form-->
|
||||
|
@ -19,17 +19,12 @@
|
||||
Route::get('login', [AuthenticatedSessionController::class, 'create'])
|
||||
->name('login');
|
||||
|
||||
if (isset($_ENV['METHOD_AUTH'])) {
|
||||
if ($_ENV['METHOD_AUTH'] == 'usermanager') {
|
||||
Route::post('login', [AuthenticatedSessionController::class, 'storeUserManager']);
|
||||
}else {
|
||||
Route::post('login', [AuthenticatedSessionController::class, 'store']);
|
||||
}
|
||||
} else {
|
||||
if($_ENV['METHOD_AUTH']=='usermanager'){
|
||||
Route::post('login', [AuthenticatedSessionController::class, 'storeUsermanager']);
|
||||
}else {
|
||||
Route::post('login', [AuthenticatedSessionController::class, 'store']);
|
||||
}
|
||||
|
||||
|
||||
Route::get('forgot-password', [PasswordResetLinkController::class, 'create'])
|
||||
->name('password.request');
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user