D5610.1775393364.diff
No OneTemporary
Actions

Authored By

Unknown

Size

863 B

Referenced Files

None

Subscribers

None

D5610.1775393364.diff
View Options

	diff --git a/src/app/Auth/OAuth.php b/src/app/Auth/OAuth.php
	--- a/src/app/Auth/OAuth.php
	+++ b/src/app/Auth/OAuth.php
	@@ -127,7 +127,7 @@
	{
	$response = [
	// Per OIDC spec. 'sub' must be always returned
	- 'sub' => $user->id,
	+ 'sub' => $user->getSetting('uid') ?: $user->id,
	];

	if ($user->tokenCan('email')) {
	diff --git a/src/app/Console/Commands/Data/Import/LdifCommand.php b/src/app/Console/Commands/Data/Import/LdifCommand.php
	--- a/src/app/Console/Commands/Data/Import/LdifCommand.php
	+++ b/src/app/Console/Commands/Data/Import/LdifCommand.php
	@@ -953,6 +953,7 @@
	'mailalternateaddress' => 'external_email',
	'mobile' => 'phone',
	'o' => 'organization',
	+ 'nsuniqueid' => 'uid',
	// 'address' => 'billing_address'
	];