github/quartz-manager
1
0
Fork 0
mirror of https://github.com/fabioformosa/quartz-manager.git synced 2026-05-14 22:00:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

#78 fixed a smell

Browse Source
This commit is contained in:
Fabio Formosa
2022-11-08 22:34:50 +01:00
parent 9dfe06e346
commit b62455836a
6 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quartz-manager-frontend/src/app/services/user.service.ts
View File

@@ -21,7 +21,7 @@ export class UserService {
refreshToken() { refreshToken() {
this.apiService.get(this.config.refresh_token_url).subscribe(res => { this.apiService.get(this.config.refresh_token_url).subscribe(res => {
if (res.access_token !== null) { if (res.accessToken !== null) {
return this.getUserInfo().toPromise() return this.getUserInfo().toPromise()
.then(user => { .then(user => {
this.currentUser = user; this.currentUser = user;

37
quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java
View File

@@ -1,32 +1,19 @@
package it.fabioformosa.quartzmanager.api.security.models; package it.fabioformosa.quartzmanager.api.security.models;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class UserTokenState { public class UserTokenState {
private String access_token; private String accessToken;
private Long expires_in_sec; private Long expiresInSec;
public UserTokenState() { public UserTokenState(String accessToken, long expiresInSec) {
this.access_token = null; this.accessToken = accessToken;
this.expires_in_sec = null; this.expiresInSec = expiresInSec;
} }
public UserTokenState(String access_token, long expires_in_sec) {
this.access_token = access_token;
this.expires_in_sec = expires_in_sec;
}
public String getAccess_token() {
return access_token;
}
public Long getExpires_in_sec() {
return expires_in_sec;
}
public void setAccess_token(String access_token) {
this.access_token = access_token;
}
public void setExpires_in_sec(Long expires_in_sec) {
this.expires_in_sec = expires_in_sec;
}
} }

4
quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java
View File

@@ -31,8 +31,8 @@ public class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest {
void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
ResponseEntity<UserTokenState> responseEntity = doLogin(); ResponseEntity<UserTokenState> responseEntity = doLogin();
Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty(); Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive(); Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).hasSizeGreaterThan(0); Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).hasSizeGreaterThan(0);
Assertions.assertThat(responseEntity.getHeaders().get("set-cookie").get(0)).startsWith("AUTH-TOKEN"); Assertions.assertThat(responseEntity.getHeaders().get("set-cookie").get(0)).startsWith("AUTH-TOKEN");
} }

4
quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java
View File

@@ -22,8 +22,8 @@ public class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTe
void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
ResponseEntity<UserTokenState> responseEntity = doLogin(); ResponseEntity<UserTokenState> responseEntity = doLogin();
Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty(); Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive(); Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull(); Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
} }

4
quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java
View File

@@ -30,8 +30,8 @@ public class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLo
void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
ResponseEntity<UserTokenState> responseEntity = doLogin(); ResponseEntity<UserTokenState> responseEntity = doLogin();
Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty(); Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive(); Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull(); Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
} }

4
quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java
View File

@@ -29,8 +29,8 @@ public class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest {
void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
ResponseEntity<UserTokenState> responseEntity = doLogin(); ResponseEntity<UserTokenState> responseEntity = doLogin();
Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty(); Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive(); Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull(); Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
} }