@@ -34,12 +34,12 @@ export default class SPPeopleSearchService {
34
34
35
35
/**
36
36
* Generate sum of principal types
37
- *
37
+ *
38
38
* PrincipalType controls the type of entities that are returned in the results.
39
39
* Choices are All - 15, Distribution List - 2 , Security Groups - 4, SharePoint Groups - 8, User - 1.
40
40
* These values can be combined (example: 13 is security + SP groups + users)
41
- *
42
- * @param principalTypes
41
+ *
42
+ * @param principalTypes
43
43
*/
44
44
public getSumOfPrincipalTypes ( principalTypes : PrincipalType [ ] ) {
45
45
return ! ! principalTypes && principalTypes . length > 0 ? principalTypes . reduce ( ( a , b ) => a + b , 0 ) : 1 ;
@@ -217,20 +217,21 @@ export default class SPPeopleSearchService {
217
217
// Only ensure the user if it is not a SharePoint group
218
218
if ( ! value . EntityData || ( value . EntityData && typeof value . EntityData . SPGroupID === "undefined" ) ) {
219
219
const id = await this . ensureUser ( value . Key ) ;
220
+ value . LoginName = value . Key ;
220
221
value . Key = id ;
221
222
}
222
223
}
223
224
}
224
225
225
226
// Filter out NULL keys
226
227
values = values . filter ( v => v . Key !== null ) ;
227
-
228
228
const userResults = values . map ( element => {
229
229
switch ( element . EntityType ) {
230
230
case 'User' :
231
231
let email : string = element . EntityData . Email !== null ? element . EntityData . Email : element . Description ;
232
232
return {
233
233
id : element . Key ,
234
+ loginName : element . LoginName ? element . LoginName : element . Key ,
234
235
imageUrl : this . generateUserPhotoLink ( email ) ,
235
236
imageInitials : this . getFullNameInitials ( element . DisplayText ) ,
236
237
text : element . DisplayText , // name
@@ -241,20 +242,23 @@ export default class SPPeopleSearchService {
241
242
case 'SecGroup' :
242
243
return {
243
244
id : element . Key ,
245
+ loginName : element . LoginName ? element . LoginName : element . Key ,
244
246
imageInitials : this . getFullNameInitials ( element . DisplayText ) ,
245
247
text : element . DisplayText ,
246
248
secondaryText : element . ProviderName
247
249
} as IPeoplePickerUserItem ;
248
250
case 'FormsRole' :
249
251
return {
250
252
id : element . Key ,
253
+ loginName : element . LoginName ? element . LoginName : element . Key ,
251
254
imageInitials : this . getFullNameInitials ( element . DisplayText ) ,
252
255
text : element . DisplayText ,
253
256
secondaryText : element . ProviderName
254
257
} as IPeoplePickerUserItem ;
255
258
default :
256
259
return {
257
260
id : element . EntityData . SPGroupID ,
261
+ loginName : element . EntityData . AccountName ,
258
262
imageInitials : this . getFullNameInitials ( element . DisplayText ) ,
259
263
text : element . DisplayText ,
260
264
secondaryText : element . EntityData . AccountName
0 commit comments