Improve auth providers to be in sync with PE new logic

application/src/main/java/org/thingsboard/server/service/security/auth/AbstractAuthenticationProvider.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright © 2016-2025 The Thingsboard Authors
+ *
+ * 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
+ *
+ *     http://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 org.thingsboard.server.service.security.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.UserAuthDetails;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.UserPrincipal;
+import org.thingsboard.server.service.user.cache.UserAuthDetailsCache;
+
+import java.util.UUID;
+
+@Slf4j
+@RequiredArgsConstructor
+public abstract class AbstractAuthenticationProvider implements AuthenticationProvider {
+
+    private final CustomerService customerService;
+    private final UserAuthDetailsCache userAuthDetailsCache;
+
+    protected SecurityUser authenticateByPublicId(String publicId, String authContextName, UserPrincipal userPrincipal) {
+        TenantId systemId = TenantId.SYS_TENANT_ID;
+        CustomerId customerId;
+        try {
+            customerId = new CustomerId(UUID.fromString(publicId));
+        } catch (Exception e) {
+            throw new BadCredentialsException(authContextName + " is not valid");
+        }
+        Customer publicCustomer = customerService.findCustomerById(systemId, customerId);
+        if (publicCustomer == null) {
+            throw new UsernameNotFoundException("Public entity not found");
+        }
+
+        if (!publicCustomer.isPublic()) {
+            throw new BadCredentialsException(authContextName + " is not valid");
+        }
+
+        User user = new User(new UserId(EntityId.NULL_UUID));
+        user.setTenantId(publicCustomer.getTenantId());
+        user.setCustomerId(publicCustomer.getId());
+        user.setEmail(publicId);
+        user.setAuthority(Authority.CUSTOMER_USER);
+        user.setFirstName("Public");
+        user.setLastName("Public");
+
+        UserPrincipal principal = userPrincipal == null ? new UserPrincipal(UserPrincipal.Type.PUBLIC_ID, publicId) : userPrincipal;
+
+        return new SecurityUser(user, true, principal);
+    }
+
+    protected SecurityUser authenticateByUserId(TenantId tenantId, UserId userId) {
+        UserAuthDetails userAuthDetails = userAuthDetailsCache.getUserAuthDetails(tenantId, userId);
+        if (userAuthDetails == null) {
+            throw new UsernameNotFoundException("User with credentials not found");
+        }
+        if (!userAuthDetails.credentialsEnabled()) {
+            throw new DisabledException("User is not active");
+        }
+
+        User user = userAuthDetails.user();
+        if (user.getAuthority() == null) {
+            throw new InsufficientAuthenticationException("User has no authority assigned");
+        }
+
+        UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
+        return new SecurityUser(user, true, userPrincipal);
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java

@@ -15,26 +15,14 @@
  */
 package org.thingsboard.server.service.security.auth.jwt;
 
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.CredentialsExpiredException;
-import org.springframework.security.authentication.DisabledException;
-import org.springframework.security.authentication.InsufficientAuthenticationException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
-import org.thingsboard.server.common.data.Customer;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.UserAuthDetails;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.service.security.auth.AbstractAuthenticationProvider;
 import org.thingsboard.server.service.security.auth.RefreshAuthenticationToken;
 import org.thingsboard.server.service.security.auth.TokenOutdatingService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -43,17 +31,19 @@ import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
 import org.thingsboard.server.service.user.cache.UserAuthDetailsCache;
 
-import java.util.UUID;
-
 @Component
-@RequiredArgsConstructor
+public class RefreshTokenAuthenticationProvider extends AbstractAuthenticationProvider {
-public class RefreshTokenAuthenticationProvider implements AuthenticationProvider {
 
     private final JwtTokenFactory tokenFactory;
-    private final UserAuthDetailsCache userAuthDetailsCache;
-    private final CustomerService customerService;
     private final TokenOutdatingService tokenOutdatingService;
 
+    public RefreshTokenAuthenticationProvider(JwtTokenFactory jwtTokenFactory, UserAuthDetailsCache userAuthDetailsCache,
+                                              CustomerService customerService, TokenOutdatingService tokenOutdatingService) {
+        super(customerService, userAuthDetailsCache);
+        this.tokenFactory = jwtTokenFactory;
+        this.tokenOutdatingService = tokenOutdatingService;
+    }
+
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
         Assert.notNull(authentication, "No authentication data provided");
@@ -63,7 +53,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
 
         SecurityUser securityUser;
         if (principal.getType() == UserPrincipal.Type.USER_NAME) {
-            securityUser = authenticateByUserId(unsafeUser.getId());
+            securityUser = authenticateByUserId(TenantId.SYS_TENANT_ID, unsafeUser.getId());
         } else {
             securityUser = authenticateByPublicId(principal.getValue());
         }
@@ -75,52 +65,8 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
         return new RefreshAuthenticationToken(securityUser);
     }
 
-    private SecurityUser authenticateByUserId(UserId userId) {
-        UserAuthDetails userAuthDetails = userAuthDetailsCache.getUserAuthDetails(TenantId.SYS_TENANT_ID, userId);
-        if (userAuthDetails == null) {
-            throw new UsernameNotFoundException("User with credentials not found");
-        }
-        if (!userAuthDetails.credentialsEnabled()) {
-            throw new DisabledException("User is not active");
-        }
-
-        User user = userAuthDetails.user();
-        if (user.getAuthority() == null) {
-            throw new InsufficientAuthenticationException("User has no authority assigned");
-        }
-
-        UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
-        return new SecurityUser(user, true, userPrincipal);
-    }
-
     private SecurityUser authenticateByPublicId(String publicId) {
-        TenantId systemId = TenantId.SYS_TENANT_ID;
+        return super.authenticateByPublicId(publicId, "Refresh token", null);
-        CustomerId customerId;
-        try {
-            customerId = new CustomerId(UUID.fromString(publicId));
-        } catch (Exception e) {
-            throw new BadCredentialsException("Refresh token is not valid");
-        }
-        Customer publicCustomer = customerService.findCustomerById(systemId, customerId);
-        if (publicCustomer == null) {
-            throw new UsernameNotFoundException("Public entity not found by refresh token");
-        }
-
-        if (!publicCustomer.isPublic()) {
-            throw new BadCredentialsException("Refresh token is not valid");
-        }
-
-        User user = new User(new UserId(EntityId.NULL_UUID));
-        user.setTenantId(publicCustomer.getTenantId());
-        user.setCustomerId(publicCustomer.getId());
-        user.setEmail(publicId);
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setFirstName("Public");
-        user.setLastName("Public");
-
-        UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.PUBLIC_ID, publicId);
-
-        return new SecurityUser(user, true, userPrincipal);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationProvider.java

@@ -15,42 +15,35 @@
  */
 package org.thingsboard.server.service.security.auth.pat;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.CredentialsExpiredException;
 import org.springframework.security.authentication.DisabledException;
-import org.springframework.security.authentication.InsufficientAuthenticationException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.UserAuthDetails;
 import org.thingsboard.server.common.data.pat.ApiKey;
 import org.thingsboard.server.dao.pat.ApiKeyService;
+import org.thingsboard.server.service.security.auth.AbstractAuthenticationProvider;
 import org.thingsboard.server.service.security.model.SecurityUser;
-import org.thingsboard.server.service.security.model.UserPrincipal;
+import org.thingsboard.server.service.security.model.token.ApiKeyAuthRequest;
-import org.thingsboard.server.service.security.model.token.RawApiKey;
 import org.thingsboard.server.service.user.cache.UserAuthDetailsCache;
 
 @Component
-@RequiredArgsConstructor
+public class ApiKeyAuthenticationProvider extends AbstractAuthenticationProvider {
-public class ApiKeyAuthenticationProvider implements org.springframework.security.authentication.AuthenticationProvider {
 
     private final ApiKeyService apiKeyService;
-    private final UserAuthDetailsCache userAuthDetailsCache;
 
-    @Override
+    public ApiKeyAuthenticationProvider(ApiKeyService apiKeyService, UserAuthDetailsCache userAuthDetailsCache) {
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        super(null, userAuthDetailsCache);
-        RawApiKey rawApiKey = (RawApiKey) authentication.getCredentials();
+        this.apiKeyService = apiKeyService;
-        SecurityUser securityUser = authenticate(rawApiKey.apiKey());
-        return new ApiKeyAuthenticationToken(securityUser);
     }
 
     @Override
-    public boolean supports(Class<?> authentication) {
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        return ApiKeyAuthenticationToken.class.isAssignableFrom(authentication);
+        ApiKeyAuthRequest apiKeyAuthRequest = (ApiKeyAuthRequest) authentication.getCredentials();
+        SecurityUser securityUser = authenticate(apiKeyAuthRequest.apiKey());
+        return new ApiKeyAuthenticationToken(securityUser);
     }
 
     private SecurityUser authenticate(String key) {
@@ -67,20 +60,12 @@ public class ApiKeyAuthenticationProvider implements org.springframework.securit
         if (apiKey.getExpirationTime() != 0 && apiKey.getExpirationTime() < System.currentTimeMillis()) {
             throw new CredentialsExpiredException("API key is expired");
         }
-        UserAuthDetails userAuthDetails = userAuthDetailsCache.getUserAuthDetails(apiKey.getTenantId(), apiKey.getUserId());
+        return super.authenticateByUserId(apiKey.getTenantId(), apiKey.getUserId());
-        if (userAuthDetails == null) {
+    }
-            throw new UsernameNotFoundException("User with credentials not found");
-        }
-        if (!userAuthDetails.credentialsEnabled()) {
-            throw new DisabledException("User is not active");
-        }
 
-        User user = userAuthDetails.user();
+    @Override
-        if (user.getAuthority() == null) {
+    public boolean supports(Class<?> authentication) {
-            throw new InsufficientAuthenticationException("User has no authority assigned");
+        return ApiKeyAuthenticationToken.class.isAssignableFrom(authentication);
-        }
-        UserPrincipal userPrincipal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
-        return new SecurityUser(user, true, userPrincipal);
     }
 
 }

application/src/main/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationToken.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.service.security.auth.pat;
 
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.thingsboard.server.service.security.model.SecurityUser;
-import org.thingsboard.server.service.security.model.token.RawApiKey;
+import org.thingsboard.server.service.security.model.token.ApiKeyAuthRequest;
 
 import java.io.Serial;
 
@@ -26,12 +26,12 @@ public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
     @Serial
     private static final long serialVersionUID = 2978710889397403536L;
 
-    private RawApiKey rawApiKey;
+    private ApiKeyAuthRequest apiKeyAuthRequest;
     private SecurityUser securityUser;
 
-    public ApiKeyAuthenticationToken(RawApiKey rawApiKey) {
+    public ApiKeyAuthenticationToken(ApiKeyAuthRequest apiKeyAuthRequest) {
         super(null);
-        this.rawApiKey = rawApiKey;
+        this.apiKeyAuthRequest = apiKeyAuthRequest;
         setAuthenticated(false);
     }
 
@@ -44,7 +44,7 @@ public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
 
     @Override
     public Object getCredentials() {
-        return rawApiKey;
+        return apiKeyAuthRequest;
     }
 
     @Override
@@ -55,7 +55,7 @@ public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
     @Override
     public void eraseCredentials() {
         super.eraseCredentials();
-        this.rawApiKey = null;
+        this.apiKeyAuthRequest = null;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/security/auth/pat/ApiKeyTokenAuthenticationProcessingFilter.java

@@ -29,7 +29,7 @@ import org.springframework.security.web.authentication.AbstractAuthenticationPro
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.thingsboard.server.service.security.auth.extractor.TokenExtractor;
-import org.thingsboard.server.service.security.model.token.RawApiKey;
+import org.thingsboard.server.service.security.model.token.ApiKeyAuthRequest;
 
 import java.io.IOException;
 
@@ -52,8 +52,9 @@ public class ApiKeyTokenAuthenticationProcessingFilter extends AbstractAuthentic
 
     @Override
     public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-        RawApiKey rawApiKey = new RawApiKey(tokenExtractor.extract(request));
+        String apiKeyValue = tokenExtractor.extract(request);
-        return getAuthenticationManager().authenticate(new ApiKeyAuthenticationToken(rawApiKey));
+        ApiKeyAuthRequest apiKeyAuthRequest = new ApiKeyAuthRequest(apiKeyValue);
+        return getAuthenticationManager().authenticate(new ApiKeyAuthenticationToken(apiKeyAuthRequest));
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.service.security.auth.rest;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.InsufficientAuthenticationException;
 import org.springframework.security.authentication.LockedException;
@@ -27,14 +26,9 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.model.SecuritySettings;
 import org.thingsboard.server.common.data.security.model.UserPasswordPolicy;
@@ -43,6 +37,7 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.settings.SecuritySettingsService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.security.auth.AbstractAuthenticationProvider;
 import org.thingsboard.server.service.security.auth.MfaAuthenticationToken;
 import org.thingsboard.server.service.security.auth.MfaConfigurationToken;
 import org.thingsboard.server.service.security.auth.mfa.TwoFactorAuthService;
@@ -51,18 +46,14 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import java.util.UUID;
-
-
 @Component
 @Slf4j
 @TbCoreComponent
-public class RestAuthenticationProvider implements AuthenticationProvider {
+public class RestAuthenticationProvider extends AbstractAuthenticationProvider {
 
     private final SystemSecurityService systemSecurityService;
     private final SecuritySettingsService securitySettingsService;
     private final UserService userService;
-    private final CustomerService customerService;
     private final TwoFactorAuthService twoFactorAuthService;
 
     @Autowired
@@ -71,8 +62,8 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
                                       final SystemSecurityService systemSecurityService,
                                       SecuritySettingsService securitySettingsService,
                                       TwoFactorAuthService twoFactorAuthService) {
+        super(customerService, null);
         this.userService = userService;
-        this.customerService = customerService;
         this.systemSecurityService = systemSecurityService;
         this.securitySettingsService = securitySettingsService;
         this.twoFactorAuthService = twoFactorAuthService;
@@ -125,7 +116,6 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
         }
 
         try {
-
             UserCredentials userCredentials = userService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, user.getId());
             if (userCredentials == null) {
                 throw new UsernameNotFoundException("User credentials not found");
@@ -138,8 +128,9 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
                 throw e;
             }
 
-            if (user.getAuthority() == null)
+            if (user.getAuthority() == null) {
                 throw new InsufficientAuthenticationException("User has no authority assigned");
+            }
 
             return new SecurityUser(user, userCredentials.isEnabled(), userPrincipal);
         } catch (Exception e) {
@@ -149,28 +140,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     }
 
     private SecurityUser authenticateByPublicId(UserPrincipal userPrincipal, String publicId) {
-        CustomerId customerId;
+        return super.authenticateByPublicId(publicId, "Public Id", userPrincipal);
-        try {
-            customerId = new CustomerId(UUID.fromString(publicId));
-        } catch (Exception e) {
-            throw new BadCredentialsException("Authentication Failed. Public Id is not valid.");
-        }
-        Customer publicCustomer = customerService.findCustomerById(TenantId.SYS_TENANT_ID, customerId);
-        if (publicCustomer == null) {
-            throw new UsernameNotFoundException("Public entity not found: " + publicId);
-        }
-        if (!publicCustomer.isPublic()) {
-            throw new BadCredentialsException("Authentication Failed. Public Id is not valid.");
-        }
-        User user = new User(new UserId(EntityId.NULL_UUID));
-        user.setTenantId(publicCustomer.getTenantId());
-        user.setCustomerId(publicCustomer.getId());
-        user.setEmail(publicId);
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setFirstName("Public");
-        user.setLastName("Public");
-
-        return new SecurityUser(user, true, userPrincipal);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/security/model/token/RawApiKey.java → application/src/main/java/org/thingsboard/server/service/security/model/token/ApiKeyAuthRequest.java

@@ -15,4 +15,4 @@
  */
 package org.thingsboard.server.service.security.model.token;
 
-public record RawApiKey(String apiKey) {}
+public record ApiKeyAuthRequest(String apiKey) {}

dao/src/main/java/org/thingsboard/server/dao/model/BaseSqlEntity.java

@@ -36,9 +36,6 @@ import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * Created by ashvayka on 13.07.17.
- */
 @Data
 @MappedSuperclass
 public abstract class BaseSqlEntity<D> implements BaseEntity<D> {

dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEntityViewEntity.java

@@ -40,10 +40,6 @@ import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_TYPE_PROPERTY;
 
-/**
- * Created by Victor Basanets on 8/30/2017.
- */
-
 @Data
 @EqualsAndHashCode(callSuper = true)
 @MappedSuperclass

dao/src/main/java/org/thingsboard/server/dao/model/sql/ApiUsageStateEntity.java

@@ -33,9 +33,6 @@ import org.thingsboard.server.dao.model.ModelConstants;
 
 import java.util.UUID;
 
-/**
- * Created by Valerii Sosliuk on 4/21/2017.
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity

dao/src/main/java/org/thingsboard/server/dao/model/sql/MobileAppBundleOauth2ClientEntity.java

@@ -32,7 +32,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.MOBILE_APP_BUNDLE_
 import static org.thingsboard.server.dao.model.ModelConstants.MOBILE_APP_BUNDLE_OAUTH2_CLIENT_MOBILE_APP_BUNDLE_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.MOBILE_APP_BUNDLE_OAUTH2_CLIENT_TABLE_NAME;
 
-
 @Data
 @Entity
 @Table(name = MOBILE_APP_BUNDLE_OAUTH2_CLIENT_TABLE_NAME)
@@ -63,4 +62,5 @@ public final class MobileAppBundleOauth2ClientEntity implements ToData<MobileApp
         result.setOAuth2ClientId(new OAuth2ClientId(oauth2ClientId));
         return result;
     }
+
 }