Remove superfluous consts dep in init functions by separating URL consts.

Author: knadh

cmd/admin.go

@@ -26,11 +26,11 @@ type serverConfig struct {
 // GetServerConfig returns general server config.
 func (a *App) GetServerConfig(c echo.Context) error {
 	out := serverConfig{
-		RootURL:       a.constants.RootURL,
-		FromEmail:     a.constants.FromEmail,
-		Lang:          a.constants.Lang,
-		Permissions:   a.constants.PermissionsRaw,
-		HasLegacyUser: a.constants.HasLegacyUser,
+		RootURL:       a.urlCfg.RootURL,
+		FromEmail:     a.cfg.FromEmail,
+		Lang:          a.cfg.Lang,
+		Permissions:   a.cfg.PermissionsRaw,
+		HasLegacyUser: a.cfg.HasLegacyUser,
 	}
 
 	// Language list.

cmd/archive.go

@@ -53,7 +53,7 @@ func (a *App) GetCampaignArchives(c echo.Context) error {
 func (a *App) GetCampaignArchivesFeed(c echo.Context) error {
 	var (
 		pg              = a.paginator.NewFromURL(c.Request().URL.Query())
-		showFullContent = a.constants.EnablePublicArchiveRSSContent
+		showFullContent = a.cfg.EnablePublicArchiveRSSContent
 	)
 
 	// Get archives from the DB.
@@ -81,8 +81,8 @@ func (a *App) GetCampaignArchivesFeed(c echo.Context) error {
 
 	// Generate the feed.
 	feed := &feeds.Feed{
-		Title:       a.constants.SiteName,
-		Link:        &feeds.Link{Href: a.constants.RootURL},
+		Title:       a.cfg.SiteName,
+		Link:        &feeds.Link{Href: a.urlCfg.RootURL},
 		Description: a.i18n.T("public.archiveTitle"),
 		Items:       out,
 	}
@@ -215,9 +215,9 @@ func (a *App) getCampaignArchives(offset, limit int, renderBody bool) ([]campArc
 
 		// The campaign may have a custom slug.
 		if camp.ArchiveSlug.Valid {
-			archive.URL, _ = url.JoinPath(a.constants.ArchiveURL, camp.ArchiveSlug.String)
+			archive.URL, _ = url.JoinPath(a.urlCfg.ArchiveURL, camp.ArchiveSlug.String)
 		} else {
-			archive.URL, _ = url.JoinPath(a.constants.ArchiveURL, camp.UUID)
+			archive.URL, _ = url.JoinPath(a.urlCfg.ArchiveURL, camp.UUID)
 		}
 
 		// Render the full template body if requested.

cmd/auth.go

@@ -190,9 +190,9 @@ func (a *App) renderLoginPage(c echo.Context, loginErr error) error {
 		oidcProvider = ""
 		oidcLogo     = ""
 	)
-	if a.constants.Security.OIDC.Enabled {
+	if a.cfg.Security.OIDC.Enabled {
 		oidcLogo = "oidc.png"
-		u, err := url.Parse(a.constants.Security.OIDC.Provider)
+		u, err := url.Parse(a.cfg.Security.OIDC.Provider)
 		if err == nil {
 			h := strings.Split(u.Hostname(), ".")
 
@@ -330,7 +330,7 @@ func (a *App) doFirstTimeSetup(c echo.Context) error {
 		Type: auth.RoleTypeUser,
 		Name: null.NewString("Super Admin", true),
 	}
-	for p := range a.constants.Permissions {
+	for p := range a.cfg.Permissions {
 		r.Permissions = append(r.Permissions, p)
 	}
 

cmd/bounce.go

@@ -143,7 +143,7 @@ func (a *App) BounceWebhook(c echo.Context) error {
 		bounces = append(bounces, b)
 
 	// Amazon SES.
-	case service == "ses" && a.constants.BounceSESEnabled:
+	case service == "ses" && a.cfg.BounceSESEnabled:
 		switch c.Request().Header.Get("X-Amz-Sns-Message-Type") {
 		// SNS webhook registration confirmation. Only after these are processed will the endpoint
 		// start getting bounce notifications.
@@ -167,7 +167,7 @@ func (a *App) BounceWebhook(c echo.Context) error {
 		}
 
 	// SendGrid.
-	case service == "sendgrid" && a.constants.BounceSendgridEnabled:
+	case service == "sendgrid" && a.cfg.BounceSendgridEnabled:
 		var (
 			sig = c.Request().Header.Get("X-Twilio-Email-Event-Webhook-Signature")
 			ts  = c.Request().Header.Get("X-Twilio-Email-Event-Webhook-Timestamp")
@@ -182,7 +182,7 @@ func (a *App) BounceWebhook(c echo.Context) error {
 		bounces = append(bounces, bs...)
 
 	// Postmark.
-	case service == "postmark" && a.constants.BouncePostmarkEnabled:
+	case service == "postmark" && a.cfg.BouncePostmarkEnabled:
 		bs, err := a.bounce.Postmark.ProcessBounce(rawReq, c)
 		if err != nil {
 			a.log.Printf("error processing postmark notification: %v", err)
@@ -195,7 +195,7 @@ func (a *App) BounceWebhook(c echo.Context) error {
 		bounces = append(bounces, bs...)
 
 	// ForwardEmail.
-	case service == "forwardemail" && a.constants.BounceForwardemailEnabled:
+	case service == "forwardemail" && a.cfg.BounceForwardemailEnabled:
 		var (
 			sig = c.Request().Header.Get("X-Webhook-Signature")
 		)

cmd/campaigns.go

@@ -553,7 +553,7 @@ func (a *App) sendTestMessage(sub models.Subscriber, camp *models.Campaign) erro
 // validateCampaignFields validates incoming campaign field values.
 func (a *App) validateCampaignFields(c campReq) (campReq, error) {
 	if c.FromEmail == "" {
-		c.FromEmail = a.constants.FromEmail
+		c.FromEmail = a.cfg.FromEmail
 	} else if !reFromAddress.Match([]byte(c.FromEmail)) {
 		if _, err := a.importer.SanitizeEmail(c.FromEmail); err != nil {
 			return c, errors.New(a.i18n.T("campaigns.fieldInvalidFromEmail"))

cmd/handlers.go

@@ -49,7 +49,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {
 
 				// On no-auth, redirect to login page
 				if _, ok := u.(*echo.HTTPError); ok {
-					u, _ := url.Parse(a.constants.LoginURL)
+					u, _ := url.Parse(a.urlCfg.LoginURL)
 					q := url.Values{}
 					q.Set("next", c.Request().RequestURI)
 					u.RawQuery = q.Encode()
@@ -197,7 +197,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {
 		g.PUT("/api/roles/lists/:id", pm(a.UpdateListRole, "roles:manage"))
 		g.DELETE("/api/roles/:id", pm(a.DeleteRole, "roles:manage"))
 
-		if a.constants.BounceWebhooksEnabled {
+		if a.cfg.BounceWebhooksEnabled {
 			// Private authenticated bounce endpoint.
 			g.POST("/webhooks/bounce", pm(a.BounceWebhook, "webhooks:post_bounce"))
 		}
@@ -209,7 +209,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {
 		// Public unauthenticated endpoints.
 		g := e.Group("")
 
-		if a.constants.BounceWebhooksEnabled {
+		if a.cfg.BounceWebhooksEnabled {
 			// Public bounce endpoints for webservices like SES.
 			g.POST("/webhooks/service/:service", a.BounceWebhook)
 		}
@@ -223,15 +223,15 @@ func initHTTPHandlers(e *echo.Echo, a *App) {
 		g.GET(path.Join(uriAdmin, "/login"), a.LoginPage)
 		g.POST(path.Join(uriAdmin, "/login"), a.LoginPage)
 
-		if a.constants.Security.OIDC.Enabled {
+		if a.cfg.Security.OIDC.Enabled {
 			g.POST("/auth/oidc", a.OIDCLogin)
 			g.GET("/auth/oidc", a.OIDCFinish)
 		}
 
 		// Public APIs.
 		g.GET("/api/public/lists", a.GetPublicLists)
 		g.POST("/api/public/subscription", a.PublicSubscription)
-		if a.constants.EnablePublicArchive {
+		if a.cfg.EnablePublicArchive {
 			g.GET("/api/public/archive", a.GetCampaignArchives)
 		}
 
@@ -249,7 +249,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {
 		g.GET("/campaign/:campUUID/:subUUID", noIndex(validateUUID(a.ViewCampaignMessage, "campUUID", "subUUID")))
 		g.GET("/campaign/:campUUID/:subUUID/px.png", noIndex(validateUUID(a.RegisterCampaignView, "campUUID", "subUUID")))
 
-		if a.constants.EnablePublicArchive {
+		if a.cfg.EnablePublicArchive {
 			g.GET("/archive", a.CampaignArchivesPage)
 			g.GET("/archive.xml", a.GetCampaignArchivesFeed)
 			g.GET("/archive/:id", a.CampaignArchivePage)
@@ -283,7 +283,7 @@ func (a *App) AdminPage(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 	}
 
-	b = bytes.ReplaceAll(b, []byte("asset_version"), []byte(a.constants.AssetVersion))
+	b = bytes.ReplaceAll(b, []byte("asset_version"), []byte(a.cfg.AssetVersion))
 
 	return c.HTMLBlob(http.StatusOK, b)
 }
@@ -306,19 +306,19 @@ func serveCustomAppearance(name string) echo.HandlerFunc {
 
 		switch name {
 		case "admin.custom_css":
-			out = app.constants.Appearance.AdminCSS
+			out = app.cfg.Appearance.AdminCSS
 			hdr = "text/css; charset=utf-8"
 
 		case "admin.custom_js":
-			out = app.constants.Appearance.AdminJS
+			out = app.cfg.Appearance.AdminJS
 			hdr = "application/javascript; charset=utf-8"
 
 		case "public.custom_css":
-			out = app.constants.Appearance.PublicCSS
+			out = app.cfg.Appearance.PublicCSS
 			hdr = "text/css; charset=utf-8"
 
 		case "public.custom_js":
-			out = app.constants.Appearance.PublicJS
+			out = app.cfg.Appearance.PublicJS
 			hdr = "application/javascript; charset=utf-8"
 		}