all repos — homestead @ 312e719f198520b8f3e4f8344af2f1c3c709b5e5

Code for my website

split email addresses used for display/OIDC

Alan Pearce
commit

312e719f198520b8f3e4f8344af2f1c3c709b5e5

parent

6f429039bbaa8469e347ba8302c55c1c9999ef3a

M internal/builder/builder.gointernal/builder/builder.go
@@ -201,7 +201,7 @@ buf.Reset()
log.Debug("rendering page", "source", post.Input, "path", post.URL) if post.URL == "/" { if err := templates.Homepage(siteSettings, templates.HomepageVars{ - Email: config.Email, + Email: config.PublicEmail, Me: config.RelMe, Posts: cc.Posts, }, post).Render(buf); err != nil {
M internal/config/config.gointernal/config/config.go
@@ -56,13 +56,16 @@
type Config struct { Title string Email string + PublicEmail string `toml:"public_email"` Description string BaseURL URL `toml:"base_url"` OriginalDomain string `toml:"original_domain"` DomainStartDate string `toml:"domain_start_date"` GoatCounter URL `toml:"goatcounter"` - OIDCHost URL `toml:"oidc_host"` + + OIDCEmail string `toml:"oidc_email"` + OIDCHost URL `toml:"oidc_host"` Domains []string WildcardDomain string `toml:"wildcard_domain"`
@@ -89,6 +92,13 @@ return nil, fault.Wrap(t, fmsg.With(t.ErrorWithUsage()))
} return nil, fault.Wrap(err, fmsg.With("config error")) + } + + if config.PublicEmail == "" { + config.PublicEmail = config.Email + } + if config.OIDCEmail == "" { + config.OIDCEmail = config.Email } return config, nil
M internal/website/mux.gointernal/website/mux.go
@@ -26,7 +26,9 @@ }
} } - return nil + return &ihttp.Error{ + Code: http.StatusNotFound, + } } func (website *Website) ErrorHandler(err *ihttp.Error, w http.ResponseWriter, r *http.Request) {
M internal/website/website.gointernal/website/website.go
@@ -200,7 +200,7 @@ }()
<-firstUpdate - website.acctResource = "acct:" + cfg.Email + website.acctResource = "acct:" + cfg.OIDCEmail website.me = digit.NewResource(website.acctResource). Link("http://openid.net/specs/connect/1.0/issuer", "", cfg.OIDCHost.String())