Merge branch 'main' into cleanups

Author: AXONE-IO

git-gateway/src/main/java/com/axone_io/ignition/git/GatewayScriptModule.java

@@ -81,8 +81,10 @@ protected boolean commitImpl(String projectName, String userName, List<String> c
                     git.add().addFilepattern(change).call();
                     git.add().setUpdate(true).addFilepattern(change).call();
                 }
-
-                git.commit().setMessage(message).call();
+                
+                CommitCommand commit = git.commit().setMessage(message);
+                setCommitAuthor(commit, projectName, userName);
+                commit.call();
             } catch (GitAPIException e) {
                 logger.error(e.toString(), e);
                 throw new RuntimeException(e);
@@ -157,9 +159,12 @@ public void setupLocalRepoImpl(String projectName, String userName) throws Excep
                 git.remoteAdd().setName("origin").setUri(new URIish(gitProjectsConfigRecord.getURI())).call();
 
                 git.add().addFilepattern(".").call();
-                git.commit().setMessage("Initial commit").call();
+                
+                CommitCommand commit = git.commit().setMessage("Initial commit");
+                setCommitAuthor(commit, projectName, userName);
+                commit.call();
+                
                 PushCommand pushCommand = git.push();
-
                 setAuthentication(pushCommand, projectName, userName);
                 pushCommand.setRemote("origin").setRefSpecs(new RefSpec("master")).call();
             }catch (Exception e){

git-gateway/src/main/java/com/axone_io/ignition/git/managers/GitManager.java

@@ -23,6 +23,7 @@
 import com.inductiveautomation.ignition.gateway.images.ImageRecord;
 import com.inductiveautomation.ignition.gateway.project.ProjectManager;
 import org.apache.commons.io.FileUtils;
+import org.eclipse.jgit.api.CommitCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.TransportCommand;
 import org.eclipse.jgit.lib.StoredConfig;
@@ -176,6 +177,17 @@ public static void setAuthentication(TransportCommand<?, ?> command, String proj
         }
     }
 
+    public static void setCommitAuthor(CommitCommand command, String projectName, String userName){
+        try {
+            GitProjectsConfigRecord gitProjectsConfigRecord = getGitProjectConfigRecord(projectName);
+            GitReposUsersRecord user = getGitReposUserRecord(gitProjectsConfigRecord, userName);
+            command.setAuthor("", user.getEmail());
+        } catch (Exception e){
+            logger.error("An error occurred while setting up commit author.", e);
+        }
+
+    }
+
     public static GitProjectsConfigRecord getGitProjectConfigRecord(String projectName) throws Exception {
         SQuery<GitProjectsConfigRecord> projectQuery = new SQuery<>(GitProjectsConfigRecord.META)
                 .eq(GitProjectsConfigRecord.ProjectName, projectName);

git-gateway/src/main/java/com/axone_io/ignition/git/records/GitReposUsersRecord.java

@@ -9,7 +9,9 @@
 import com.inductiveautomation.ignition.gateway.web.components.editors.TextAreaEditorSource;
 import com.inductiveautomation.ignition.gateway.web.components.user.UserEditForm;
 import com.inductiveautomation.ignition.gateway.web.util.UniqueStringValidator;
+import org.apache.wicket.markup.html.form.EmailTextField;
 import org.apache.wicket.validation.IValidator;
+import org.apache.wicket.validation.validator.EmailAddressValidator;
 import org.apache.wicket.validation.validator.StringValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,10 +39,12 @@ public RecordMeta<?> getMeta() {
     public static final StringField IgnitionUser = new StringField(META, "IgnitionUser", SFieldFlags.SPRIMARY_KEY, SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE);
     public static final StringField SSHKey = new StringField(META, "SSHKey");
 
-    public static final StringField UserName = new StringField(META, "UserName");
+    public static final StringField UserName = new StringField(META, "UserName", SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE);
+
+    public static final StringField Email = new StringField(META, "Email", SFieldFlags.SMANDATORY, SFieldFlags.SDESCRIPTIVE);
     public static final EncodedStringField Password = new EncodedStringField(META, "Password");
 
-    static final Category UserProperties = new Category("GitReposUsersRecord.Category.UserProperties", 1000).include(ProjectName, IgnitionUser, SSHKey, UserName, Password);
+    static final Category UserProperties = new Category("GitReposUsersRecord.Category.UserProperties", 1000).include(ProjectName, IgnitionUser, UserName, Email, SSHKey, Password);
 
     public int getId(){
         return this.getInt(Id);
@@ -49,6 +53,7 @@ public int getProjectId(){
         return this.getInt(ProjectId);
     }
     public String getUserName(){ return this.getString(UserName); }
+    public String getEmail(){ return this.getString(Email); }
     public String getIgnitionUser(){ return this.getString(IgnitionUser); }
     public String getProjectName(){ return this.getString(ProjectName); }
     public String getPassword(){ return this.getString(Password); }
@@ -78,6 +83,11 @@ public int getProjectId(){
         UserName.getFormMeta().setFieldDescriptionKeyAddMode("GitReposUsersRecord.UserName.NewDesc");
         UserName.getFormMeta().setFieldDescriptionKeyEditMode("GitReposUsersRecord.UserName.EditDesc");
 
+        Email.getFormMeta().addValidator(EmailAddressValidator.getInstance());
+        Email.getFormMeta().setFieldDescriptionKey("GitReposUsersRecord.Email.Desc");
+        Email.getFormMeta().setFieldDescriptionKeyAddMode("GitReposUsersRecord.Email.NewDesc");
+        Email.getFormMeta().setFieldDescriptionKeyEditMode("GitReposUsersRecord.Email.EditDesc");
+
         Password.getFormMeta().setFieldDescriptionKey("GitReposUsersRecord.Password.Desc");
         Password.getFormMeta().setFieldDescriptionKeyAddMode("GitReposUsersRecord.Password.NewDesc");
         Password.getFormMeta().setFieldDescriptionKeyEditMode("GitReposUsersRecord.Password.EditDesc");

git-gateway/src/main/resources/com/axone_io/ignition/git/records/GitProjectsConfigRecord.properties

@@ -10,7 +10,5 @@ URI.EditDesc=The URI of git repository. Http or SSH.
 
 Category.ProjectConfiguration=Project Configuration
 
-Config.Projects.UserLink=manage users
-
 Noun=Project
 NounPlural=Projects

git-gateway/src/main/resources/com/axone_io/ignition/git/records/GitReposUsersRecord.properties

@@ -16,9 +16,14 @@ SSHKey.NewDesc=The SSH Key of your user git account.
 SSHKey.EditDesc=The SSH Key of your user git account.
 
 UserName.Name=Username
-UserName.Desc=The username or email of the git account.
-UserName.NewDesc=The username or email of the git account.
-UserName.EditDesc=The username or email of the git account.
+UserName.Desc=The username of the git account.
+UserName.NewDesc=The username of the git account.
+UserName.EditDesc=The username of the git account.
+
+Email.Name=Email
+Email.Desc=The email of the git account.
+Email.NewDesc=The email of the git account.
+Email.EditDesc=The email of the git account.
 
 Password.Name=Password
 Password.Desc=The password or personal access token for the git account.

git-gateway/src/main/resources/com/axone_io/ignition/git/web/GitProjectsConfigPage.properties

@@ -0,0 +1 @@
+Config.Projects.UserLink=manage users