Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
sunbird-lms-service
Commits
853ea822
Unverified
Commit
853ea822
authored
3 years ago
by
Hari-stackroute
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
SB-26976 sso externalid issue (#964)
parent
e6b34326
release-4.3.0
release-4.3.0_RC16
release-4.3.0_RC15
release-4.3.0_RC14
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
service/src/main/java/org/sunbird/actor/user/SSOUserCreateActor.java
+0
-1
.../main/java/org/sunbird/actor/user/SSOUserCreateActor.java
service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java
+1
-1
...ava/org/sunbird/service/user/impl/SSOUserServiceImpl.java
with
1 addition
and
2 deletions
+1
-2
service/src/main/java/org/sunbird/actor/user/SSOUserCreateActor.java
+
0
−
1
View file @
853ea822
...
@@ -112,7 +112,6 @@ public class SSOUserCreateActor extends UserBaseActor {
...
@@ -112,7 +112,6 @@ public class SSOUserCreateActor extends UserBaseActor {
userMap
.
put
(
JsonKey
.
ID
,
userId
);
userMap
.
put
(
JsonKey
.
ID
,
userId
);
userMap
.
put
(
JsonKey
.
USER_ID
,
userId
);
userMap
.
put
(
JsonKey
.
USER_ID
,
userId
);
requestMap
=
UserUtil
.
encryptUserData
(
userMap
);
requestMap
=
UserUtil
.
encryptUserData
(
userMap
);
Map
<
String
,
Object
>
userLookUpData
=
new
HashMap
<>(
requestMap
);
// removing roles from requestMap, so it won't get save in user table
// removing roles from requestMap, so it won't get save in user table
List
<
String
>
roles
=
(
List
<
String
>)
requestMap
.
get
(
JsonKey
.
ROLES
);
List
<
String
>
roles
=
(
List
<
String
>)
requestMap
.
get
(
JsonKey
.
ROLES
);
removeUnwanted
(
requestMap
);
removeUnwanted
(
requestMap
);
...
...
This diff is collapsed.
Click to expand it.
service/src/main/java/org/sunbird/service/user/impl/SSOUserServiceImpl.java
+
1
−
1
View file @
853ea822
...
@@ -92,7 +92,7 @@ public class SSOUserServiceImpl implements SSOUserService {
...
@@ -92,7 +92,7 @@ public class SSOUserServiceImpl implements SSOUserService {
Map
<
String
,
Object
>
requestMap
,
Map
<
String
,
Object
>
userMap
,
Request
request
)
{
Map
<
String
,
Object
>
requestMap
,
Map
<
String
,
Object
>
userMap
,
Request
request
)
{
Response
response
=
null
;
Response
response
=
null
;
boolean
isPasswordUpdated
=
false
;
boolean
isPasswordUpdated
=
false
;
Map
<
String
,
Object
>
userLookUpData
=
new
HashMap
<>(
request
Map
);
Map
<
String
,
Object
>
userLookUpData
=
new
HashMap
<>(
user
Map
);
try
{
try
{
response
=
userService
.
createUser
(
requestMap
,
request
.
getRequestContext
());
response
=
userService
.
createUser
(
requestMap
,
request
.
getRequestContext
());
userLookupService
.
insertRecords
(
userLookUpData
,
request
.
getRequestContext
());
userLookupService
.
insertRecords
(
userLookUpData
,
request
.
getRequestContext
());
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets