File tree Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -21,12 +21,20 @@ const service = {
21
21
. filter ( claims => claims ) // Drop falsy values from array
22
22
. concat ( undefined ) [ 0 ] ; // Set undefined as last element of array
23
23
24
+ // handle inconsistencies between tokens
25
+ const lastName = token . family_name !== '' ?
26
+ token . family_name :
27
+ token . display_name . split ( ' ' ) . pop ( ) ;
28
+ const firstName = token . given_name !== token . display_name ?
29
+ token . given_name :
30
+ token . display_name . substring ( 0 , token . display_name . lastIndexOf ( ' ' ) ) ;
31
+
24
32
return {
25
33
identityId : identityId ,
26
34
username : token . identity_provider_identity ? token . identity_provider_identity : token . preferred_username ,
27
- firstName : token . given_name ,
28
- fullName : token . name ,
29
- lastName : token . family_name ,
35
+ firstName : firstName ,
36
+ fullName : token . display_name ,
37
+ lastName : lastName ,
30
38
email : token . email ,
31
39
idp : token . identity_provider
32
40
} ;
@@ -145,6 +153,9 @@ const service = {
145
153
* @returns {Promise<object> } The result of running the login operation
146
154
*/
147
155
login : async ( token ) => {
156
+
157
+ console . log ( 'a' , token ) ;
158
+
148
159
const newUser = service . _tokenToUser ( token ) ;
149
160
// wrap with db transaction
150
161
return await utils . trxWrapper ( async ( trx ) => {
You can’t perform that action at this time.
0 commit comments