Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
App Blocks
Commits
bfa8d2b5
Commit
bfa8d2b5
authored
Jun 08, 2017
by
Maxym Borodenko
Committed by
Matija Obreza
Jun 15, 2017
Browse files
System accounts
parent
3887b124
Changes
1
Hide whitespace changes
Inline
Side-by-side
security/src/main/java/org/genesys/blocks/security/model/BasicUser.java
View file @
bfa8d2b5
...
@@ -20,6 +20,7 @@ import java.util.Collection;
...
@@ -20,6 +20,7 @@ import java.util.Collection;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
javax.persistence.CollectionTable
;
import
javax.persistence.CollectionTable
;
...
@@ -30,6 +31,7 @@ import javax.persistence.Enumerated;
...
@@ -30,6 +31,7 @@ import javax.persistence.Enumerated;
import
javax.persistence.FetchType
;
import
javax.persistence.FetchType
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.JoinColumn
;
import
javax.persistence.MappedSuperclass
;
import
javax.persistence.MappedSuperclass
;
import
javax.persistence.PrePersist
;
import
javax.persistence.Temporal
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.persistence.TemporalType
;
import
javax.persistence.Transient
;
import
javax.persistence.Transient
;
...
@@ -53,9 +55,12 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
...
@@ -53,9 +55,12 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
private
static
final
long
serialVersionUID
=
-
5318892732608111516L
;
private
static
final
long
serialVersionUID
=
-
5318892732608111516L
;
public
static
enum
AccountType
{
public
static
enum
AccountType
{
LOCAL
,
LDAP
,
GOOGLE
LOCAL
,
LDAP
,
GOOGLE
,
SYSTEM
}
}
@Column
(
length
=
36
,
unique
=
true
)
private
String
uuid
;
@JsonView
(
JsonViews
.
Public
.
class
)
@JsonView
(
JsonViews
.
Public
.
class
)
@Column
(
nullable
=
false
,
unique
=
true
,
length
=
60
)
@Column
(
nullable
=
false
,
unique
=
true
,
length
=
60
)
private
String
email
;
private
String
email
;
...
@@ -97,6 +102,13 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
...
@@ -97,6 +102,13 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
@Column
(
length
=
20
)
@Column
(
length
=
20
)
private
AccountType
accountType
=
AccountType
.
LOCAL
;
private
AccountType
accountType
=
AccountType
.
LOCAL
;
@PrePersist
void
ensureUUID
()
{
if
(
this
.
uuid
==
null
)
{
this
.
uuid
=
UUID
.
nameUUIDFromBytes
(
getEmail
().
getBytes
()).
toString
();
}
}
public
String
getEmail
()
{
public
String
getEmail
()
{
return
email
;
return
email
;
}
}
...
@@ -157,6 +169,14 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
...
@@ -157,6 +169,14 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
this
.
roles
=
roles
;
this
.
roles
=
roles
;
}
}
public
String
getUuid
()
{
return
uuid
;
}
public
void
setUuid
(
final
String
uuid
)
{
this
.
uuid
=
uuid
;
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
MessageFormat
.
format
(
"id={0} email={1} fullName={2}"
,
getId
(),
email
,
fullName
);
return
MessageFormat
.
format
(
"id={0} email={1} fullName={2}"
,
getId
(),
email
,
fullName
);
...
@@ -175,7 +195,7 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
...
@@ -175,7 +195,7 @@ public abstract class BasicUser<R extends GrantedAuthority> extends AuditedVersi
@Override
@Override
public
String
getUsername
()
{
public
String
getUsername
()
{
return
email
;
return
uuid
;
}
}
@Override
@Override
...
...
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