diff --git a/account.go b/account.go index 04aa61d..3fbb1f2 100644 --- a/account.go +++ b/account.go @@ -302,14 +302,14 @@ func viewLogin(app *App, w http.ResponseWriter, r *http.Request) error { p := &struct { page.StaticPage - To string - Message template.HTML - Flashes []template.HTML - LoginUsername string - OauthSlack bool - OauthWriteAs bool - OauthGitlab bool - GitlabHost string + To string + Message template.HTML + Flashes []template.HTML + LoginUsername string + OauthSlack bool + OauthWriteAs bool + OauthGitlab bool + GitlabDisplayName string }{ pageForReq(app, r), r.FormValue("to"), diff --git a/database.go b/database.go index f5e4564..6beea1a 100644 --- a/database.go +++ b/database.go @@ -2512,7 +2512,7 @@ func (db *datastore) GetCollectionLastPostTime(id int64) (*time.Time, error) { func (db *datastore) GenerateOAuthState(ctx context.Context, provider, clientID string) (string, error) { state := store.Generate62RandomString(24) - _, err := db.ExecContext(ctx, "INSERT INTO oauth_client_states (state, provider, client_id, used, created_at) VALUES (?, ?, ?, FALSE, " + db.now() + ")", state, provider, clientID) + _, err := db.ExecContext(ctx, "INSERT INTO oauth_client_states (state, provider, client_id, used, created_at) VALUES (?, ?, ?, FALSE, "+db.now()+")", state, provider, clientID) if err != nil { return "", fmt.Errorf("unable to record oauth client state: %w", err) } diff --git a/oauth.go b/oauth.go index a344bde..0aff0f3 100644 --- a/oauth.go +++ b/oauth.go @@ -179,7 +179,7 @@ func configureGitlabOauth(parentHandler *Handler, r *mux.Router, app *App) { callbackLocation = app.Config().GitlabOauth.CallbackProxy } - address := config.OrDefaultString(app.Config().GitlabOauth.Host, gitlabHost) + address := config.OrDefaultString(app.Config().GitlabOauth.Host, gitlabHost) oauthClient := gitlabOauthClient{ ClientID: app.Config().GitlabOauth.ClientID, ClientSecret: app.Config().GitlabOauth.ClientSecret, diff --git a/oauth_gitlab.go b/oauth_gitlab.go index 8931978..c9c74aa 100644 --- a/oauth_gitlab.go +++ b/oauth_gitlab.go @@ -21,8 +21,8 @@ type gitlabOauthClient struct { var _ oauthClient = gitlabOauthClient{} const ( - gitlabHost = "https://gitlab.com" - gitlabDisplayName = "GitLab" + gitlabHost = "https://gitlab.com" + gitlabDisplayName = "GitLab" ) func (c gitlabOauthClient) GetProvider() string { diff --git a/pages/login.tmpl b/pages/login.tmpl index f08dbf7..6a75d13 100644 --- a/pages/login.tmpl +++ b/pages/login.tmpl @@ -55,7 +55,7 @@ hr.short { Sign in with Write.as {{ end }} {{ if .OauthGitlab }} - Sign in with {{ .GitlabDisplayName }} + Sign in with {{.GitlabDisplayName}} {{ end }}