beenull/Heimdall
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1010 from keriati/feat/enhancedapppw

Browse source 
feat: Keep stored password when Enhanced App is updated
This commit is contained in:
KodeStar 2022-11-17 21:20:16 +00:00 committed by GitHub
parent 722d00df5f 54679ff9eb
commit b50bf716dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Http/Controllers/ItemController.php
View file

@ -180,7 +180,12 @@ class ItemController extends Controller
return view('items.edit', $data); return view('items.edit', $data);
} }
public function storelogic($request, $id = null) /**
* @param Request $request
* @param $id
* @return void
*/
public function storelogic(Request $request, $id = null)
{ {
$application = Application::single($request->input('appid')); $application = Application::single($request->input('appid'));
$validatedData = $request->validate([ $validatedData = $request->validate([
@ -225,6 +230,18 @@ class ItemController extends Controller
} }
$config = Item::checkConfig($request->input('config')); $config = Item::checkConfig($request->input('config'));
// Don't overwrite the stored password if it wasn't submitted when updating the item
if ($id !== null && strpos($config, '"password":null') !== false) {
$storedItem = Item::find($id);
$storedConfigObject = json_decode($storedItem->getAttribute('description'));
$configObject = json_decode($config);
$configObject->password = $storedConfigObject->password;
$config = json_encode($configObject);
}
$current_user = User::currentUser(); $current_user = User::currentUser();
$request->merge([ $request->merge([
'description' => $config, 'description' => $config,