Skip to content

Commit

Permalink
Renaming accessToken in login json
Browse files Browse the repository at this point in the history
  • Loading branch information
alainbodiguel committed Feb 7, 2024
1 parent 3f3adcb commit 01576bd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package io.arlas.iam.rest.model.output;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.arlas.iam.model.LoginSession;
import io.arlas.iam.model.RefreshToken;

public class LoginData {
@JsonProperty("access_token")
public String accessToken; // JWT
@JsonProperty("refresh_token")
public RefreshToken refreshToken;
public UserData user;

Expand Down
16 changes: 8 additions & 8 deletions arlas-iam-tests/src/test/java/io/arlas/iam/test/AuthITUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ public void test002CreateUserInvalidEmail() {
@Test
public void test010Login() {
JsonPath json = login(USER1).then().statusCode(200).extract().jsonPath();
token1 = json.get("accessToken");
refreshToken1 = json.get("refreshToken.value");
token1 = json.get("access_token");
refreshToken1 = json.get("refresh_token.value");
token2 = login(USER2).then().statusCode(200)
.extract().jsonPath().get("accessToken");
.extract().jsonPath().get("access_token");
tokenAdmin = login(ADMIN, ADMIN_PASSWORD).then().statusCode(200)
.extract().jsonPath().get("accessToken");
.extract().jsonPath().get("access_token");
}

@Test
public void test011RefreshToken() {
token1 = refreshToken(userId1, refreshToken1).then().statusCode(200)
.extract().jsonPath().get("accessToken");
.extract().jsonPath().get("access_token");
}

@Test
Expand All @@ -68,7 +68,7 @@ public void test015ChangePassword() {
logout(USER1).then().statusCode(200);

token1 = login(USER1, "newsecret").then().statusCode(200)
.extract().jsonPath().get("accessToken");
.extract().jsonPath().get("access_token");

}

Expand All @@ -88,8 +88,8 @@ public void test017ChangePasswordOtherUser() {
// getUser(userId1).then().statusCode(401);
//
// JsonPath json = login(USER1).then().statusCode(200).extract().jsonPath();
// token1 = json.get("accessToken");
// refreshToken1 = json.get("refreshToken.value");
// token1 = json.get("access_token");
// refreshToken1 = json.get("refresh_token.value");
// }

@Test
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<maven.compiler.version>3.10.1</maven.compiler.version>
<maven.shade.version>3.2.4</maven.shade.version>

<arlas.version>24.1.0</arlas.version>
<arlas.version>24.1.1</arlas.version>
<dropwizard.version>2.1.10</dropwizard.version>
<postgresql.version>42.7.1</postgresql.version>
<spring.security.version>6.1.5</spring.security.version>
Expand Down

0 comments on commit 01576bd

Please sign in to comment.