Update project name and description in composer.json; add two-factor authentication to User model; enhance Nova fields with default value settings; implement new helper methods for default selections; add migration for two-factor columns in users table.

laravelwebdev · laravelwebdev · commit 69f001686e2c · 2025-01-19T12:42:35.000Z
diff --git a/Tasks.todo b/Tasks.todo
@@ -1,10 +1,12 @@
 Daftar Auth key
-    "username": "info@smartbee.az",
-    "password": "vgvbxXdV64ul1FOXcJ79P35uKyYDM9GNsKDn8BpVrqS2WmWxHa"
-    "username": "dtri@happyonline.gr",
-    "password": "ltzgXfPs3l1pPFSimukD4E1tvYFF64GlEP8WrL7qEfymhYFUoD"
+"username": "info@smartbee.az",
+"password": "vgvbxXdV64ul1FOXcJ79P35uKyYDM9GNsKDn8BpVrqS2WmWxHa"
+"username": "dtri@happyonline.gr",
+"password": "ltzgXfPs3l1pPFSimukD4E1tvYFF64GlEP8WrL7qEfymhYFUoD"
 "username": "corentin@aftomatos.com",
 "password": "xOuUFewnwIrffjnoHwgMZLWSrBH9d8sIFsqjmilOOKbbtvAFlh"
+"username": "Therocktavern.grenoble@gmail.com",
+"password": "n23SNywoI1Zer8zaU675ncXBSNl4r9UN9fVaMnJbsXCjhvfV8m"
 
 
 
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
@@ -704,6 +704,14 @@ public static function getUsersByPengelola($role, $tanggal)
         return User::cache()->get('all')->whereIn('id', $usersId);
     }
 
+    public static function setDefaultPengelola($role, $tanggal)
+    {
+        $pengelola = self::getUsersByPengelola($role, $tanggal);
+
+        return $pengelola->count() == 1 ? $pengelola->first()->id : null;
+
+    }
+
     public static function setDefaultPesertaRapat($tujuan, $tanggal)
     {
         Str::contains(Str::lower($tujuan), ['ketua', 'penanggung', 'penanggungjawab']) ? $role = 'koordinator' : $role = 'anggota';
@@ -1703,6 +1711,13 @@ public static function setOptionTemplate($jenis)
         return self::setOptions(Template::cache()->get('all')->where('jenis', $jenis), 'id', 'nama');
     }
 
+    public static function setDefaultTemplate($jenis)
+    {
+        $template = Template::cache()->get('all')->where('jenis', $jenis);
+
+        return $template->count() == 1 ? $template->first()->id : null;
+    }
+
     public static function setOptionsRo($dipa_id)
     {
         return KamusAnggaran::cache()
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -6,12 +6,13 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Laravel\Fortify\TwoFactorAuthenticatable;
 use Mostafaznv\LaraCache\CacheEntity;
 use Mostafaznv\LaraCache\Traits\LaraCache;
 
 class User extends Authenticatable
 {
-    use LaraCache, Notifiable;
+    use LaraCache, Notifiable, TwoFactorAuthenticatable;
 
     public static function cacheEntities(): array
     {
diff --git a/app/Nova/Actions/Download.php b/app/Nova/Actions/Download.php
@@ -89,7 +89,8 @@ public function fields(NovaRequest $request)
                 ->default(fn () => uniqid()),
             Select::make('Template')
                 ->rules('required')
-                ->options(Helper::setOptionTemplate($this->jenis)),
+                ->options(Helper::setOptionTemplate($this->jenis))
+                ->default(Helper::setDefaultTemplate($this->jenis)),
         ];
 
         if ($this->withTanggal) {
@@ -103,7 +104,8 @@ public function fields(NovaRequest $request)
                 ->rules('required')
                 ->searchable()
                 ->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) {
-                    $field->options(Helper::setOptionPengelola($this->role, $form->tanggal));
+                    $field->options(Helper::setOptionPengelola($this->role, $form->tanggal))
+                        ->setValue(Helper::setDefaultPengelola($this->role, $form->tanggal));
                 });
         }
 
diff --git a/app/Nova/Actions/SetStatus.php b/app/Nova/Actions/SetStatus.php
@@ -18,11 +18,17 @@ class SetStatus extends Action
     use InteractsWithQueue, Queueable;
 
     protected $status;
+
     protected bool $withTanggal = false;
+
     protected $statusField;
+
     protected bool $withUser = false;
+
     protected $column;
+
     protected $userColumn;
+
     protected $parent_id;
 
     public function setName($name)
@@ -103,7 +109,8 @@ public function fields(NovaRequest $request)
                 ->searchable()
                 ->rules('required')
                 ->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) {
-                    $field->options(Helper::setOptionPengelola('kepala', $form->tanggal));
+                    $field->options(Helper::setOptionPengelola('kepala', $form->tanggal))
+                        ->setValue(Helper::setDefaultPengelola('kepala', $form->tanggal));
                 });
         }
 
diff --git a/app/Nova/BastMitra.php b/app/Nova/BastMitra.php
@@ -110,7 +110,8 @@ public function fields(NovaRequest $request)
                     ->onlyOnForms()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)));
+                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)));
                     }),
                 BelongsTo::make('Pejabat Pembuat Komitmen', 'ppk', 'App\Nova\User')
                     ->sortable()
diff --git a/app/Nova/DaftarPesertaPerjalanan.php b/app/Nova/DaftarPesertaPerjalanan.php
@@ -102,7 +102,8 @@ public function fields(NovaRequest $request)
                     ->dependsOn('tanggal_kuitansi', function (Select $field, NovaRequest $request, FormData $formData) {
                         $field
                             ->rules('required')
-                            ->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)));
+                            ->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)));
                     }),
                 Select::make('Bendahara', 'bendahara_user_id')
                     ->searchable()
@@ -111,7 +112,8 @@ public function fields(NovaRequest $request)
                     ->dependsOn('tanggal_kuitansi', function (Select $field, NovaRequest $request, FormData $formData) {
                         $field
                             ->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi)))
-                            ->rules('required');
+                            ->rules('required')
+                            ->setValue(Helper::setDefaultPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi)));
                     }),
             ]),
         ];
diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php
@@ -231,7 +231,8 @@ public function fields(NovaRequest $request)
                         if ($formData->generate_sk) {
                             $field->show()
                                 ->rules('required')
-                                ->options(Helper::setOptionPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)));
+                                ->options(Helper::setOptionPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)))
+                                ->setValue(Helper::setDefaultPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)));
                         }
                     }),
             ]),
@@ -287,7 +288,8 @@ public function fields(NovaRequest $request)
                         if ($formData->generate_st) {
                             $field->show()
                                 ->rules('required')
-                                ->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
+                                ->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)))
+                                ->setValue(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
                         }
                     }),
             ]),
@@ -302,23 +304,26 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal_spj)))
+                            ->setValue(Helper::setDefaultPengelola('koordinator', Helper::createDateFromString($formData->tanggal_spj)));
                     }),
                 Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
                     ->rules('required')
                     ->searchable()
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spj)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_spj)));
                     }),
                 Select::make('Bendahara', 'bendahara_user_id')
                     ->rules('required')
                     ->searchable()
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)))
+                            ->setValue(Helper::setDefaultPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)));
                     }),
             ]),
             Tab::group('Daftar Honor', [
diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php
@@ -328,14 +328,16 @@ public function pengelolaFields()
                 ->searchable()
                 ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                 ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                    $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal)));
+                    $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal)))
+                        ->setValue(Helper::setDefaultPengelola('koordinator', Helper::createDateFromString($formData->tanggal)));
                 }),
             Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
                 ->rules('required')
                 ->searchable()
                 ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                 ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                    $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal)));
+                    $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal)))
+                        ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal)));
                 }),
 
         ];
diff --git a/app/Nova/KontrakMitra.php b/app/Nova/KontrakMitra.php
@@ -136,7 +136,8 @@ public function fields(NovaRequest $request)
                     ->onlyOnForms()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_spk', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spk)));
+                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spk)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_spk)));
                     }),
 
                 Status::make('Status', 'status')
diff --git a/app/Nova/PembelianPersediaan.php b/app/Nova/PembelianPersediaan.php
@@ -109,7 +109,8 @@ public function fields(NovaRequest $request)
                     ->searchable()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)));
+                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)));
                     })
                     ->canSee(fn () => Policy::make()
                         ->allowedFor('bmn')
@@ -122,7 +123,8 @@ public function fields(NovaRequest $request)
                     ->searchable()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('bmn', Helper::createDateFromString($formData->tanggal_bast)));
+                        $field->options(Helper::setOptionPengelola('bmn', Helper::createDateFromString($formData->tanggal_bast)))
+                            ->setValue(Helper::setDefaultPengelola('bmn', Helper::createDateFromString($formData->tanggal_bast)));
                     })
                     ->canSee(fn () => Policy::make()
                         ->allowedFor('bmn')
diff --git a/app/Nova/PerjalananDinas.php b/app/Nova/PerjalananDinas.php
@@ -131,7 +131,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_st', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
+                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)))
+                            ->setValue(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
                     }),
             ]),
             Panel::make('Surat Perjalanan Dinas', [
@@ -153,7 +154,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_spd', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spd)));
+                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spd)))
+                            ->setValue(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_spd)));
                     }),
             ]),
             Date::make('Tanggal Berangkat', 'tanggal_berangkat')
diff --git a/app/Nova/PermintaanPersediaan.php b/app/Nova/PermintaanPersediaan.php
@@ -113,7 +113,8 @@ public function fields(NovaRequest $request)
                 ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                 ->dependsOn('tanggal_persetujuan', function (Select $field, NovaRequest $request, FormData $formData) {
                     $field->options(Helper::setOptionPengelola('bmn', Helper::createDateFromString($formData->tanggal_persetujuan)))
-                        ->rules('required');
+                        ->rules('required')
+                        ->setValue(Helper::setDefaultPengelola('bmn', Helper::createDateFromString($formData->tanggal_persetujuan)));
                 })
                 ->canSee(fn () => Policy::make()
                     ->allowedFor('bmn')
diff --git a/app/Nova/RapatInternal.php b/app/Nova/RapatInternal.php
@@ -116,7 +116,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal)));
+                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal)))
+                            ->setValue(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal)));
                     }),
             ]),
             Panel::make('Daftar Hadir', [
@@ -131,7 +132,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
                     ->dependsOn('tanggal_rapat', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kasubbag', Helper::createDateFromString($formData->tanggal_rapat)));
+                        $field->options(Helper::setOptionPengelola('kasubbag', Helper::createDateFromString($formData->tanggal_rapat)))
+                            ->setValue(Helper::setDefaultPengelola('kasubbag', Helper::createDateFromString($formData->tanggal_rapat)));
                     }),
             ]),
             Panel::make('Notula', [
diff --git a/app/Providers/NovaServiceProvider.php b/app/Providers/NovaServiceProvider.php
@@ -3,6 +3,8 @@
 namespace App\Providers;
 
 use App\Helpers\Policy;
+use App\Models\Pengelola;
+use App\Models\User as UserModel;
 use App\Nova\BastMitra;
 use App\Nova\DaftarKegiatan;
 use App\Nova\DaftarReminder;
@@ -46,7 +48,9 @@
 use App\Nova\UserEksternal;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Hash;
 use Laravel\Fortify\Features;
+use Laravel\Fortify\Fortify;
 use Laravel\Nova\Menu\Menu;
 use Laravel\Nova\Menu\MenuGroup;
 use Laravel\Nova\Menu\MenuItem;
@@ -180,6 +184,24 @@ public function boot()
         });
         Nova::withBreadcrumbs();
         Nova::showUnreadCountInNotificationCenter();
+
+        // Modify Login Auth
+        Fortify::authenticateUsing(function (Request $request) {
+
+            $user = UserModel::where('email', $request->email)
+                ->orWhereRaw('LEFT(email ,LOCATE("@", email) -1) = ?', [$request->email])
+                ->first();
+
+            if ($user &&
+                Hash::check($request->password, $user->password)) {
+                $roles = Pengelola::cache()->get('all')->where('user_id', $user->id)->whereNull('inactive')->pluck('role')->toArray();
+                session(['role' => $roles]);
+                session(['year' => $request->year]);
+
+                return $user;
+            }
+        });
+
     }
 
     /**
@@ -216,6 +238,14 @@ protected function fortify(): void
         Nova::fortify()
             ->features([
                 Features::updatePasswords(),
+                Features::twoFactorAuthentication(
+                    [
+                        'confirm' => true,
+                        'confirmPassword' => true,
+                        'window' => 0,
+                    ]
+                ),
+
             ])
             ->register();
     }
diff --git a/composer.json b/composer.json
diff --git a/database/migrations/2025_01_19_180705_add_two_factor_columns_to_users_table.php b/database/migrations/2025_01_19_180705_add_two_factor_columns_to_users_table.php

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,13 @@`
`6`	`6`	`use Illuminate\Database\Eloquent\Relations\HasMany;`
`7`	`7`	`use Illuminate\Foundation\Auth\User as Authenticatable;`
`8`	`8`	`use Illuminate\Notifications\Notifiable;`
	`9`	`+use Laravel\Fortify\TwoFactorAuthenticatable;`
`9`	`10`	`use Mostafaznv\LaraCache\CacheEntity;`
`10`	`11`	`use Mostafaznv\LaraCache\Traits\LaraCache;`
`11`	`12`
`12`	`13`	`class User extends Authenticatable`
`13`	`14`	`{`
`14`		`- use LaraCache, Notifiable;`
	`15`	`+ use LaraCache, Notifiable, TwoFactorAuthenticatable;`
`15`	`16`
`16`	`17`	`public static function cacheEntities(): array`
`17`	`18`	`{`