Skip to content

Commit ad17293

Browse files
committed
refactor: remove tenantRealNameStatus from CustomOAuth2User class
1 parent 5b8e57c commit ad17293

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

security/auth-resource-model/src/main/java/cloud/xcan/angus/security/model/CustomOAuth2User.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ public class CustomOAuth2User extends EntitySupport<CustomOAuth2User, Long> impl
107107

108108
protected String tenantName;
109109

110-
protected String tenantRealNameStatus;
111-
112110
protected String directoryId;
113111

114112
protected String defaultLanguage;
@@ -179,7 +177,7 @@ public CustomOAuth2User(String username, String password, boolean enabled,
179177
Collection<? extends GrantedAuthority> authorities) {
180178
this(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked,
181179
authorities, "-1", null, null, null, null, false, null, null, null, null,
182-
null, null, "-1", null, null, null, null, null);
180+
null, null, "-1", null, null, null, null);
183181
}
184182

185183
public CustomOAuth2User(String username, String password, boolean enabled,
@@ -188,8 +186,8 @@ public CustomOAuth2User(String username, String password, boolean enabled,
188186
String lastName, String fullName, String passwordStrength, boolean sysAdmin,
189187
String mobile, String email, String mainDeptId, Instant passwordExpiredDate,
190188
Instant lastModifiedPasswordDate, Instant expiredDate,
191-
String tenantId, String tenantName, String tenantRealNameStatus,
192-
String directoryId, String defaultLanguage, String defaultTimeZone) {
189+
String tenantId, String tenantName, String directoryId, String defaultLanguage,
190+
String defaultTimeZone) {
193191
Assert.isTrue(username != null && !username.isEmpty() /*&& password != null*/,
194192
"Cannot username null or empty values to constructor");
195193

@@ -215,7 +213,6 @@ public CustomOAuth2User(String username, String password, boolean enabled,
215213
this.expiredDate = expiredDate;
216214
this.tenantId = tenantId;
217215
this.tenantName = tenantName;
218-
this.tenantRealNameStatus = tenantRealNameStatus;
219216
this.directoryId = directoryId;
220217
this.defaultLanguage = defaultLanguage;
221218
this.defaultTimeZone = defaultTimeZone;
@@ -334,8 +331,7 @@ public int hashCode() {
334331
@Override
335332
public String toString() {
336333
final StringBuilder sb = new StringBuilder("CustomOAuth2User{");
337-
sb.append("tenantRealNameStatus='").append(tenantRealNameStatus).append('\'');
338-
sb.append(", tenantName='").append(tenantName).append('\'');
334+
sb.append("tenantName='").append(tenantName).append('\'');
339335
sb.append(", tenantId=").append(tenantId);
340336
sb.append(", expiredDate=").append(expiredDate);
341337
sb.append(", defaultTimeZone='").append(defaultTimeZone).append('\'');
@@ -375,7 +371,6 @@ public static CustomOAuth2User with(String username, CustomOAuth2User user,
375371
.passwordExpiredDate(user.passwordExpiredDate)
376372
.lastModifiedPasswordDate(user.lastModifiedPasswordDate).expiredDate(user.expiredDate)
377373
.tenantId(user.tenantId).tenantName(user.tenantName)
378-
.tenantRealNameStatus(user.tenantRealNameStatus)
379374
.build();
380375
}
381376

@@ -526,7 +521,6 @@ public static final class UserBuilder {
526521
private Instant expiredDate;
527522
private String tenantId;
528523
private String tenantName;
529-
private String tenantRealNameStatus;
530524

531525
private String directoryId;
532526
private String defaultLanguage;
@@ -771,11 +765,6 @@ public CustomOAuth2User.UserBuilder tenantName(String tenantName) {
771765
return this;
772766
}
773767

774-
public CustomOAuth2User.UserBuilder tenantRealNameStatus(String tenantRealNameStatus) {
775-
this.tenantRealNameStatus = tenantRealNameStatus;
776-
return this;
777-
}
778-
779768
public CustomOAuth2User.UserBuilder directoryId(String directoryId) {
780769
this.directoryId = directoryId;
781770
return this;
@@ -798,8 +787,8 @@ public CustomOAuth2User build() {
798787
this.id, this.firstName, this.lastName, this.fullName, this.passwordStrength,
799788
this.sysAdmin, this.mobile, this.email, this.mainDeptId,
800789
this.passwordExpiredDate, this.lastModifiedPasswordDate, this.expiredDate,
801-
this.tenantId, this.tenantName, this.tenantRealNameStatus,
802-
this.directoryId, this.defaultLanguage, this.defaultTimeZone);
790+
this.tenantId, this.tenantName, this.directoryId, this.defaultLanguage,
791+
this.defaultTimeZone);
803792
}
804793
}
805794

0 commit comments

Comments
 (0)