generator-jhipster 7.3.0 → 7.5.0

package/generators/server/templates/src/main/java/package/service/UserService.java.ejs

@@ -84,7 +84,7 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 <%_ } _%>
 
-<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession  && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import java.time.LocalDate;
 <%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
@@ -659,7 +659,7 @@ public class UserService {
   <%_ if (reactive) { _%>
     <%_ if (databaseTypeSql && authenticationTypeOauth2) { _%>
     @Transactional
-    public Mono<User> saveUser(User user) {
+    public Mono<<%= asEntity('User') %>> saveUser(<%= asEntity('User') %> user) {
         return saveUser(user, false);
     }
 
@@ -682,7 +682,7 @@ public class UserService {
                 // Saving the relationship can be done in an entity callback
                 // once https://github.com/spring-projects/spring-data-r2dbc/issues/215 is done
         <%_ if (authenticationTypeOauth2) { _%>
-                Mono<User> persistedUser;
+                Mono<<%= asEntity('User') %>> persistedUser;
                 if (forceCreate) {
                     persistedUser = userRepository.create(user);
                 } else {
@@ -1017,15 +1017,20 @@ public class UserService {
     private static <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %> getUser(Map<String, Object> details) {
         <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %> user = new <%= databaseTypeNo ? asDto('AdminUser') : asEntity('User') %>();
         Boolean activated = Boolean.TRUE;
+        String sub = String.valueOf(details.get("sub"));
+        String username = null;
+        if (details.get("preferred_username") != null) {
+            username = ((String) details.get("preferred_username")).toLowerCase();
+        }
         // handle resource server JWT, where sub claim is email and uid is ID
         if (details.get("uid") != null) {
             user.setId((String) details.get("uid"));
-            user.setLogin((String) details.get("sub"));
+            user.setLogin(sub);
         } else {
-            user.setId((String) details.get("sub"));
+            user.setId(sub);
         }
-        if (details.get("preferred_username") != null) {
-            user.setLogin(((String) details.get("preferred_username")).toLowerCase());
+        if (username != null) {
+            user.setLogin(username);
         } else if (user.getLogin() == null) {
             user.setLogin(user.getId());
         }
@@ -1042,8 +1047,11 @@ public class UserService {
         }
         if (details.get("email") != null) {
             user.setEmail(((String) details.get("email")).toLowerCase());
+        } else if (sub.contains("|") && (username != null && username.contains("@"))) {
+            // special handling for Auth0
+            user.setEmail(username);
         } else {
-            user.setEmail((String) details.get("sub"));
+            user.setEmail(sub);
         }
         if (details.get("langKey") != null) {
             user.setLangKey((String) details.get("langKey"));

package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs

@@ -71,12 +71,12 @@ public class <%= asDto('User') %> {
     }
 
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-        public String get<%= javaBeanCase(field.fieldName) %>() {
-            return <%= field.fieldName %>;
-        }
-        public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
-            this.<%= field.fieldName %> = <%= field.fieldName %>;
-        }
+    public String get<%= javaBeanCase(field.fieldName) %>() {
+        return <%= field.fieldName %>;
+    }
+    public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
+        this.<%= field.fieldName %> = <%= field.fieldName %>;
+    }
 <%_ } _%>
 
     // prettier-ignore

package/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs

@@ -34,12 +34,13 @@ import reactor.core.publisher.Mono;
 @Component
 public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
 
+    private static final String OPEN_API_PATH = "/v3/api-docs";
     private static final Logger log = LoggerFactory.getLogger(ModifyServersOpenApiFilter.class);
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String path = exchange.getRequest().getURI().getPath();
-        if (path.startsWith("/services") && path.contains("/v3/api-docs")) {
+        if (path.startsWith("/services") && path.contains(OPEN_API_PATH)) {
             ServerHttpResponse originalResponse = exchange.getResponse();
             DataBufferFactory bufferFactory = originalResponse.bufferFactory();
             ServerHttpResponseDecorator decoratedResponse = createModifyServersOpenApiInterceptor(path, originalResponse, bufferFactory);
@@ -109,7 +110,7 @@ public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode jsonBody = mapper.readTree(strBody);
                 ObjectNode serversToJson = mapper.createObjectNode();
-                serversToJson.set("url", mapper.valueToTree(path.replace("/v3/api-docs", "")));
+                serversToJson.set("url", mapper.valueToTree(path.replaceFirst(OPEN_API_PATH + "(/.*)?$", "")));
                 serversToJson.set("description", mapper.valueToTree("added by global filter"));
 
                 // add custom server

package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs

@@ -35,7 +35,7 @@ public class SpaWebFilter implements WebFilter {
         String path = exchange.getRequest().getURI().getPath();
         if (!path.startsWith("/api") && !path.startsWith("/management")<% if (authenticationTypeOauth2) { %> && !path.startsWith("/login")<% } %>
 <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
-            && !path.startsWith("/services") && !path.startsWith("/swagger") && !path.startsWith("/v2/api-docs") && !path.startsWith("/v3/api-docs")
+            && !path.startsWith("/services") && !path.startsWith("/v3/api-docs")
 <%_ } _%>
             && path.matches("[^\\\\.]*")) {
             return chain.filter(

package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs

@@ -126,7 +126,7 @@ public class PublicUserResource {
     @GetMapping("/users")
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
-    public ResponseEntity<List<<%= asDto('User') %>>> getAllPublicUsers(Pageable pageable) {
+    public ResponseEntity<List<<%= asDto('User') %>>> getAllPublicUsers(@org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
@@ -139,7 +139,7 @@ public class PublicUserResource {
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
     }
   <%_ } else { _%>
-    public Mono<ResponseEntity<Flux<<%= asDto('User') %>>>> getAllPublicUsers(ServerHttpRequest request, Pageable pageable) {
+    public Mono<ResponseEntity<Flux<<%= asDto('User') %>>>> getAllPublicUsers(ServerHttpRequest request, @org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {

package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs

@@ -284,7 +284,7 @@ public class UserResource {
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
-    public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(Pageable pageable) {
+    public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
@@ -296,7 +296,7 @@ public class UserResource {
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
   <%_ } else { _%>
-    public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(ServerHttpRequest request, Pageable pageable) {
+    public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject ServerHttpRequest request, @org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {

package/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -32,6 +32,17 @@
 # http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
 # ===================================================================
 
+---
+# Conditionally disable springdoc on missing api-docs profile
+spring:
+  config:
+    activate:
+      on-profile: '!api-docs'
+springdoc:
+  api-docs:
+    enabled: false
+---
+
 <%_ if (serviceDiscoveryEureka) { _%>
 eureka:
   client:
@@ -85,24 +96,24 @@ management:
     web:
       base-path: /management
       exposure:
-        include: ["configprops", "env", <% if (applicationTypeGateway && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable) { %>, "caches"<% } %><% if (databaseTypeSql) { %>, "liquibase"<% } %>]
+        include: ["configprops", "env", <% if (applicationTypeGateway && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", 'jhiopenapigroups', "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable) { %>, "caches"<% } %><% if (databaseTypeSql) { %>, "liquibase"<% } %>]
   endpoint:
     health:
       show-details: when_authorized
       roles: "ROLE_ADMIN"
       probes:
         enabled: true
+      group:
+        liveness:
+          include: livenessState
+        readiness:
+          include: readinessState<% if (databaseTypeSql) { %>,db<% } %>
     jhimetrics:
       enabled: true
   info:
     git:
       mode: full
   health:
-    group:
-      liveness:
-        include: livenessState
-      readiness:
-        include: readinessState<% if (databaseTypeSql) { %>,db<% } %>
     mail:
       enabled: false # When using the MailService, configure an SMTP server and set this to true
   metrics:
@@ -289,6 +300,9 @@ server:
       cookie:
         http-only: true
 
+springdoc:
+  show-actuator: true
+
 # Properties to be exposed on the /info management endpoint
 info:
   # Comma separated list of profiles that will trigger the ribbon to show
@@ -318,8 +332,8 @@ jhipster:
   mail:
     from: <%= baseName %>@localhost
   api-docs:
-    default-include-pattern: ${server.servlet.context-path:}/api/.*
-    management-include-pattern: ${server.servlet.context-path:}/management/.*
+    default-include-pattern: ${server.servlet.context-path:}/api/**
+    management-include-pattern: ${server.servlet.context-path:}/management/**
     title: <%= humanizedBaseName %> API
     description: <%= humanizedBaseName %> API documentation
     version: 0.0.1

package/generators/server/templates/src/main/resources/logback-spring.xml.ejs

@@ -138,13 +138,12 @@
 <%_ if (reactive) { _%>
     <logger name="reactor" level="WARN"/>
 <%_ } _%>
-    <logger name="springfox" level="WARN"/>
+    <logger name="io.swagger.v3" level="INFO"/>
     <logger name="sun.rmi" level="WARN"/>
 <%_ if (databaseTypeSql) { _%>
     <logger name="liquibase" level="WARN"/>
     <logger name="LiquibaseSchemaResolver" level="INFO"/>
 <%_ } _%>
-    <logger name="springfox.documentation.schema.property" level="ERROR"/>
 <%_ if (applicationTypeMicroservice || applicationTypeGateway || cacheProviderHazelcast) { _%>
     <logger name="sun.net.www" level="INFO"/>
 <%_ } _%>

package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs

@@ -78,7 +78,7 @@
 
   <ul>
 <%_ if (microfrontend) { %>
-    <li>Microfrontends packages don't provide a stand-alone front-end. Packaged microfrontend should be accessed through a JHipster gateway.</li>
+    <li>JHipster's microfrontends implementation doesn't provide a stand-alone UI. Packaged microfrontends should be accessed through a JHipster gateway.</li>
     <li>Stand-alone development server can be started by `npm start`.</li>
 <%_ } else { %>
     <li>It does not have a front-end. The front-end should be generated on a JHipster gateway.</li>

package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs

@@ -18,19 +18,15 @@
 -%>
 package <%= packageName %>.cucumber;
 
-import org.junit.runner.RunWith;
-
 <%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import <%= packageName %>.AbstractNeo4jIT;
 <%_ } _%>
-import io.cucumber.junit.CucumberOptions;
-import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.platform.engine.Cucumber;
 
-@RunWith(Cucumber.class)
-@CucumberOptions(plugin = "pretty", features = "<%= TEST_DIR %>features")
+@Cucumber
 <%_ if (databaseTypeNeo4j) { _%>
 @ExtendWith(AbstractNeo4jIT)
 <%_ } _%>

package/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs

@@ -18,13 +18,12 @@
 -%>
 package <%= packageName %>.cucumber;
 
-import <%= packageName %>.<%= mainClass %>;
+import <%= packageName %>.IntegrationTest;
 import io.cucumber.spring.CucumberContextConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @CucumberContextConfiguration
-@SpringBootTest(classes = <%= mainClass %>.class)
+@IntegrationTest
 @WebAppConfiguration
 public class CucumberTestContextConfiguration {
 

package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs

@@ -18,36 +18,71 @@
 -%>
 package <%= packageName %>.cucumber.stepdefs;
 
+import java.util.List;
+import java.util.ArrayList;
+
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
 
 import <%= packageName %>.web.rest.UserResource;
+import <%= packageName %>.security.AuthoritiesConstants;
+
+<%_ if (reactive) { _%>
+import org.springframework.test.web.reactive.server.WebTestClient;
+<%_ } else { _%>
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+<%_ } _%>
 
 public class UserStepDefs extends StepDefs {
 
     @Autowired
     private UserResource userResource;
 
-    private MockMvc restUserMockMvc;
+<%_ if (reactive) { _%>
+    private WebTestClient userResourceMock;
+<%_ } else { _%>
+    private MockMvc userResourceMock;
+<%_ } _%>
 
     @Before
     public void setup() {
-        this.restUserMockMvc = MockMvcBuilders.standaloneSetup(userResource).build();
+        List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+        grantedAuthorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN));
+        User principal = new User("username", "", true, true, true, true, grantedAuthorities);
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+            principal,
+            principal.getPassword(),
+            principal.getAuthorities()
+        );
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+        this.userResourceMock = MockMvcBuilders.standaloneSetup(userResource).build();
     }
 
     @When("I search user {string}")
     public void i_search_user(String userId) throws Throwable {
-        actions = restUserMockMvc.perform(get("/api/users/" + userId)
-                .accept(MediaType.APPLICATION_JSON));
+<%_ if (reactive) { _%>
+        actions = userResourceMock.get().uri("/api/admin/users/" + userId)
+<%_ } else { _%>
+        actions = userResourceMock.perform(get("/api/admin/users/" + userId)
+<%_ } _%>
+                    .accept(MediaType.APPLICATION_JSON)<% if (!reactive) { %>)<%_ } _%>;
     }
 
     @Then("the user is found")

package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs

@@ -0,0 +1,113 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.management;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collection;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SecurityMetersServiceTests {
+    private static final String INVALID_TOKENS_METER_EXPECTED_NAME = "security.authentication.invalid-tokens";
+
+    private MeterRegistry meterRegistry;
+
+    private SecurityMetersService securityMetersService;
+
+    @BeforeEach
+    public void setup() {
+        meterRegistry = new SimpleMeterRegistry();
+
+        securityMetersService = new SecurityMetersService(meterRegistry);
+    }
+
+    @Test
+    void testInvalidTokensCountersByCauseAreCreated() {
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).counter();
+
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "expired")
+            .counter();
+
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "unsupported")
+            .counter();
+
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "invalid-signature")
+            .counter();
+
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "malformed")
+            .counter();
+
+        Collection<Counter> counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters();
+
+        assertThat(counters).hasSize(4);
+    }
+
+    @Test
+    void testCountMethodsShouldBeBoundToCorrectCounters() {
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "expired")
+            .counter().count()).isZero();
+
+        securityMetersService.trackTokenExpired();
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "expired")
+            .counter().count()).isEqualTo(1);
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "unsupported")
+            .counter().count()).isZero();
+
+        securityMetersService.trackTokenUnsupported();
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "unsupported")
+            .counter().count()).isEqualTo(1);
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "invalid-signature")
+            .counter().count()).isZero();
+
+        securityMetersService.trackTokenInvalidSignature();
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "invalid-signature")
+            .counter().count()).isEqualTo(1);
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "malformed")
+            .counter().count()).isZero();
+
+        securityMetersService.trackTokenMalformed();
+
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
+            .tag("cause", "malformed")
+            .counter().count()).isEqualTo(1);
+    }
+
+}

package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs

@@ -18,8 +18,10 @@
 -%>
 package <%= packageName %>.security.jwt;
 
+import <%= packageName %>.management.SecurityMetersService;
 import <%= packageName %>.security.AuthoritiesConstants;
 import tech.jhipster.config.JHipsterProperties;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 
@@ -63,7 +65,10 @@ class JWTFilterTest {
         JHipsterProperties jHipsterProperties = new JHipsterProperties();
         String base64Secret = "fd54a45s65fds737b9aafcb3412e07ed99b267f33413274720ddbb7f6c5e64e9f14075f2d7ed041592f0b7657baf8";
         jHipsterProperties.getSecurity().getAuthentication().getJwt().setBase64Secret(base64Secret);
-        tokenProvider = new TokenProvider(jHipsterProperties);
+
+        SecurityMetersService securityMetersService = new SecurityMetersService(new SimpleMeterRegistry());
+
+        tokenProvider = new TokenProvider(jHipsterProperties, securityMetersService);
         ReflectionTestUtils.setField(tokenProvider, "key", Keys.hmacShaKeyFor(Decoders.BASE64.decode(base64Secret)));
 
         ReflectionTestUtils.setField(tokenProvider, "tokenValidityInMilliseconds", 60000);