Commit 90adc126 authored by Noorindria Mayrien  Nariswari 's avatar Noorindria Mayrien Nariswari
Browse files

Merge branch 'main' into sistem-keamanan-informasi

Showing with 260 additions and 88 deletions
+260 -88
......@@ -4,48 +4,35 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\LoginRequest;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route;
use Inertia\Inertia;
use Inertia\Response;
class AuthenticatedSessionController extends Controller
{
/**
* Show the login page.
*/
public function create(Request $request): Response
{
return Inertia::render('auth/Login', [
'canResetPassword' => Route::has('password.request'),
'status' => $request->session()->get('status'),
]);
}
/**
* Handle an incoming authentication request.
*/
public function store(LoginRequest $request): RedirectResponse
public function store(LoginRequest $request): Response
{
$request->authenticate();
$request->session()->regenerate();
return redirect()->intended(route('dashboard', absolute: false));
return response()->noContent();
}
/**
* Destroy an authenticated session.
*/
public function destroy(Request $request): RedirectResponse
public function destroy(Request $request): Response
{
Auth::guard('web')->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();
return redirect('/');
return response()->noContent();
}
}
......@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
......@@ -11,14 +12,14 @@ class EmailVerificationNotificationController extends Controller
/**
* Send a new email verification notification.
*/
public function store(Request $request): RedirectResponse
public function store(Request $request): JsonResponse|RedirectResponse
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(route('dashboard', absolute: false));
return redirect()->intended('/dashboard');
}
$request->user()->sendEmailVerificationNotification();
return back()->with('status', 'verification-link-sent');
return response()->json(['status' => 'verification-link-sent']);
}
}
......@@ -4,39 +4,26 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Str;
use Illuminate\Validation\Rules;
use Illuminate\Validation\ValidationException;
use Inertia\Inertia;
use Inertia\Response;
class NewPasswordController extends Controller
{
/**
* Show the password reset page.
*/
public function create(Request $request): Response
{
return Inertia::render('auth/ResetPassword', [
'email' => $request->email,
'token' => $request->route('token'),
]);
}
/**
* Handle an incoming new password request.
*
* @throws \Illuminate\Validation\ValidationException
*/
public function store(Request $request): RedirectResponse
public function store(Request $request): JsonResponse
{
$request->validate([
'token' => 'required',
'email' => 'required|email',
'token' => ['required'],
'email' => ['required', 'email'],
'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);
......@@ -47,7 +34,7 @@ class NewPasswordController extends Controller
$request->only('email', 'password', 'password_confirmation', 'token'),
function ($user) use ($request) {
$user->forceFill([
'password' => Hash::make($request->password),
'password' => Hash::make($request->string('password')),
'remember_token' => Str::random(60),
])->save();
......@@ -55,15 +42,12 @@ class NewPasswordController extends Controller
}
);
// If the password was successfully reset, we will redirect the user back to
// the application's home authenticated view. If there is an error we can
// redirect them back to where they came from with their error message.
if ($status == Password::PasswordReset) {
return to_route('login')->with('status', __($status));
if ($status != Password::PASSWORD_RESET) {
throw ValidationException::withMessages([
'email' => [__($status)],
]);
}
throw ValidationException::withMessages([
'email' => [__($status)],
]);
return response()->json(['status' => __($status)]);
}
}
......@@ -3,39 +3,37 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
use Inertia\Inertia;
use Inertia\Response;
use Illuminate\Validation\ValidationException;
class PasswordResetLinkController extends Controller
{
/**
* Show the password reset link request page.
*/
public function create(Request $request): Response
{
return Inertia::render('auth/ForgotPassword', [
'status' => $request->session()->get('status'),
]);
}
/**
* Handle an incoming password reset link request.
*
* @throws \Illuminate\Validation\ValidationException
*/
public function store(Request $request): RedirectResponse
public function store(Request $request): JsonResponse
{
$request->validate([
'email' => 'required|email',
'email' => ['required', 'email'],
]);
Password::sendResetLink(
// We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response.
$status = Password::sendResetLink(
$request->only('email')
);
return back()->with('status', __('A reset link will be sent if the account exists.'));
if ($status != Password::RESET_LINK_SENT) {
throw ValidationException::withMessages([
'email' => [__($status)],
]);
}
return response()->json(['status' => __($status)]);
}
}
......@@ -5,47 +5,37 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Auth\Events\Registered;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rules;
use Inertia\Inertia;
use Inertia\Response;
class RegisteredUserController extends Controller
{
/**
* Show the registration page.
*/
public function create(): Response
{
return Inertia::render('auth/Register');
}
/**
* Handle an incoming registration request.
*
* @throws \Illuminate\Validation\ValidationException
*/
public function store(Request $request): RedirectResponse
public function store(Request $request): Response
{
$request->validate([
'name' => 'required|string|max:255',
'email' => 'required|string|lowercase|email|max:255|unique:'.User::class,
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class],
'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);
$user = User::create([
'name' => $request->name,
'email' => $request->email,
'password' => Hash::make($request->password),
'password' => Hash::make($request->string('password')),
]);
event(new Registered($user));
Auth::login($user);
return to_route('dashboard');
return response()->noContent();
}
}
......@@ -15,15 +15,17 @@ class VerifyEmailController extends Controller
public function __invoke(EmailVerificationRequest $request): RedirectResponse
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
return redirect()->intended(
config('app.frontend_url').'/dashboard?verified=1'
);
}
if ($request->user()->markEmailAsVerified()) {
/** @var \Illuminate\Contracts\Auth\MustVerifyEmail $user */
$user = $request->user();
event(new Verified($user));
event(new Verified($request->user()));
}
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
return redirect()->intended(
config('app.frontend_url').'/dashboard?verified=1'
);
}
}
<?php
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class UserController extends Controller
{
public function index()
{
return response()->json([
'users' => [
['id' => 1, 'name' => 'Azka'],
['id' => 2, 'name' => 'Sekar']
]
]);
}
}
?>
\ No newline at end of file
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class EnsureEmailIsVerified
{
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
if (! $request->user() ||
($request->user() instanceof MustVerifyEmail &&
! $request->user()->hasVerifiedEmail())) {
return response()->json(['message' => 'Your email address is not verified.'], 409);
}
return $next($request);
}
}
......@@ -45,7 +45,7 @@ class LoginRequest extends FormRequest
RateLimiter::hit($this->throttleKey());
throw ValidationException::withMessages([
'email' => trans('auth.failed'),
'email' => __('auth.failed'),
]);
}
......@@ -80,6 +80,6 @@ class LoginRequest extends FormRequest
*/
public function throttleKey(): string
{
return Str::transliterate(Str::lower($this->string('email')).'|'.$this->ip());
return Str::transliterate(Str::lower($this->input('email')).'|'.$this->ip());
}
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Admin extends Model
{
use HasFactory;
protected $fillable = [
'nip',
'id_opd',
'id_bidang',
'password',
'nama',
'email',
];
// admin n opd 1:1
public function opd()
{
return $this->belongsTo(Opd::class,'id_opd');
}
// admin membuat laporan monev 1:N
public function laporanMonev()
{
return $this->hasMany(LaporanMonev::class);
}
// admin n bidang layanan 1:1
public function bidangLayanan()
{
return $this->belongsTo(BidangLayanan::class,'id_bidang');
}
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Asesor extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Assessment extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class BidangLayanan extends Model
{
use HasFactory;
protected $fillable = [
'nama',
];
// superadmin n bidang layanan one to one kan?
public function superadmin()
{
return $this->hasOne(Superadmin::class,'id_superadmin');
}
// bidang n admin 1:1
public function admin()
{
return $this->hasOne(Admin::class,'id_admin');
}
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class FrekuensiUpdate extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class HasilAssessment extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class JenisLayanan extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class JenisSubdomain extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Kategori extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class KategoriSubdomain extends Model
{
//
}
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class LaporanMonev extends Model
{
//
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment