浏览代码

mask secret and convert jwt duration to minutes

abhishek9686 4 月之前
父节点
当前提交
f319d57771
共有 2 个文件被更改,包括 10 次插入0 次删除
  1. 3 0
      controllers/server.go
  2. 7 0
      logic/settings.go

+ 3 - 0
controllers/server.go

@@ -244,6 +244,8 @@ func getConfig(w http.ResponseWriter, r *http.Request) {
 // @Success     200 {object} config.ServerSettings
 func getSettings(w http.ResponseWriter, r *http.Request) {
 	scfg := logic.GetServerSettings()
+	scfg.ClientSecret = logic.Mask()
+	scfg.JwtValidityDuration = scfg.JwtValidityDuration / 60
 	logic.ReturnSuccessResponseWithJson(w, r, scfg, "fetched server settings successfully")
 }
 
@@ -264,6 +266,7 @@ func updateSettings(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("invalid settings"), "badrequest"))
 		return
 	}
+	req.JwtValidityDuration = req.JwtValidityDuration * 60
 	err := logic.UpsertServerSettings(req, force == "true")
 	if err != nil {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("failed to udpate server settings "+err.Error()), "internal"))

+ 7 - 0
logic/settings.go

@@ -30,6 +30,9 @@ func GetServerSettings() (s models.ServerSettings) {
 func UpsertServerSettings(s models.ServerSettings, force bool) error {
 	// get curr settings
 	currSettings := GetServerSettings()
+	if s.ClientSecret == Mask() {
+		s.ClientSecret = currSettings.ClientSecret
+	}
 	data, err := json.Marshal(s)
 	if err != nil {
 		return err
@@ -347,3 +350,7 @@ func GetAllowedEmailDomains() string {
 func GetVerbosity() int32 {
 	return GetServerSettings().Verbosity
 }
+
+func Mask() string {
+	return ("..................")
+}