D1219.1774862130.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D1219.1774862130.diff
View Options

	diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php
	--- a/src/app/Observers/UserObserver.php
	+++ b/src/app/Observers/UserObserver.php
	@@ -20,14 +20,17 @@
	*/
	public function creating(User $user)
	{
	- while (true) {
	- $allegedly_unique = \App\Utils::uuidInt();
	- if (!User::find($allegedly_unique)) {
	- $user->{$user->getKeyName()} = $allegedly_unique;
	- break;
	+ if (!$user->id) {
	+ while (true) {
	+ $allegedly_unique = \App\Utils::uuidInt();
	+ if (!User::find($allegedly_unique)) {
	+ $user->{$user->getKeyName()} = $allegedly_unique;
	+ break;
	+ }
	}
	}

	+ // only users that are not imported get the benefit of the doubt.
	$user->status \|= User::STATUS_NEW \| User::STATUS_ACTIVE;

	// can't dispatch job here because it'll fail serialization
	diff --git a/src/app/User.php b/src/app/User.php
	--- a/src/app/User.php
	+++ b/src/app/User.php
	@@ -53,6 +53,7 @@
	* @var array
	*/
	protected $fillable = [
	+ 'id',
	'email',
	'password',
	'password_ldap',