Project info text and URL made configurable

charts/sda-svc/templates/auth-deploy.yaml

@@ -141,6 +141,10 @@ spec:
         {{- end }}
         - name: S3INBOX
           value: {{ .Values.global.ingress.hostName.s3Inbox }}
+        - name: INFOTEXT
+          value: {{ .Values.global.auth.infoText }}
+        - name: INFOURL
+          value: {{ .Values.global.auth.inforURL }}
         ports:
         - name: auth
           containerPort: 8080

charts/sda-svc/values.yaml

@@ -156,6 +156,10 @@ global:
     corsMethods: ""
     # @param corsCreds, allow credentials in the request, cors is disabled if false
     corsCreds: false
+    # @param infoText, name of the project
+    infoText: "About Federated EGA"
+    # @param inforURL, URL of the project
+    inforURL: "https://ega-archive.org/about/projects-and-funders/federated-ega/"
 
   broker:
     durable: true

sda-auth/config.go

@@ -53,6 +53,8 @@ type Config struct {
 	Server          ServerConfig
 	S3Inbox         string
 	ResignJwt       bool
+	InfoURL         string
+	InfoText        string
 }
 
 // NewConfig initializes and parses the config file and/or environment using
@@ -90,6 +92,8 @@ func (c *Config) readConfig() error {
 	c.JwtPrivateKey = viper.GetString("JwtPrivateKey")
 	c.JwtSignatureAlg = viper.GetString("JwtSignatureAlg")
 	c.JwtIssuer = viper.GetString("jwtIssuer")
+	c.InfoURL = viper.GetString("infoUrl")
+	c.InfoText = viper.GetString("infoText")
 
 	viper.SetDefault("ResignJwt", true)
 	c.ResignJwt = viper.GetBool("resignJwt")

sda-auth/config.yaml

@@ -22,3 +22,5 @@ jwtIssuer: "http://auth:8080"
 jwtPrivateKey: "keys/sign-jwt.key"
 jwtSignatureAlg: "ES256"
 resignJwt: true
+infoText: "About Federated EGA"
+infoUrl: "https://ega-archive.org/about/projects-and-funders/federated-ega/"

sda-auth/config_test.go

@@ -30,6 +30,8 @@ type ConfigTests struct {
 	JwtPrivateKeyFile *os.File
 	JwtSignatureAlg   string
 	ResignJwt         bool
+	InfoURL           string
+	InfoText          string
 }
 
 func TestConfigTestSuite(t *testing.T) {
@@ -85,6 +87,8 @@ func (suite *ConfigTests) SetupTest() {
 	suite.JwtPrivateKey = suite.JwtPrivateKeyFile.Name()
 	suite.JwtSignatureAlg = "RS256"
 	suite.ResignJwt = true
+	suite.InfoURL = "https://test.info"
+	suite.InfoText = "About LEGA"
 
 	// Write config to temp config file
 	configYaml, err := yaml.Marshal(Config{
@@ -96,6 +100,8 @@ func (suite *ConfigTests) SetupTest() {
 		JwtPrivateKey:   suite.JwtPrivateKey,
 		JwtSignatureAlg: suite.JwtSignatureAlg,
 		ResignJwt:       suite.ResignJwt,
+		InfoURL:         suite.InfoURL,
+		InfoText:        suite.InfoText,
 	})
 	if err != nil {
 		log.Errorf("Error marshalling config yaml: %v", err)
@@ -147,6 +153,10 @@ func (suite *ConfigTests) TestConfig() {
 	assert.Equal(suite.T(), suite.JwtSignatureAlg, config.JwtSignatureAlg, "JwtSignatureAlg misread from config file")
 	assert.Equal(suite.T(), suite.ResignJwt, config.ResignJwt, "ResignJwt misread from config file")
 
+	// Check project info values
+	assert.Equal(suite.T(), suite.InfoText, config.InfoText, "Project info test misread from config file")
+	assert.Equal(suite.T(), suite.InfoURL, config.InfoURL, "Project info URL misread from config file")
+
 	// sanitycheck without config file or ENVs
 	// this should fail
 	os.Remove(suite.ConfigFile.Name())
@@ -174,6 +184,9 @@ func (suite *ConfigTests) TestConfig() {
 	os.Setenv("JWTSIGNATUREALG", fmt.Sprintf("env_%v", suite.JwtSignatureAlg))
 	os.Setenv("RESIGNJWT", fmt.Sprintf("%t", suite.ResignJwt))
 
+	os.Setenv("INFOTEXT", fmt.Sprintf("env_%v", suite.InfoText))
+	os.Setenv("INFOURL", fmt.Sprintf("env_%v", suite.InfoURL))
+
 	// re-read the config
 	config, err = NewConfig()
 	assert.NoError(suite.T(), err)
@@ -197,6 +210,9 @@ func (suite *ConfigTests) TestConfig() {
 	assert.Equal(suite.T(), fmt.Sprintf("env_%v", suite.JwtSignatureAlg), config.JwtSignatureAlg, "JwtSignatureAlg misread from environment variable")
 	assert.Equal(suite.T(), fmt.Sprintf("%t", suite.ResignJwt), strconv.FormatBool(config.ResignJwt), "ResignJwt misread from environment variable")
 
+	assert.Equal(suite.T(), fmt.Sprintf("env_%v", suite.InfoText), config.InfoText, "Project info text misread from environment variable")
+	assert.Equal(suite.T(), fmt.Sprintf("env_%v", suite.InfoURL), config.InfoURL, "Project info text misread from environment variable")
+
 	// Check missing private key
 	os.Setenv("JWTPRIVATEKEY", "nonexistent-key-file")
 

sda-auth/frontend/templates/ega.html

@@ -20,7 +20,7 @@
               <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="https://elixir-europe.org/about-us/staff-exchange-programme/localfederated-ega">About LocalEGA</a>
+              <a class="nav-link" href="{{.infoUrl}}">{{.infoText}}</a>
             </li>
           </ul>
         </div>

sda-auth/frontend/templates/elixir.html

@@ -20,7 +20,7 @@
               <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="https://elixir-europe.org/about-us/staff-exchange-programme/localfederated-ega">About LocalEGA</a>
+              <a class="nav-link" href="{{.infoUrl}}">{{.infoText}}</a>
             </li>
           </ul>
         </div>

sda-auth/frontend/templates/index.html

@@ -20,7 +20,7 @@
               <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="https://elixir-europe.org/about-us/staff-exchange-programme/localfederated-ega">About LocalEGA</a>
+              <a class="nav-link" href="{{.infoUrl}}">{{.infoText}}</a>
             </li>
           </ul>
         </div>

sda-auth/frontend/templates/loginform.html

@@ -20,7 +20,7 @@
               <a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="https://elixir-europe.org/about-us/staff-exchange-programme/localfederated-ega">About LocalEGA</a>
+              <a class="nav-link" href="{{.infoUrl}}">{{.infoText}}</a>
             </li>
           </ul>
         </div>

sda-auth/main.go

@@ -68,6 +68,8 @@ func (auth AuthHandler) getInboxConfig(ctx iris.Context, authType string) {
 // getMain returns the index.html page
 func (auth AuthHandler) getMain(ctx iris.Context) {
 
+	ctx.ViewData("infoUrl", auth.Config.InfoURL)
+	ctx.ViewData("infoText", auth.Config.InfoText)
 	err := ctx.View("index.html")
 	if err != nil {
 		log.Error("Failed to view index page: ", err)
@@ -150,6 +152,8 @@ func (auth AuthHandler) postEGA(ctx iris.Context) {
 			s3conf := getS3ConfigMap(token, auth.Config.S3Inbox, username)
 			idStruct := EGAIdentity{User: username, Token: token, ExpDate: expDate}
 			s.SetFlash("ega", s3conf)
+			ctx.ViewData("infoUrl", auth.Config.InfoURL)
+			ctx.ViewData("infoText", auth.Config.InfoText)
 			err = ctx.View("ega.html", idStruct)
 			if err != nil {
 				log.Error("Failed to parse response: ", err)
@@ -181,6 +185,8 @@ func (auth AuthHandler) getEGALogin(ctx iris.Context) {
 	s := sessions.Get(ctx)
 	message := s.GetFlashString("message")
 	if message == "" {
+		ctx.ViewData("infoUrl", auth.Config.InfoURL)
+		ctx.ViewData("infoText", auth.Config.InfoText)
 		err := ctx.View("loginform.html")
 		if err != nil {
 			log.Error("Failed to return to login form: ", err)
@@ -190,6 +196,8 @@ func (auth AuthHandler) getEGALogin(ctx iris.Context) {
 
 		return
 	}
+	ctx.ViewData("infoUrl", auth.Config.InfoURL)
+	ctx.ViewData("infoText", auth.Config.InfoText)
 	err := ctx.View("loginform.html", EGALoginError{Reason: message})
 	if err != nil {
 		log.Error("Failed to view invalid credentials form: ", err)
@@ -284,6 +292,8 @@ func (auth AuthHandler) getElixirLogin(ctx iris.Context) {
 
 	s := sessions.Get(ctx)
 	s.SetFlash("elixir", oidcData.S3Conf)
+	ctx.ViewData("infoUrl", auth.Config.InfoURL)
+	ctx.ViewData("infoText", auth.Config.InfoText)
 	err := ctx.View("elixir.html", oidcData.ElixirID)
 	if err != nil {
 		log.Error("Failed to view login form: ", err)