diff --git a/CHANGELOG.md b/CHANGELOG.md index 14f6a302a..d75f54399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ ### Changelog [v2.8.7] β€” Modification: Change security matchers (/user/update1, /user/update2, /user/changePassword1) on denyAll() -> authenticated β€” Addition: /test-data/sessions endpoint +β€” Addition: add flag prefix in GeoLocation/UserRequestMetadata β†’ "where": truncate "tech1_users_sessions" database diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java index d5eafd64a..6109a705a 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java @@ -64,7 +64,7 @@ public Map getAuthenticationLoginOrSessionRefreshedVariables( variables.put("year", now(UTC).getYear()); variables.put("username", username.value()); variables.put("accessMethod", accountAccessMethod.getValue()); - variables.put("where", geoLocation.getCountryFlag() + " " + geoLocation.getWhere()); + variables.put("where", geoLocation.getWhere()); variables.put("what", userAgentDetails.getWhat()); variables.put("ipAddress", geoLocation.getIpAddr()); variables.put("webclientURL", this.applicationFrameworkProperties.getServerConfigs().getWebclientURL()); diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/domain/dto/responses/ResponseUserSessionsTableTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/domain/dto/responses/ResponseUserSessionsTableTest.java index 9da1a828a..e6608ef20 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/domain/dto/responses/ResponseUserSessionsTableTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/domain/dto/responses/ResponseUserSessionsTableTest.java @@ -77,11 +77,11 @@ void constructorTest() { // Assert assertThat(actual.sessions()).hasSize(3); assertThat(actual.sessions().get(0).current()).isTrue(); - assertThat(actual.sessions().get(0).where()).isEqualTo("USA, New York"); + assertThat(actual.sessions().get(0).where()).isEqualTo("πŸ‡ΊπŸ‡Έ USA, New York"); assertThat(actual.sessions().get(1).current()).isFalse(); - assertThat(actual.sessions().get(1).where()).isEqualTo("UK, Liverpool"); + assertThat(actual.sessions().get(1).where()).isEqualTo("πŸ‡¬πŸ‡§ UK, Liverpool"); assertThat(actual.sessions().get(2).current()).isFalse(); - assertThat(actual.sessions().get(2).where()).isEqualTo("UK, London"); + assertThat(actual.sessions().get(2).where()).isEqualTo("πŸ‡¬πŸ‡§ UK, London"); assertThat(actual.anyPresent()).isTrue(); assertThat(actual.anyProblem()).isTrue(); } diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/geo/GeoLocation.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/geo/GeoLocation.java index 73307113d..8007ab430 100644 --- a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/geo/GeoLocation.java +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/geo/GeoLocation.java @@ -152,13 +152,14 @@ public static GeoLocation testData() { public String getWhere() { var countryPresent = hasLength(this.country); var cityPresent = hasLength(this.city); + var countryFlagPrefix = hasLength(this.countryFlag) ? this.countryFlag + " " : StringConstants.EMPTY; if (countryPresent && !cityPresent) { - return this.country; + return countryFlagPrefix + this.country; } if (countryPresent) { - return this.country + ", " + this.city; + return countryFlagPrefix + this.country + ", " + this.city; } - return StringConstants.UNKNOWN; + return TestsFlagsConstants.UNKNOWN + " " + StringConstants.UNKNOWN; } // ================================================================================================================= diff --git a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/geo/GeoLocationTest.java b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/geo/GeoLocationTest.java index a03508ded..e08139d1b 100644 --- a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/geo/GeoLocationTest.java +++ b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/geo/GeoLocationTest.java @@ -29,16 +29,16 @@ private static Stream serializeTest() { private static Stream getWhereTest() { return Stream.of( - Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Ukraine, Lviv"), - Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", ""), "Ukraine"), - Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", " "), "Ukraine"), - Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", " "), "Ukraine"), - Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", null), "Ukraine"), - Arguments.of(processed(localhost(), null, "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Unknown"), - Arguments.of(processed(localhost(), "", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Unknown"), - Arguments.of(processed(localhost(), "", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Unknown"), - Arguments.of(processed(localhost(), " ", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Unknown"), - Arguments.of(processed(localhost(), " ", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "Unknown") + Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ‡ΊπŸ‡¦ Ukraine, Lviv"), + Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", ""), "πŸ‡ΊπŸ‡¦ Ukraine"), + Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", " "), "πŸ‡ΊπŸ‡¦ Ukraine"), + Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", " "), "πŸ‡ΊπŸ‡¦ Ukraine"), + Arguments.of(processed(localhost(), "Ukraine", "UA", "πŸ‡ΊπŸ‡¦", null), "πŸ‡ΊπŸ‡¦ Ukraine"), + Arguments.of(processed(localhost(), null, "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ‡ΊπŸ‡¦ Unknown"), + Arguments.of(processed(localhost(), "", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ΄β€ Unknown"), + Arguments.of(processed(localhost(), "", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ΄β€ Unknown"), + Arguments.of(processed(localhost(), " ", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ΄β€ Unknown"), + Arguments.of(processed(localhost(), " ", "UA", "πŸ‡ΊπŸ‡¦", "Lviv"), "πŸ΄β€ Unknown") ); } @@ -80,7 +80,7 @@ void validTest() { assertThat(actual.getCountryFlag()).isEqualTo("πŸ‡ΊπŸ‡¦"); assertThat(actual.getCity()).isEqualTo("Lviv"); assertThat(actual.getExceptionDetails()).isEmpty(); - assertThat(actual.getWhere()).isEqualTo("Ukraine, Lviv"); + assertThat(actual.getWhere()).isEqualTo("πŸ‡ΊπŸ‡¦ Ukraine, Lviv"); } @RepeatedTest(SMALL_ITERATIONS_COUNT) @@ -94,7 +94,7 @@ void invalidTest() { assertThat(actual.getCountry()).isEqualTo(UNKNOWN); assertThat(actual.getCity()).isEqualTo(UNKNOWN); assertThat(actual.getExceptionDetails()).isEqualTo("Location is unknown"); - assertThat(actual.getWhere()).isEqualTo("Unknown, Unknown"); + assertThat(actual.getWhere()).isEqualTo("πŸ΄β€ Unknown, Unknown"); } @RepeatedTest(SMALL_ITERATIONS_COUNT) diff --git a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/http/requests/UserRequestMetadataTest.java b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/http/requests/UserRequestMetadataTest.java index 713e746ce..a81c7007a 100644 --- a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/http/requests/UserRequestMetadataTest.java +++ b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/http/requests/UserRequestMetadataTest.java @@ -68,7 +68,7 @@ void validTest() { assertThat(actual.getGeoLocation().getCountry()).isEqualTo("Ukraine"); assertThat(actual.getGeoLocation().getCity()).isEqualTo("Lviv"); assertThat(actual.getGeoLocation().getExceptionDetails()).isEmpty(); - assertThat(actual.getGeoLocation().getWhere()).isEqualTo("Ukraine, Lviv"); + assertThat(actual.getGeoLocation().getWhere()).isEqualTo("πŸ‡ΊπŸ‡¦ Ukraine, Lviv"); assertThat(actual.getUserAgentDetails().getBrowser()).isEqualTo("Chrome"); assertThat(actual.getUserAgentDetails().getPlatform()).isEqualTo("macOS"); assertThat(actual.getUserAgentDetails().getDeviceType()).isEqualTo("Desktop"); @@ -79,7 +79,7 @@ void validTest() { assertThat(actual.getWhereTuple3().a()).isNotNull(); assertThat(actual.getWhereTuple3().a().split("\\.")).hasSize(4); assertThat(actual.getWhereTuple3().b()).isEqualTo("πŸ‡ΊπŸ‡¦"); - assertThat(actual.getWhereTuple3().c()).isEqualTo("Ukraine, Lviv"); + assertThat(actual.getWhereTuple3().c()).isEqualTo("πŸ‡ΊπŸ‡¦ Ukraine, Lviv"); } @RepeatedTest(SMALL_ITERATIONS_COUNT) @@ -94,7 +94,7 @@ void invalidTest() { assertThat(actual.getGeoLocation().getCountry()).isEqualTo("Unknown"); assertThat(actual.getGeoLocation().getCity()).isEqualTo("Unknown"); assertThat(actual.getGeoLocation().getExceptionDetails()).isEqualTo("Location is unknown"); - assertThat(actual.getGeoLocation().getWhere()).isEqualTo("Unknown, Unknown"); + assertThat(actual.getGeoLocation().getWhere()).isEqualTo("πŸ΄β€ Unknown, Unknown"); assertThat(actual.getUserAgentDetails().getBrowser()).isEqualTo("Unknown"); assertThat(actual.getUserAgentDetails().getPlatform()).isEqualTo("Unknown"); assertThat(actual.getUserAgentDetails().getDeviceType()).isEqualTo("Unknown"); @@ -105,7 +105,7 @@ void invalidTest() { assertThat(actual.getWhereTuple3().a()).isNotNull(); assertThat(actual.getWhereTuple3().a().split("\\.")).hasSize(4); assertThat(actual.getWhereTuple3().b()).isEqualTo("πŸ΄β€"); - assertThat(actual.getWhereTuple3().c()).isEqualTo("Unknown, Unknown"); + assertThat(actual.getWhereTuple3().c()).isEqualTo("πŸ΄β€ Unknown, Unknown"); } @RepeatedTest(SMALL_ITERATIONS_COUNT) diff --git a/tech1-framework-domain/src/test/resources/geo/geo-location-1.json b/tech1-framework-domain/src/test/resources/geo/geo-location-1.json index 3fbc8031d..70e3f1765 100644 --- a/tech1-framework-domain/src/test/resources/geo/geo-location-1.json +++ b/tech1-framework-domain/src/test/resources/geo/geo-location-1.json @@ -3,5 +3,5 @@ "country" : "Ukraine", "countryCode" : "UA", "countryFlag" : "πŸ‡ΊπŸ‡¦", - "where" : "Ukraine, Lviv" + "where" : "πŸ‡ΊπŸ‡¦ Ukraine, Lviv" } diff --git a/tech1-framework-domain/src/test/resources/geo/geo-location-2.json b/tech1-framework-domain/src/test/resources/geo/geo-location-2.json index 3929c176d..d5a7a0ad3 100644 --- a/tech1-framework-domain/src/test/resources/geo/geo-location-2.json +++ b/tech1-framework-domain/src/test/resources/geo/geo-location-2.json @@ -3,5 +3,5 @@ "country" : "Unknown", "countryCode" : "Unknown", "countryFlag" : "πŸ΄β€", - "where" : "Unknown, Unknown" + "where" : "πŸ΄β€ Unknown, Unknown" } diff --git a/tech1-framework-domain/src/test/resources/geo/geo-location-3.json b/tech1-framework-domain/src/test/resources/geo/geo-location-3.json index 33fc1b9ff..690013ff9 100644 --- a/tech1-framework-domain/src/test/resources/geo/geo-location-3.json +++ b/tech1-framework-domain/src/test/resources/geo/geo-location-3.json @@ -3,5 +3,5 @@ "country" : "[?]", "countryCode" : "[?]", "countryFlag" : "πŸ΄β€", - "where" : "[?], [?]" + "where" : "πŸ΄β€ [?], [?]" } diff --git a/tech1-framework-domain/src/test/resources/geo/geo-location-4.json b/tech1-framework-domain/src/test/resources/geo/geo-location-4.json index 4d0b0713f..cc923bcf7 100644 --- a/tech1-framework-domain/src/test/resources/geo/geo-location-4.json +++ b/tech1-framework-domain/src/test/resources/geo/geo-location-4.json @@ -3,5 +3,5 @@ "country" : "Unknown", "countryCode" : "Unknown", "countryFlag" : "πŸ΄β€", - "where" : "Unknown" + "where" : "πŸ΄β€ Unknown" } diff --git a/tech1-framework-domain/src/test/resources/geo/geo-location-5.json b/tech1-framework-domain/src/test/resources/geo/geo-location-5.json index 8a4f20cfd..f685d0db6 100644 --- a/tech1-framework-domain/src/test/resources/geo/geo-location-5.json +++ b/tech1-framework-domain/src/test/resources/geo/geo-location-5.json @@ -3,5 +3,5 @@ "country" : "Unknown", "countryCode" : "Unknown", "countryFlag" : "πŸ΄β€", - "where" : "Unknown, Unknown" + "where" : "πŸ΄β€ Unknown, Unknown" } diff --git a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-1.json b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-1.json index a2fbdf8b6..c5e8b33f0 100644 --- a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-1.json +++ b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-1.json @@ -5,7 +5,7 @@ "country" : "[?]", "countryCode" : "[?]", "countryFlag" : "πŸ΄β€", - "where" : "[?], [?]" + "where" : "πŸ΄β€ [?], [?]" }, "userAgentDetails" : { "browser" : "[?]", diff --git a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-2.json b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-2.json index ed7fc6e04..7056106cc 100644 --- a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-2.json +++ b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-2.json @@ -5,7 +5,7 @@ "country" : "Ukraine", "countryCode" : "UA", "countryFlag" : "πŸ‡ΊπŸ‡¦", - "where" : "Ukraine, Lviv" + "where" : "πŸ‡ΊπŸ‡¦ Ukraine, Lviv" }, "userAgentDetails" : { "browser" : "Chrome", @@ -17,7 +17,7 @@ "whereTuple3" : { "a" : "127.0.0.1", "b" : "πŸ‡ΊπŸ‡¦", - "c" : "Ukraine, Lviv" + "c" : "πŸ‡ΊπŸ‡¦ Ukraine, Lviv" }, "whatTuple2" : { "a" : "Chrome", diff --git a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-3.json b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-3.json index ce7e0969f..d546f64d6 100644 --- a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-3.json +++ b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-3.json @@ -5,7 +5,7 @@ "country" : "Unknown", "countryCode" : "Unknown", "countryFlag" : "πŸ΄β€", - "where" : "Unknown, Unknown" + "where" : "πŸ΄β€ Unknown, Unknown" }, "userAgentDetails" : { "browser" : "Unknown", @@ -17,7 +17,7 @@ "whereTuple3" : { "a" : "127.0.0.1", "b" : "πŸ΄β€", - "c" : "Unknown, Unknown" + "c" : "πŸ΄β€ Unknown, Unknown" }, "whatTuple2" : { "a" : "Unknown", diff --git a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-4.json b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-4.json index 76cf404f8..808513352 100644 --- a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-4.json +++ b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-4.json @@ -5,7 +5,7 @@ "country" : "Ukraine", "countryCode" : "UA", "countryFlag" : "πŸ‡ΊπŸ‡¦", - "where" : "Ukraine, Lviv" + "where" : "πŸ‡ΊπŸ‡¦ Ukraine, Lviv" }, "userAgentDetails" : { "browser" : "Unknown", @@ -17,7 +17,7 @@ "whereTuple3" : { "a" : "127.0.0.1", "b" : "πŸ‡ΊπŸ‡¦", - "c" : "Ukraine, Lviv" + "c" : "πŸ‡ΊπŸ‡¦ Ukraine, Lviv" }, "whatTuple2" : { "a" : "Unknown", diff --git a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-5.json b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-5.json index 140728a7b..27f81e97b 100644 --- a/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-5.json +++ b/tech1-framework-domain/src/test/resources/http/requests/user-request-metadata-5.json @@ -5,7 +5,7 @@ "country" : "Unknown", "countryCode" : "Unknown", "countryFlag" : "πŸ΄β€", - "where" : "Unknown, Unknown" + "where" : "πŸ΄β€ Unknown, Unknown" }, "userAgentDetails" : { "browser" : "Chrome", @@ -17,7 +17,7 @@ "whereTuple3" : { "a" : "127.0.0.1", "b" : "πŸ΄β€", - "c" : "Unknown, Unknown" + "c" : "πŸ΄β€ Unknown, Unknown" }, "whatTuple2" : { "a" : "Chrome", diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernameMaskedPasswordTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernameMaskedPasswordTest.java index bcc8b65a8..78796375f 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernameMaskedPasswordTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernameMaskedPasswordTest.java @@ -75,6 +75,6 @@ void convertAuthenticationLoginFailureUsernameMaskedPasswordIncidentTest() { .containsEntry("countryFlag", UKRAINE) .containsEntry("ipAddress", "127.0.0.1") .containsEntry("what", "Chrome, macOS on Desktop") - .containsEntry("where", "Ukraine, Lviv"); + .containsEntry("where", "πŸ‡ΊπŸ‡¦ Ukraine, Lviv"); } } diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernamePasswordTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernamePasswordTest.java index a9f2d282d..4058dcebe 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernamePasswordTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginFailureUsernamePasswordTest.java @@ -34,6 +34,6 @@ void convertAuthenticationLoginFailureUsernamePasswordIncidentTest() { .containsEntry("countryFlag", UKRAINE) .containsEntry("ipAddress", "127.0.0.1") .containsEntry("what", "Chrome, macOS on Desktop") - .containsEntry("where", "Ukraine, Lviv"); + .containsEntry("where", "πŸ‡ΊπŸ‡¦ Ukraine, Lviv"); } } diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginTest.java index 8698f67f6..eabc396d1 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLoginTest.java @@ -37,10 +37,10 @@ void convertAuthenticationLoginIncidentExceptionTest() { .containsEntry("incidentType", "Authentication Login") .containsEntry("username", username) .containsEntry("browser", "[?]") - .containsEntry("countryFlag", UNKNOWN) + .containsEntry("countryFlag", "πŸ΄β€") .containsEntry("ipAddress", "8.8.8.8") .containsEntry("what", "[?], [?] on [?]") - .containsEntry("where", "Unknown, Unknown") + .containsEntry("where", "πŸ΄β€ Unknown, Unknown") .containsEntry("exception", "exception1"); } diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLogoutFullTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLogoutFullTest.java index 5270b05de..222518805 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLogoutFullTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/authetication/IncidentAuthenticationLogoutFullTest.java @@ -40,6 +40,6 @@ void convertAuthenticationLogoutFullIncidentTest() { .containsEntry("countryFlag", UK) .containsEntry("ipAddress", "2.2.2.2") .containsEntry("what", "Mozilla, MacOS on Desktop") - .containsEntry("where", "UK, London"); + .containsEntry("where", "πŸ‡¬πŸ‡§ UK, London"); } } diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionExpiredTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionExpiredTest.java index 16024d9a0..dca80ec27 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionExpiredTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionExpiredTest.java @@ -40,6 +40,6 @@ void convertSessionExpiredIncidentTest() { .containsEntry("countryFlag", UK) .containsEntry("ipAddress", "2.2.2.2") .containsEntry("what", "Mozilla, MacOS on Desktop") - .containsEntry("where", "UK, London"); + .containsEntry("where", "πŸ‡¬πŸ‡§ UK, London"); } } diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionRefreshedTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionRefreshedTest.java index 40569d8f2..03d687ee5 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionRefreshedTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/domain/session/IncidentSessionRefreshedTest.java @@ -40,6 +40,6 @@ void convertSessionRefreshedIncidentTest() { .containsEntry("countryFlag", UK) .containsEntry("ipAddress", "2.2.2.2") .containsEntry("what", "Mozilla, MacOS on Desktop") - .containsEntry("where", "UK, London"); + .containsEntry("where", "πŸ‡¬πŸ‡§ UK, London"); } }