Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
reg-app
Regapp
Commits
3e7cb66b
Commit
3e7cb66b
authored
May 12, 2021
by
michael.simon
Browse files
Change findByEppn return type to list
parent
e2f2487c
Changes
2
Hide whitespace changes
Inline
Side-by-side
bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserUpdateServiceImpl.java
View file @
3e7cb66b
...
...
@@ -342,11 +342,14 @@ public class UserUpdateServiceImpl implements UserUpdateService, Serializable {
}
private
UserEntity
findUser
(
String
eppn
)
{
UserEntity
user
=
userDao
.
findByEppn
(
eppn
);
List
<
UserEntity
>
userList
=
userDao
.
findByEppn
(
eppn
);
if
(
userList
.
size
()
==
0
)
return
null
;
else
if
(
userList
.
size
()
>
1
)
return
null
;
if
(
user
!=
null
)
{
user
=
userDao
.
findByIdWithStore
(
user
.
getId
());
}
UserEntity
user
=
userList
.
get
(
0
);
user
=
userDao
.
findByIdWithStore
(
user
.
getId
());
return
user
;
}
...
...
bwreg-service/src/main/java/edu/kit/scc/webreg/service/twofa/TwoFaLoginServiceImpl.java
View file @
3e7cb66b
...
...
@@ -63,9 +63,12 @@ public class TwoFaLoginServiceImpl implements TwoFaLoginService {
if
(
eppn
!=
null
)
{
if
(
eppn
.
contains
(
"@"
))
{
user
=
userDao
.
findByEppn
(
eppn
);
if
(
user
==
null
)
List
<
UserEntity
>
userList
=
userDao
.
findByEppn
(
eppn
);
if
(
user
List
.
size
()
==
0
)
throw
new
NoUserFoundException
(
"no such user"
);
else
if
(
userList
.
size
()
>
1
)
throw
new
NoUserFoundException
(
"user eppn not unique"
);
user
=
userList
.
get
(
0
);
registry
=
findRegistry
(
user
,
service
);
if
(
registry
==
null
)
...
...
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