@@ -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) { | func (db *datastore) GenerateOAuthState(ctx context.Context, provider, clientID string) (string, error) { | ||||
state := store.Generate62RandomString(24) | 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 { | if err != nil { | ||||
return "", fmt.Errorf("unable to record oauth client state: %w", err) | return "", fmt.Errorf("unable to record oauth client state: %w", err) | ||||
} | } | ||||
@@ -179,7 +179,7 @@ func configureGitlabOauth(parentHandler *Handler, r *mux.Router, app *App) { | |||||
callbackLocation = app.Config().GitlabOauth.CallbackProxy | callbackLocation = app.Config().GitlabOauth.CallbackProxy | ||||
} | } | ||||
address := config.OrDefaultString(app.Config().GitlabOauth.Host, gitlabHost) | |||||
address := config.OrDefaultString(app.Config().GitlabOauth.Host, gitlabHost) | |||||
oauthClient := gitlabOauthClient{ | oauthClient := gitlabOauthClient{ | ||||
ClientID: app.Config().GitlabOauth.ClientID, | ClientID: app.Config().GitlabOauth.ClientID, | ||||
ClientSecret: app.Config().GitlabOauth.ClientSecret, | ClientSecret: app.Config().GitlabOauth.ClientSecret, | ||||
@@ -21,8 +21,8 @@ type gitlabOauthClient struct { | |||||
var _ oauthClient = gitlabOauthClient{} | var _ oauthClient = gitlabOauthClient{} | ||||
const ( | const ( | ||||
gitlabHost = "https://gitlab.com" | |||||
gitlabDisplayName = "GitLab" | |||||
gitlabHost = "https://gitlab.com" | |||||
gitlabDisplayName = "GitLab" | |||||
) | ) | ||||
func (c gitlabOauthClient) GetProvider() string { | func (c gitlabOauthClient) GetProvider() string { | ||||