Fix device wizard dialog. Fix install script for oauth2 client registration templates.

@@ -42,6 +42,7 @@ import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
+import java.util.Optional;
 
 
 import static org.thingsboard.server.service.install.DatabaseHelper.objectMapper;
 import static org.thingsboard.server.service.install.DatabaseHelper.objectMapper;
 
 
@@ -243,6 +244,11 @@ public class InstallScripts {
                         try {
                         try {
                             JsonNode oauth2ConfigTemplateJson = objectMapper.readTree(path.toFile());
                             JsonNode oauth2ConfigTemplateJson = objectMapper.readTree(path.toFile());
                             OAuth2ClientRegistrationTemplate clientRegistrationTemplate = objectMapper.treeToValue(oauth2ConfigTemplateJson, OAuth2ClientRegistrationTemplate.class);
                             OAuth2ClientRegistrationTemplate clientRegistrationTemplate = objectMapper.treeToValue(oauth2ConfigTemplateJson, OAuth2ClientRegistrationTemplate.class);
+                            Optional<OAuth2ClientRegistrationTemplate> existingClientRegistrationTemplate =
+                                    oAuth2TemplateService.findClientRegistrationTemplateByProviderId(clientRegistrationTemplate.getProviderId());
+                            if (existingClientRegistrationTemplate.isPresent()) {
+                                clientRegistrationTemplate.setId(existingClientRegistrationTemplate.get().getId());
+                            }
                             oAuth2TemplateService.saveClientRegistrationTemplate(clientRegistrationTemplate);
                             oAuth2TemplateService.saveClientRegistrationTemplate(clientRegistrationTemplate);
                         } catch (Exception e) {
                         } catch (Exception e) {
                             log.error("Unable to load oauth2 config templates from json: [{}]", path.toString());
                             log.error("Unable to load oauth2 config templates from json: [{}]", path.toString());

@@ -19,10 +19,13 @@ import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 public interface OAuth2ConfigTemplateService {
 public interface OAuth2ConfigTemplateService {
     OAuth2ClientRegistrationTemplate saveClientRegistrationTemplate(OAuth2ClientRegistrationTemplate clientRegistrationTemplate);
     OAuth2ClientRegistrationTemplate saveClientRegistrationTemplate(OAuth2ClientRegistrationTemplate clientRegistrationTemplate);
 
 
+    Optional<OAuth2ClientRegistrationTemplate> findClientRegistrationTemplateByProviderId(String providerId);
+
     OAuth2ClientRegistrationTemplate findClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId);
     OAuth2ClientRegistrationTemplate findClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId);
 
 
     List<OAuth2ClientRegistrationTemplate> findAllClientRegistrationTemplates();
     List<OAuth2ClientRegistrationTemplate> findAllClientRegistrationTemplates();

@@ -19,7 +19,11 @@ import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplat
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.Dao;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 public interface OAuth2ClientRegistrationTemplateDao extends Dao<OAuth2ClientRegistrationTemplate> {
 public interface OAuth2ClientRegistrationTemplateDao extends Dao<OAuth2ClientRegistrationTemplate> {
+
+    Optional<OAuth2ClientRegistrationTemplate> findByProviderId(String providerId);
+
     List<OAuth2ClientRegistrationTemplate> findAll();
     List<OAuth2ClientRegistrationTemplate> findAll();
 }
 }

@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.DataValidator;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 import static org.thingsboard.server.dao.service.Validator.validateId;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 import static org.thingsboard.server.dao.service.Validator.validateString;
 import static org.thingsboard.server.dao.service.Validator.validateString;
@@ -37,6 +38,7 @@ import static org.thingsboard.server.dao.service.Validator.validateString;
 @Service
 @Service
 public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService implements OAuth2ConfigTemplateService {
 public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService implements OAuth2ConfigTemplateService {
     public static final String INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID = "Incorrect clientRegistrationTemplateId ";
     public static final String INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID = "Incorrect clientRegistrationTemplateId ";
+    public static final String INCORRECT_CLIENT_REGISTRATION_PROVIDER_ID = "Incorrect clientRegistrationProviderId ";
 
 
     @Autowired
     @Autowired
     private OAuth2ClientRegistrationTemplateDao clientRegistrationTemplateDao;
     private OAuth2ClientRegistrationTemplateDao clientRegistrationTemplateDao;
@@ -60,6 +62,13 @@ public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService imple
     }
     }
 
 
     @Override
     @Override
+    public Optional<OAuth2ClientRegistrationTemplate> findClientRegistrationTemplateByProviderId(String providerId) {
+        log.trace("Executing findClientRegistrationTemplateByProviderId [{}]", providerId);
+        validateString(providerId, INCORRECT_CLIENT_REGISTRATION_PROVIDER_ID + providerId);
+        return clientRegistrationTemplateDao.findByProviderId(providerId);
+    }
+
+    @Override
     public OAuth2ClientRegistrationTemplate findClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId) {
     public OAuth2ClientRegistrationTemplate findClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId) {
         log.trace("Executing findClientRegistrationTemplateById [{}]", templateId);
         log.trace("Executing findClientRegistrationTemplateById [{}]", templateId);
         validateId(templateId, INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + templateId);
         validateId(templateId, INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + templateId);

@@ -26,6 +26,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractDao;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
 
 
 @Component
 @Component
@@ -44,6 +45,12 @@ public class JpaOAuth2ClientRegistrationTemplateDao extends JpaAbstractDao<OAuth
     }
     }
 
 
     @Override
     @Override
+    public Optional<OAuth2ClientRegistrationTemplate> findByProviderId(String providerId) {
+        OAuth2ClientRegistrationTemplate oAuth2ClientRegistrationTemplate = DaoUtil.getData(repository.findByProviderId(providerId));
+        return Optional.ofNullable(oAuth2ClientRegistrationTemplate);
+    }
+
+    @Override
     public List<OAuth2ClientRegistrationTemplate> findAll() {
     public List<OAuth2ClientRegistrationTemplate> findAll() {
         Iterable<OAuth2ClientRegistrationTemplateEntity> entities = repository.findAll();
         Iterable<OAuth2ClientRegistrationTemplateEntity> entities = repository.findAll();
         List<OAuth2ClientRegistrationTemplate> result = new ArrayList<>();
         List<OAuth2ClientRegistrationTemplate> result = new ArrayList<>();

@@ -21,4 +21,7 @@ import org.thingsboard.server.dao.model.sql.OAuth2ClientRegistrationTemplateEnti
 import java.util.UUID;
 import java.util.UUID;
 
 
 public interface OAuth2ClientRegistrationTemplateRepository extends CrudRepository<OAuth2ClientRegistrationTemplateEntity, UUID> {
 public interface OAuth2ClientRegistrationTemplateRepository extends CrudRepository<OAuth2ClientRegistrationTemplateEntity, UUID> {
+
+    OAuth2ClientRegistrationTemplateEntity findByProviderId(String providerId);
+
 }
 }

@@ -266,11 +266,11 @@ export class DeviceWizardDialogComponent extends
         })
         })
       );
       );
     } else {
     } else {
-      return of(null);
+      return of(this.deviceWizardFormGroup.get('deviceProfileId').value);
     }
     }
   }
   }
 
 
-  private createDevice(profileId: EntityId = this.deviceWizardFormGroup.get('deviceProfileId').value): Observable<BaseData<HasId>> {
+  private createDevice(profileId): Observable<BaseData<HasId>> {
     const device = {
     const device = {
       name: this.deviceWizardFormGroup.get('name').value,
       name: this.deviceWizardFormGroup.get('name').value,
       label: this.deviceWizardFormGroup.get('label').value,
       label: this.deviceWizardFormGroup.get('label').value,