allow updates to secureJsonData.

woodsaj · woodsaj · commit ad8dbbb559d2 · 2016-04-28T18:39:23.000+08:00
SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.
diff --git a/pkg/services/sqlstore/plugin_setting.go b/pkg/services/sqlstore/plugin_setting.go
@@ -61,7 +61,6 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
 			for key, data := range cmd.SecureJsonData {
 				pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey)
 			}
-			pluginSetting.SecureJsonData = cmd.GetEncryptedJsonData()
 			pluginSetting.Updated = time.Now()
 			pluginSetting.Enabled = cmd.Enabled
 			pluginSetting.JsonData = cmd.JsonData

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {`
`61`	`61`	`for key, data := range cmd.SecureJsonData {`
`62`	`62`	`pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey)`
`63`	`63`	`}`
`64`		`- pluginSetting.SecureJsonData = cmd.GetEncryptedJsonData()`
`65`	`64`	`pluginSetting.Updated = time.Now()`
`66`	`65`	`pluginSetting.Enabled = cmd.Enabled`
`67`	`66`	`pluginSetting.JsonData = cmd.JsonData`