feat: minor changes to email verification

Signed-off-by: Morten Svanaes <[email protected]>
dhis2 · Dec 17, 2024 · 6dc5195 · 6dc5195
1 parent 3d26e95
commit 6dc5195
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.../dhis/test/webapi/json/domain/JsonMe.java → ...is/test/webapi/json/domain/JsonMeDto.java b/.../dhis/test/webapi/json/domain/JsonMe.java → ...is/test/webapi/json/domain/JsonMeDto.java
@@ -33,11 +33,11 @@
 import org.hisp.dhis.jsontree.JsonList;
 
 /**
- * Web API equivalent of a {@link org.hisp.dhis.user.User}.
+ * Web API equivalent of a {@link org.hisp.dhis.webapi.controller.user.MeDto}.
  *
- * @author Jan Bernitt
+ * @author Morten Svanæs
  */
-public interface JsonMe extends JsonIdentifiableObject {
+public interface JsonMeDto extends JsonIdentifiableObject {
   default String getUsername() {
     return getString("username").string();
   }

diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/MeControllerTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/MeControllerTest.java
@@ -48,7 +48,7 @@
 import org.hisp.dhis.security.apikey.ApiKeyTokenGenerator;
 import org.hisp.dhis.security.apikey.ApiTokenStore;
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
-import org.hisp.dhis.test.webapi.json.domain.JsonMe;
+import org.hisp.dhis.test.webapi.json.domain.JsonMeDto;
 import org.hisp.dhis.user.CurrentUserUtil;
 import org.hisp.dhis.user.User;
 import org.junit.jupiter.api.BeforeEach;
@@ -77,7 +77,7 @@ void setUp() {
   @Test
   void testGetCurrentUser() {
     switchToAdminUser();
-    assertEquals(getCurrentUser().getUid(), GET("/me").content().as(JsonMe.class).getId());
+    assertEquals(getCurrentUser().getUid(), GET("/me").content().as(JsonMeDto.class).getId());
   }
 
   @Test
@@ -97,7 +97,7 @@ void testGetAuthorities() {
   @Test
   void testUpdateCurrentUser() {
     assertSeries(Series.SUCCESSFUL, PUT("/me", "{'surname':'Lars'}"));
-    assertEquals("Lars", GET("/me").content().as(JsonMe.class).getSurname());
+    assertEquals("Lars", GET("/me").content().as(JsonMeDto.class).getSurname());
   }
 
   @Test
@@ -110,7 +110,7 @@ void testHasAuthority() {
 
   @Test
   void testGetEmailVerifiedProperty() {
-    assertFalse(GET("/me").content().as(JsonMe.class).getEmailVerified());
+    assertFalse(GET("/me").content().as(JsonMeDto.class).getEmailVerified());
   }
 
   @Test
@@ -279,6 +279,6 @@ void testGetCurrentUserAttributeValues() {
     userService.updateUser(userByUsername);
 
     assertEquals(
-        "myvalue", GET("/me").content().as(JsonMe.class).getAttributeValues().get(0).getValue());
+        "myvalue", GET("/me").content().as(JsonMeDto.class).getAttributeValues().get(0).getValue());
   }
 }