Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
dariahsp
Commits
befb4cdb
Commit
befb4cdb
authored
Sep 17, 2015
by
Gradl, Tobias
Browse files
374: Reflect user role in schema editor
Task-Url:
https://home.tgradl.de/mantisbt/view.php?id=374
parent
9264aa87
Changes
4
Hide whitespace changes
Inline
Side-by-side
dariah-javasp-master/dariah-javasp-core/src/main/java/de/dariah/aai/javasp/base/SimpleUserDetails.java
View file @
befb4cdb
...
...
@@ -9,7 +9,7 @@ public class SimpleUserDetails implements UserDetails, StagedUserDetails {
private
Collection
<
Role
>
authorities
;
private
in
t
id
;
private
Str
in
g
id
;
private
String
endpointId
;
private
String
endpointName
;
private
String
username
;
...
...
@@ -28,7 +28,7 @@ public class SimpleUserDetails implements UserDetails, StagedUserDetails {
this
.
hasAllAttributes
=
false
;
}
public
in
t
getId
()
{
return
id
;
}
public
Str
in
g
getId
()
{
return
id
;
}
public
boolean
isExpired
()
{
return
expired
;
}
public
String
getEndpointId
()
{
return
endpointId
;
}
public
String
getEndpointName
()
{
return
endpointName
;
}
...
...
dariah-javasp-master/dariah-javasp-core/src/main/java/de/dariah/aai/javasp/base/User.java
View file @
befb4cdb
...
...
@@ -2,7 +2,7 @@ package de.dariah.aai.javasp.base;
public
interface
User
{
public
in
t
getId
();
public
Str
in
g
getId
();
public
String
getNameId
();
public
boolean
isExpired
();
...
...
dariah-javasp-master/dariah-javasp-core/src/main/java/de/dariah/samlsp/model/pojo/AuthPojo.java
View file @
befb4cdb
...
...
@@ -4,7 +4,7 @@ import java.util.List;
public
class
AuthPojo
{
private
boolean
auth
;
private
in
t
userId
;
private
Str
in
g
userId
;
private
int
level
;
private
String
displayName
;
private
String
language
;
...
...
@@ -13,8 +13,8 @@ public class AuthPojo {
public
boolean
isAuth
()
{
return
auth
;
}
public
void
setAuth
(
boolean
auth
)
{
this
.
auth
=
auth
;
}
public
in
t
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
in
t
userId
)
{
this
.
userId
=
userId
;
}
public
Str
in
g
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
Str
in
g
userId
)
{
this
.
userId
=
userId
;
}
public
int
getLevel
()
{
return
level
;
}
public
void
setLevel
(
int
level
)
{
this
.
level
=
level
;
}
...
...
dariah-javasp-master/dariah-javasp-web/src/main/java/de/dariah/aai/javasp/web/helper/AuthInfoHelper.java
View file @
befb4cdb
...
...
@@ -17,12 +17,12 @@ public class AuthInfoHelper {
return
this
.
getCurrentUserDetails
(
request
);
}
public
in
t
getUserId
(
HttpServletRequest
request
)
{
public
Str
in
g
getUserId
(
HttpServletRequest
request
)
{
AuthPojo
user
=
getCurrentUserDetails
(
request
);
if
(
user
!=
null
)
{
return
user
.
getUserId
();
}
else
{
return
-
1
;
return
""
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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