extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2024-11-22 16:23:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete possible orphan icon when updating a twofaccount

Browse Source
This commit is contained in:
Bubka 2020-01-27 13:56:19 +01:00
parent 52ac639940
commit 59fe66710a
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/TwoFAccountController.php
View File

@ -92,7 +92,22 @@ public function update(Request $request, $id)
'service' => 'required',
]);
$twofaccount = TwoFAccount::FindOrFail($id);
// Here we catch a possible missing model exception in order to
// delete orphan submited icon
try {
$twofaccount = TwoFAccount::FindOrFail($id);
} catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
if( $request->icon ) {
Storage::delete('public/icons/' . $request->icon);
}
throw $e;
}
if( $twofaccount->type === 'hotp' ) {
@ -138,11 +153,7 @@ public function destroy($id)
$twofaccount = TwoFAccount::FindOrFail($id);
// delete icon
$storedIcon = 'public/icons/' . $twofaccount->icon;
if( Storage::exists($storedIcon) ) {
Storage::delete($storedIcon);
}
Storage::delete('public/icons/' . $twofaccount->icon);
// delete account
$twofaccount->delete();