A free open source IT asset/license management system
Check for “stale” acceptance
sniped92ec582fa48
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex e3fd14150f..7295a9995b 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -7,8 +7,14 @@ use App\Events\CheckoutDeclined;use App\Helpers\Helper;use App\Http\Controllers\Controller;use App\Mail\CheckoutAcceptanceResponseMail;+use App\Models\Accessory;+use App\Models\Actionlog;+use App\Models\Asset;use App\Models\CheckoutAcceptance;use App\Models\Company;+use App\Models\Consumable;+use App\Models\License;+use App\Models\LicenseSeat;use App\Models\Setting;use App\Models\User;use App\Notifications\AcceptanceItemAcceptedNotification;@@ -30,8 +36,7 @@ class AcceptanceController extends Controller*/public function index(): View{- $currentUser = $this->currentUser();- $acceptances = CheckoutAcceptance::forUser($currentUser)->pending()->get();+ $acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get();return view('account/accept.index', compact('acceptances'));}@@ -41,17 +46,26 @@ class AcceptanceController extends Controller** @param int $id*/- public function create($id): View|RedirectResponse+ public function create(Request $request, $id): View|RedirectResponse{- $currentUser = $this->currentUser();+ $currentUser = auth()->user();++ if (!$currentUser instanceof User) {+ abort(403, trans('general.insufficient_permissions'));+ }+$acceptance = CheckoutAcceptance::find($id);- $isSignInPlaceAdminFlow = false;- if (is_null($acceptance)) {+ if (!$acceptance) {return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));}if (! $acceptance->isPending()) {+ if ($this->isStaleSignInPlaceAdminAttempt($acceptance, $currentUser)) {+ return $this->redirectToIntendedSignInPlaceDestination($request, $acceptance)+ ->with('warning', trans('admin/users/message.error.asset_already_accepted'));+ }+return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));}@@ -65,7 +79,10 @@ class AcceptanceController extends Controllerreturn redirect()->route('account.accept')->with('error', trans('general.error_user_company'));}- return view('account/accept.create', compact('acceptance', 'isSignInPlaceAdminFlow'));+ $checkedOutAt = Helper::getFormattedDateObject($acceptance->created_at, 'datetime', false);+ $checkedOutBy = $this->resolveCheckoutActorName($acceptance);++ return view('account/accept.create', compact('acceptance', 'isSignInPlaceAdminFlow', 'checkedOutAt', 'checkedOutBy'));}/**@@ -75,17 +92,30 @@ class AcceptanceController extends Controller*/public function store(Request $request, $id): RedirectResponse{- $currentUser = $this->currentUser();+ $currentUser = auth()->user();- if (! $acceptance = CheckoutAcceptance::find($id)) {+ if (!$currentUser instanceof User) {+ abort(403, trans('general.insufficient_permissions'));+ }++ $acceptance = CheckoutAcceptance::find($id);++ if (!$acceptance) {return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));}- $assigned_user = User::find($acceptance->assigned_to_id);+ $assignedUser = User::find($acceptance->assigned_to_id);$settings = Setting::getSettings();+ $requiresSignature = (string) $settings->require_accept_signature === '1';$sig_filename = '';+ $encodedSignatureImage = null;if (! $acceptance->isPending()) {+ if ($this->isStaleSignInPlaceAdminAttempt($acceptance, $currentUser)) {+ return $this->redirectToIntendedSignInPlaceDestination($request, $acceptance)+ ->with('warning', trans('admin/users/message.error.asset_already_accepted'));+ }+return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));}@@ -120,14 +150,25 @@ class AcceptanceController extends Controller$item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);// If signatures are required, make sure we have one- if (Setting::getSettings()->require_accept_signature == '1') {+ if ($requiresSignature) {// The item was accepted, check for a signatureif ($request->filled('signature_output')) {$sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png';- $data_uri = $request->input('signature_output');- $encoded_image = explode(',', $data_uri);- $decoded_image = base64_decode($encoded_image[1]);+ $dataUri = (string) $request->input('signature_output');+ $encodedSignatureImage = Str::contains($dataUri, ',')+ ? Str::after($dataUri, ',')+ : $dataUri;++ $decoded_image = base64_decode($encodedSignatureImage, true);++ if ($decoded_image === false) {+ return redirect()->back()->with('error', trans('general.shitty_browser'));+ }++ $decoded_image = $this->flattenSignatureBackgroundToWhite($decoded_image);+ $encodedSignatureImage = base64_encode($decoded_image);+Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);// No image data is present, kick them back.@@ -156,18 +197,18 @@ class AcceptanceController extends Controller'check_out_date' => Helper::getFormattedDateObject($acceptance->created_at, 'datetime', false),'accepted_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),'declined_date' => Helper::getFormattedDateObject(now()->format('Y-m-d H:i:s'), 'datetime', false),- 'assigned_to' => $assigned_user->display_name,- 'email' => $assigned_user->email,- 'employee_num' => $assigned_user->employee_num,+ 'assigned_to' => $assignedUser->display_name,+ 'email' => $assignedUser->email,+ 'employee_num' => $assignedUser->employee_num,'site_name' => $settings->site_name,'company_name' => $item->company?->name ?? $settings->site_name,- 'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,+ 'signature' => ($sig_filename !== '') ? $encodedSignatureImage : null,'logo' => ($encoded_logo) ?? null,'date_settings' => $settings->date_display_format,'qty' => $acceptance->qty ?? 1,];- if ($request->input('asset_acceptance') == 'accepted') {+ if ($request->input('asset_acceptance') === 'accepted') {$pdf_filename = 'accepted-'.$acceptance->checkoutable_id.'-'.$acceptance->display_checkoutable_type.'-eula-'.date('Y-m-d-h-i-s').'.pdf';@@ -179,12 +220,12 @@ class AcceptanceController extends Controller$acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));// Send the PDF to the signing user- if (($request->input('send_copy') == '1') && ($assigned_user->email != '')) {+ if (($request->input('send_copy') === '1') && ($assignedUser->email !== '')) {// Add the attachment for the signing user into the $data array$data['file'] = $pdf_filename;try {- $assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));+ $assignedUser->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assignedUser->locale));} catch (Exception $e) {Log::warning($e);}@@ -223,7 +264,7 @@ class AcceptanceController extends Controller$recipient,$request->input('asset_acceptance') === 'accepted',));- Log::debug('Send email notification sucess on checkout acceptance response.');+ Log::debug('Send email notification success on checkout acceptance response.');}} catch (Exception $e) {Log::error($e->getMessage());@@ -232,7 +273,7 @@ class AcceptanceController extends Controller}if ($isSignInPlaceAdminFlow) {- $request->request->add(['assigned_user' => $assigned_user?->id]);+ $request->request->add(['assigned_user' => $assignedUser?->id]);$redirect = Helper::getRedirectOption($request,@@ -261,14 +302,133 @@ class AcceptanceController extends Controller&& ($currentUser?->can('checkout', $acceptance->checkoutable));}- private function currentUser(): User+ private function resolveCheckoutActorName(CheckoutAcceptance $acceptance): ?string{- $user = auth()->user();+ [$itemType, $itemId] = $this->resolveCheckoutLogItem($acceptance);++ $checkoutLog = Actionlog::query()+ ->where('action_type', 'checkout')+ ->where('item_type', $itemType)+ ->where('item_id', $itemId)+ ->where('target_type', User::class)+ ->where('target_id', $acceptance->assigned_to_id)+ ->where('created_at', '<=', $acceptance->created_at->copy()->addMinutes(5))+ ->latest('id')+ ->first();++ return $checkoutLog?->adminuser?->display_name;+ }- if (! $user instanceof User) {- abort(403, trans('general.insufficient_permissions'));+ /**+ * Action logs normalize license seat checkouts to the parent license.+ *+ * @return array{0: class-string, 1: int}+ */+ private function resolveCheckoutLogItem(CheckoutAcceptance $acceptance): array+ {+ $checkoutable = $acceptance->checkoutable;++ if ($checkoutable instanceof LicenseSeat) {+ return [License::class, (int) $checkoutable->license_id];+ }++ return [$acceptance->checkoutable_type, (int) $acceptance->checkoutable_id];+ }++ private function isStaleSignInPlaceAdminAttempt(CheckoutAcceptance $acceptance, User $currentUser): bool+ {+ $redirectOption = session('redirect_option');+ $checkoutToType = session('checkout_to_type');++ if (session('sign_in_place') !== true) {+ return false;+ }++ if ($redirectOption === null) {+ return false;+ }++ if ($redirectOption === 'target' && $checkoutToType === 'user' && empty($acceptance->assigned_to_id)) {+ return false;+ }++ return !$acceptance->isCheckedOutTo($currentUser)+ && $currentUser->can('checkout', $acceptance->checkoutable)+ && ($checkoutToType === 'user');+ }++ private function redirectToIntendedSignInPlaceDestination(Request $request, CheckoutAcceptance $acceptance): RedirectResponse+ {+ if (empty($acceptance->assigned_to_id)) {+ return redirect()->route('account.accept');}- return $user;+ [$itemId, $resourceType] = $this->resolveRedirectTarget($acceptance);++ $request->request->add(['assigned_user' => $acceptance->assigned_to_id]);++ return Helper::getRedirectOption($request, $itemId, $resourceType);+ }++ /**+ * @return array{0: int, 1: string}+ */+ private function resolveRedirectTarget(CheckoutAcceptance $acceptance): array+ {+ $checkoutable = $acceptance->checkoutable;++ if ($checkoutable instanceof Asset) {+ return [(int) $checkoutable->id, 'Assets'];+ }++ if ($checkoutable instanceof Accessory) {+ return [(int) $checkoutable->id, 'Accessories'];+ }++ if ($checkoutable instanceof Consumable) {+ return [(int) $checkoutable->id, 'Consumables'];+ }++ if ($checkoutable instanceof LicenseSeat) {+ return [(int) $checkoutable->license_id, 'Licenses'];+ }++ return [(int) $acceptance->checkoutable_id, session('sign_in_place_resource_type', 'Assets')];+ }++ private function flattenSignatureBackgroundToWhite(string $signatureBinary): string+ {+ if (!function_exists('imagecreatefromstring') || !function_exists('imagecreatetruecolor')) {+ return $signatureBinary;+ }++ $source = @imagecreatefromstring($signatureBinary);++ if ($source === false) {+ return $signatureBinary;+ }++ $width = imagesx($source);+ $height = imagesy($source);+ $flattened = imagecreatetruecolor($width, $height);++ if ($flattened === false) {+ imagedestroy($source);++ return $signatureBinary;+ }++ $white = imagecolorallocate($flattened, 255, 255, 255);+ imagefilledrectangle($flattened, 0, 0, $width, $height, $white);+ imagecopy($flattened, $source, 0, 0, 0, 0, $width, $height);++ ob_start();+ imagepng($flattened);+ $output = ob_get_clean();++ imagedestroy($source);+ imagedestroy($flattened);++ return is_string($output) ? $output : $signatureBinary;}}