Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
App Blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Genesys PGR
App Blocks
Commits
3e5b11d7
Commit
3e5b11d7
authored
Jan 13, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BasicUserService#setAccountType added
parent
bb783aac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
security/src/main/java/org/genesys/blocks/security/service/BasicUserService.java
...org/genesys/blocks/security/service/BasicUserService.java
+10
-0
security/src/main/java/org/genesys/blocks/security/service/impl/BasicUserServiceImpl.java
...ys/blocks/security/service/impl/BasicUserServiceImpl.java
+14
-2
No files found.
security/src/main/java/org/genesys/blocks/security/service/BasicUserService.java
View file @
3e5b11d7
...
...
@@ -22,6 +22,7 @@ import org.genesys.blocks.security.NoUserFoundException;
import
org.genesys.blocks.security.NotUniqueUserException
;
import
org.genesys.blocks.security.UserException
;
import
org.genesys.blocks.security.model.BasicUser
;
import
org.genesys.blocks.security.model.BasicUser.AccountType
;
import
org.genesys.blocks.security.service.PasswordPolicy.PasswordPolicyException
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.userdetails.UserDetailsService
;
...
...
@@ -134,4 +135,13 @@ public interface BasicUserService<R extends GrantedAuthority, T extends BasicUse
* @return the default user role
*/
R
getDefaultUserRole
();
/**
* Sets the account type.
*
* @param user the user
* @param accountType the account type
* @return the t
*/
T
setAccountType
(
T
user
,
AccountType
accountType
);
}
security/src/main/java/org/genesys/blocks/security/service/impl/BasicUserServiceImpl.java
View file @
3e5b11d7
...
...
@@ -147,10 +147,10 @@ public abstract class BasicUserServiceImpl<R extends GrantedAuthority, T extends
if
(!
StringUtils
.
equals
(
email
,
user
.
getEmail
())
&&
getUserByEmail
(
email
)
!=
null
)
{
throw
new
NotUniqueUserException
(
"Email address already registered"
);
}
user
.
setEmail
(
email
);
user
.
setFullName
(
fullName
);
return
deepLoad
(
userRepository
.
save
(
user
));
}
...
...
@@ -272,4 +272,16 @@ public abstract class BasicUserServiceImpl<R extends GrantedAuthority, T extends
setAccountLockLocal
(
userId
,
locked
);
}
@Override
@Transactional
public
T
setAccountType
(
T
user
,
AccountType
accountType
)
{
T
u
=
userRepository
.
findOne
(
user
.
getId
());
u
.
setAccountType
(
accountType
);
if
(
accountType
!=
AccountType
.
LOCAL
)
{
user
.
setPassword
(
THIS_IS_NOT_A_PASSWORD
);
}
return
userRepository
.
save
(
u
);
}
}
Write
Preview
Markdown
is supported
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