add login error setting

hobbyfarm · Jan 5, 2024 · b24ed97 · b24ed97
1 parent 13b4e2e
commit b24ed97
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/pkg/scenarioserver/scenarioserver.go b/pkg/scenarioserver/scenarioserver.go
@@ -112,8 +112,10 @@ func (s ScenarioServer) prepareScenario(scenario hfv1.Scenario, printable bool)
 	ps.Pauseable = scenario.Spec.Pauseable
 	ps.Printable = printable
 	ps.StepCount = len(scenario.Spec.Steps)
-	ps.ManagedBy = scenario.Labels["managed-by"]
-
+	ps.ManagedBy = "hobbyfarm"
+	if  scenario.Labels["managed-by"] != "" {
+		ps.ManagedBy = scenario.Labels["managed-by"]
+	}
 	return ps, nil
 }
 

diff --git a/pkg/setting/util.go b/pkg/setting/util.go
@@ -24,6 +24,7 @@ const (
 	ImprintLink                              SettingName = "imprint-link"
 	ImprintLinkName                          SettingName = "imprint-linkname"
 	AboutModalButtons                        SettingName = "aboutmodal-buttons"
+	LoginSettingErrorMessage 				 SettingName = "login-error-message"
 )
 
 var DataTypeMappingToProto = map[property.DataType]settingProto.DataType{

diff --git a/services/settingsvc/internal/preinstall.go b/services/settingsvc/internal/preinstall.go
@@ -241,5 +241,18 @@ func predefinedSettings() []*settingProto.CreateSettingRequest {
 				DisplayName: "Strict AccessCode Validation",
 			},
 		},
+		{
+			Name:      string(settingUtil.LoginSettingErrorMessage),
+			Namespace: util.GetReleaseNamespace(),
+			Labels: map[string]string{
+				labels.SettingScope: "public",
+			},
+			Value: "",
+			Property: &settingProto.Property{
+				DataType:    settingProto.DataType_DATA_TYPE_STRING,
+				ValueType:   settingProto.ValueType_VALUE_TYPE_SCALAR,
+				DisplayName: "Login Error Message",
+			},
+		},
 	}
 }