Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Security and Compliance
Entitlements
Commits
be72862b
Commit
be72862b
authored
Jun 28, 2021
by
Bill Wang
Committed by
Spencer Sutton
Jul 06, 2021
Browse files
Revert "inspect check gate for user node exist"
This reverts commit 5705854039caf2328c300ac80c6af612c82ed8f8.
parent
99a89a79
Changes
2
Hide whitespace changes
Inline
Side-by-side
entitlements-v2-core/src/main/java/org/opengroup/osdu/entitlements/v2/service/AddMemberService.java
View file @
be72862b
...
...
@@ -40,12 +40,7 @@ public class AddMemberService {
log
.
info
(
String
.
format
(
"requested by %s"
,
addMemberServiceDto
.
getRequesterId
()));
String
memberDesId
=
addMemberDto
.
getEmail
();
EntityNode
memberNode
=
retrieveGroupRepo
.
getEntityNode
(
memberDesId
,
addMemberServiceDto
.
getPartitionId
()).
orElseGet
(
()
->
{
System
.
out
.
println
(
"No user Node found, adding it"
);
return
createNewMemberNode
(
addMemberDto
.
getEmail
(),
memberDesId
,
addMemberServiceDto
.
getPartitionId
());
}
);
()
->
createNewMemberNode
(
addMemberDto
.
getEmail
(),
memberDesId
,
addMemberServiceDto
.
getPartitionId
()));
EntityNode
existingGroupEntityNode
=
retrieveGroupRepo
.
groupExistenceValidation
(
addMemberServiceDto
.
getGroupEmail
(),
addMemberServiceDto
.
getPartitionId
());
EntityNode
requesterNode
=
EntityNode
.
createMemberNodeForRequester
(
addMemberServiceDto
.
getRequesterId
(),
addMemberServiceDto
.
getPartitionId
());
if
(!
permissionService
.
hasOwnerPermissionOf
(
requesterNode
,
existingGroupEntityNode
))
{
...
...
provider/entitlements-v2-aws/src/main/java/org/opengroup/osdu/entitlements/v2/aws/spi/retrievegroup/AwsRetrieveGroupRepo.java
View file @
be72862b
...
...
@@ -81,9 +81,7 @@ public class AwsRetrieveGroupRepo implements RetrieveGroupRepo {
commands
.
select
(
config
.
getPartitionEntityNode
());
String
groupNodeJson
=
commands
.
get
(
entityEmail
);
EntityNode
groupNode
=
null
;
System
.
out
.
println
(
"The value of GropNodeJson is "
+
groupNodeJson
);
if
(!
StringUtils
.
isEmpty
(
groupNodeJson
))
{
groupNode
=
JsonConverter
.
fromJson
(
groupNodeJson
,
EntityNode
.
class
);
}
return
Optional
.
ofNullable
(
groupNode
);
...
...
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!
Cancel
Please
register
or
sign in
to comment