[MM-1137]: Fixed the secrets error found by QA

mattermost · Jan 7, 2025 · d48c119 · d48c119
1 parent fbb2462
commit d48c119
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/plugin.json b/plugin.json
@@ -120,6 +120,8 @@
                 "display_name": "At Rest Encryption Key:",
                 "type": "generated",
                 "help_text": "The encryption key used to encrypt stored API tokens.",
+                "placeholder": "",
+                "default": null,
                 "secret": true
             },
             {

diff --git a/server/plugin.go b/server/plugin.go
@@ -192,7 +192,7 @@ func (p *Plugin) OnConfigurationChange() error {
 		return err
 	}
 
-	encryptionKey := p.getConfig().EncryptionKey
+	encryptionKey := ec.EncryptionKey
 	if encryptionKey == "" {
 		p.client.Log.Warn("Encryption key required to encrypt admin API token")
 		return errors.New("failed to encrypt admin token. Encryption key not generated")
@@ -540,6 +540,15 @@ func (c *externalConfig) setDefaults() (bool, error) {
 		changed = true
 	}
 
+	if c.EncryptionKey == "" {
+		encryptionKey, err := generateSecret()
+		if err != nil {
+			return false, err
+		}
+		c.EncryptionKey = encryptionKey
+		changed = true
+	}
+
 	return changed, nil
 }