Skip to content

Commit 6503f9c

Browse files
snipesnipe
committed
Revert "Merge pull request #17650 from grokability/add-displayName-to-users"
This reverts commit 4770e46, reversing changes made to 29a18c7. Signed-off-by: snipe <[email protected]>
1 parent 4770e46 commit 6503f9c

File tree

20 files changed

+785
-1136
lines changed

20 files changed

+785
-1136
lines changed

‎app/Console/Commands/LdapSync.php‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ public function handle()
5555
ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
5656
ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
5757

58-
59-
// Map the LDAP attributes to the Snipe-IT user fields.
6058
$ldap_map = [
6159
"username" => Setting::getSettings()->ldap_username_field,
6260
"last_name" => Setting::getSettings()->ldap_lname_field,
@@ -65,17 +63,11 @@ public function handle()
6563
"emp_num" => Setting::getSettings()->ldap_emp_num,
6664
"email" => Setting::getSettings()->ldap_email,
6765
"phone" => Setting::getSettings()->ldap_phone_field,
68-
"mobile" => Setting::getSettings()->ldap_mobile,
6966
"jobtitle" => Setting::getSettings()->ldap_jobtitle,
70-
"address" => Setting::getSettings()->ldap_address,
71-
"city" => Setting::getSettings()->ldap_city,
72-
"state" => Setting::getSettings()->ldap_state,
73-
"zip" => Setting::getSettings()->ldap_zip,
7467
"country" => Setting::getSettings()->ldap_country,
7568
"location" => Setting::getSettings()->ldap_location,
7669
"dept" => Setting::getSettings()->ldap_dept,
7770
"manager" => Setting::getSettings()->ldap_manager,
78-
"display_name" => Setting::getSettings()->ldap_display_name,
7971
];
8072

8173
$ldap_default_group = Setting::getSettings()->ldap_default_group;
@@ -242,25 +234,18 @@ public function handle()
242234
}
243235

244236

245-
// Assign the mapped LDAP attributes for each user to the Snipe-IT user fields
246237
for ($i = 0; $i < $results['count']; $i++) {
247238
$item = [];
248239
$item['username'] = $results[$i][$ldap_map["username"]][0] ?? '';
249-
$item['display_name'] = $results[$i][$ldap_map["display_name"]][0] ?? '';
250240
$item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? '';
251241
$item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? '';
252242
$item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? '';
253243
$item['email'] = $results[$i][$ldap_map["email"]][0] ?? '';
254244
$item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
255245
$item['location_id'] = $results[$i]['location_id'] ?? '';
256246
$item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? '';
257-
$item['mobile'] = $results[$i][$ldap_map["mobile"]][0] ?? '';
258247
$item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? '';
259-
$item['address'] = $results[$i][$ldap_map["ldap_address"]][0] ?? '';
260-
$item['city'] = $results[$i][$ldap_map["city"]][0] ?? '';
261-
$item['state'] = $results[$i][$ldap_map["state"]][0] ?? '';
262248
$item['country'] = $results[$i][$ldap_map["country"]][0] ?? '';
263-
$item['zip'] = $results[$i][$ldap_map["zip"]][0] ?? '';
264249
$item['department'] = $results[$i][$ldap_map["dept"]][0] ?? '';
265250
$item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? '';
266251
$item['location'] = $results[$i][$ldap_map["location"]][0] ?? '';
@@ -293,9 +278,6 @@ public function handle()
293278
if($ldap_map["username"] != null){
294279
$user->username = $item['username'];
295280
}
296-
if($ldap_map["display_name"] != null){
297-
$user->display_name = $item['display_name'];
298-
}
299281
if($ldap_map["last_name"] != null){
300282
$user->last_name = $item['lastname'];
301283
}
@@ -311,9 +293,6 @@ public function handle()
311293
if($ldap_map["phone"] != null){
312294
$user->phone = $item['telephone'];
313295
}
314-
if($ldap_map["mobile"] != null){
315-
$user->mobile = $item['mobile'];
316-
}
317296
if($ldap_map["jobtitle"] != null){
318297
$user->jobtitle = $item['jobtitle'];
319298
}

‎app/Http/Controllers/Api/SettingsController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public function ldaptest() : JsonResponse
5151
})->slice(0, 10)->map(function ($item) use ($settings) {
5252
return (object) [
5353
'username' => $item[$settings['ldap_username_field']][0] ?? null,
54-
'display_name' => $item[$settings['ldap_display_name']][0] ?? null,
5554
'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
5655
'lastname' => $item[$settings['ldap_lname_field']][0] ?? null,
5756
'firstname' => $item[$settings['ldap_fname_field']][0] ?? null,

‎app/Http/Controllers/Api/UsersController.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public function index(Request $request) : array
6464
'users.jobtitle',
6565
'users.last_login',
6666
'users.last_name',
67-
'users.display_name',
6867
'users.locale',
6968
'users.location_id',
7069
'users.manager_id',
@@ -155,10 +154,6 @@ public function index(Request $request) : array
155154
$users = $users->where('users.last_name', '=', $request->input('last_name'));
156155
}
157156

158-
if ($request->filled('display_name')) {
159-
$users = $users->where('users.display_name', '=', $request->input('display_name'));
160-
}
161-
162157
if ($request->filled('employee_num')) {
163158
$users = $users->where('users.employee_num', '=', $request->input('employee_num'));
164159
}
@@ -289,7 +284,6 @@ public function index(Request $request) : array
289284
[
290285
'last_name',
291286
'first_name',
292-
'display_name',
293287
'email',
294288
'jobtitle',
295289
'username',
@@ -517,10 +511,6 @@ public function update(SaveUserRequest $request, User $user): JsonResponse
517511
$user->username = $request->input('username');
518512
}
519513

520-
if ($request->filled('display_name')) {
521-
$user->display_name = $request->input('display_name');
522-
}
523-
524514
if ($request->filled('email')) {
525515
$user->email = $request->input('email');
526516
}

‎app/Http/Controllers/SettingsController.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,6 @@ public function postLdapSettings(StoreLdapSettings $request) : RedirectResponse
873873
$setting->ldap_default_group = $request->input('ldap_default_group');
874874
$setting->ldap_filter = $request->input('ldap_filter');
875875
$setting->ldap_username_field = $request->input('ldap_username_field');
876-
$setting->ldap_display_name = $request->input('ldap_display_name');
877876
$setting->ldap_lname_field = $request->input('ldap_lname_field');
878877
$setting->ldap_fname_field = $request->input('ldap_fname_field');
879878
$setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
@@ -890,12 +889,7 @@ public function postLdapSettings(StoreLdapSettings $request) : RedirectResponse
890889
$setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0');
891890
$setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
892891
$setting->ldap_phone_field = $request->input('ldap_phone');
893-
$setting->ldap_mobile = $request->input('ldap_mobile');
894892
$setting->ldap_jobtitle = $request->input('ldap_jobtitle');
895-
$setting->ldap_address = $request->input('ldap_address');
896-
$setting->ldap_city = $request->input('ldap_city');
897-
$setting->ldap_state = $request->input('ldap_state');
898-
$setting->ldap_zip = $request->input('ldap_zip');
899893
$setting->ldap_country = $request->input('ldap_country');
900894
$setting->ldap_location = $request->input('ldap_location');
901895
$setting->ldap_dept = $request->input('ldap_dept');

‎app/Http/Controllers/Users/UsersController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public function store(SaveUserRequest $request)
8888
//Username, email, and password need to be handled specially because the need to respect config values on an edit.
8989
$user->email = trim($request->input('email'));
9090
$user->username = trim($request->input('username'));
91-
$user->display_name = $request->input('display_name');
9291
if ($request->filled('password')) {
9392
$user->password = bcrypt($request->input('password'));
9493
}
@@ -241,7 +240,6 @@ public function update(SaveUserRequest $request, User $user)
241240

242241
$user->first_name = $request->input('first_name');
243242
$user->last_name = $request->input('last_name');
244-
$user->display_name = $request->input('display_name');
245243
$user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
246244
$user->locale = $request->input('locale');
247245
$user->employee_num = $request->input('employee_num');

‎app/Http/Transformers/UsersTransformer.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ public function transformUser(User $user)
3131
$array = [
3232
'id' => (int) $user->id,
3333
'avatar' => e($user->present()->gravatar) ?? null,
34-
'name' => e($user->getFullNameAttribute()) ?? null,
35-
'first_name' => e($user->first_name) ?? null,
36-
'last_name' => e($user->last_name) ?? null,
37-
'display_name' => e($user->display_name) ?? null,
38-
'username' => e($user->username) ?? null,
34+
'name' => e($user->getFullNameAttribute()),
35+
'first_name' => e($user->first_name),
36+
'last_name' => e($user->last_name),
37+
'username' => e($user->username),
3938
'remote' => ($user->remote == '1') ? true : false,
4039
'locale' => ($user->locale) ? e($user->locale) : null,
4140
'employee_num' => ($user->employee_num) ? e($user->employee_num) : null,
@@ -139,7 +138,6 @@ public function transformUserCompact(User $user) : array
139138
'first_name' => e($user->first_name),
140139
'last_name' => e($user->last_name),
141140
'username' => e($user->username),
142-
'display_name' => e($user->display_name),
143141
'created_by' => $user->adminuser ? [
144142
'id' => (int) $user->adminuser->id,
145143
'name'=> e($user->adminuser->present()->fullName),

‎app/Importer/UserImporter.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function createUserIfNotExists(array $row)
4747
// Pull the records from the CSV to determine their values
4848
$this->item['id'] = trim($this->findCsvMatch($row, 'id'));
4949
$this->item['username'] = trim($this->findCsvMatch($row, 'username'));
50-
$this->item['display_name'] = trim($this->findCsvMatch($row, 'display_name'));
5150
$this->item['first_name'] = trim($this->findCsvMatch($row, 'first_name'));
5251
$this->item['last_name'] = trim($this->findCsvMatch($row, 'last_name'));
5352
$this->item['email'] = trim($this->findCsvMatch($row, 'email'));

‎app/Livewire/Importer.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ public function mount()
339339
'start_date' => trans('general.start_date'),
340340
'state' => trans('general.state'),
341341
'username' => trans('admin/users/table.username'),
342-
'display_name' => trans('admin/users/table.display_name'),
343342
'vip' => trans('general.importer.vip'),
344343
'website' => trans('general.website'),
345344
'zip' => trans('general.zip'),
@@ -486,13 +485,6 @@ public function mount()
486485
'username',
487486
trans('general.importer.checked_out_to_username'),
488487
],
489-
'display_name' =>
490-
[
491-
'display name',
492-
'displayName',
493-
'display',
494-
trans('admin/users/table.display_name'),
495-
],
496488
'first_name' =>
497489
[
498490
'first name',

‎app/Models/SnipeModel.php‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Models;
44

55
use App\Helpers\Helper;
6-
use Illuminate\Database\Eloquent\Casts\Attribute;
76
use Illuminate\Database\Eloquent\Model;
87

98
class SnipeModel extends Model
@@ -156,19 +155,9 @@ public function setStatusIdAttribute($value)
156155
$this->attributes['status_id'] = $value;
157156
}
158157

159-
// This gets a little twitchy since *most* things have a property in the table called "name" (but users don't)
160-
// AND we want to be able to use the actual display_name value from the database if it's set (usually via SCIM)
161-
protected function displayNameAttribute(): Attribute
158+
//
159+
public function getDisplayNameAttribute()
162160
{
163-
// This override should only kick in if the model has a display_name property (users)
164-
if (isset($this->display_name)) {
165-
return Attribute::make(
166-
get: fn (string $value) => $this->display_name,
167-
);
168-
}
169-
return Attribute::make(
170-
get: fn (string $value) => $this->name,
171-
);
161+
return $this->name;
172162
}
173-
174163
}

‎app/Models/SnipeSCIMConfig.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public function getUserConfig()
3434

3535
'validations' => [
3636
$user_prefix . 'userName' => 'required',
37-
$user_prefix . 'displayName' => 'nullable|string',
3837
$user_prefix . 'name.givenName' => 'required',
3938
$user_prefix . 'name.familyName' => 'nullable|string',
4039
$user_prefix . 'externalId' => 'nullable|string',
@@ -122,7 +121,7 @@ function (&$object) {
122121
'honorificSuffix' => null
123122
],
124123

125-
'displayName' => AttributeMapping::eloquent("display_name"),
124+
'displayName' => null,
126125
'nickName' => null,
127126
'profileUrl' => null,
128127
'title' => AttributeMapping::eloquent('jobtitle'),

0 commit comments

Comments
 (0)