Move error message to route

Emyrk · Emyrk · commit f3bce8624349 · 2023-06-26T12:26:10.000-04:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -626,13 +626,7 @@ func New(options *Options) *API {
 					r.Use(
 						apiKeyMiddleware,
 					)
-					if allowOauthConversion {
-						r.Post("/", api.postConvertLoginType)
-					} else {
-						r.Post("/", func(rw http.ResponseWriter, r *http.Request) {
-							http.Error(rw, "Oauth conversion is not allowed, contact an administrator to turn on this feature.", http.StatusForbidden)
-						})
-					}
+					r.Post("/", api.postConvertLoginType)
 				})
 			})
 			r.Group(func(r chi.Router) {
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -50,6 +50,13 @@ const mergeStateStringPrefix = "convert-"
 // @Success 201 {object} codersdk.OauthConversionResponse
 // @Router /users/convert-login [post]
 func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
+	if !api.Options.DeploymentValues.EnableOauthAccountConversion.Value() {
+		httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{
+			Message: "Oauth conversion is not allowed, contact an administrator to turn on this feature.",
+		})
+		return
+	}
+
 	var (
 		ctx               = r.Context()
 		auditor           = api.Auditor.Load()
