amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove encryption on the Gifts table (#249)

Browse Source 
This is just causing too much headache, especially since I made the rookie mistake of not checking the max length of some entries when inserting the gift. That leads to errors in the decryption process.

In production, out of the thousands of gifts already entered, only 5 are not decryptable. I have no other choice than resetting these 5 rows. I'm really sorry about this.

If you do end up having problems running the migration in your own instance, you need to remove the rows that are un-decryptable in the Gifts table as well.
This commit is contained in:
Régis Freyd
2017-06-13 00:16:10 -04:00
committed by GitHub
parent 02d424aced
commit 208f6a0ee0
11 changed files with 84 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PeopleController.php
+41 -3
View File
@@ -1386,10 +1386,10 @@ class PeopleController extends Controller
$gift = new Gift;
$gift->contact_id = $contact->id;
$gift->account_id = $contact->account_id;
$gift->name = encrypt($title);
$gift->name = $title;
if ($url != '') {
$gift->url = encrypt($url);
$gift->url = $url;
}
if ($value != '') {
@@ -1397,7 +1397,7 @@ class PeopleController extends Controller
}
if ($comment != '') {
$gift->comment = encrypt($comment);
$gift->comment = $comment;
}
if ($giftOffered == 'is_an_idea') {
@@ -1428,6 +1428,17 @@ class PeopleController extends Controller
$gift->save();
$contact->logEvent('gift', $gift->id, 'create');
// increment counter
if ($gift->is_an_idea == 'true') {
$contact->number_of_gifts_ideas = $contact->number_of_gifts_ideas + 1;
} else {
$contact->number_of_gifts_offered = $contact->number_of_gifts_offered + 1;
}
$contact->save();
$request->session()->flash('success', trans('people.gifts_add_success'));
return redirect('/people/'.$contact->id);
@@ -1452,6 +1463,33 @@ class PeopleController extends Controller
return redirect()->route('people.index');
}
// Delete all events
$events = Event::where('contact_id', $gift->contact_id)
->where('account_id', $gift->account_id)
->where('object_type', 'gift')
->where('object_id', $gift->id)
->get();
foreach ($events as $event) {
$event->delete();
}
// Decrease number of gifts
if ($gift->is_an_idea == 'true') {
$contact->number_of_gifts_ideas = $contact->number_of_gifts_ideas - 1;
if ($contact->number_of_gifts_ideas < 1) {
$contact->number_of_gifts_ideas = 0;
}
} else {
$contact->number_of_gifts_offered = $contact->number_of_gifts_offered - 1;
if ($contact->number_of_gifts_offered < 1) {
$contact->number_of_gifts_offered = 0;
}
}
$contact->save();
$gift->delete();
$request->session()->flash('success', trans('people.gifts_delete_success'));