diff options
Diffstat (limited to 'ui/oauth2_unlink.go')
| -rw-r--r-- | ui/oauth2_unlink.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ui/oauth2_unlink.go b/ui/oauth2_unlink.go index 022e282..8e38ddc 100644 --- a/ui/oauth2_unlink.go +++ b/ui/oauth2_unlink.go @@ -2,13 +2,12 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui // import "miniflux.app/ui" +package ui // import "miniflux.app/ui" import ( "net/http" "miniflux.app/http/request" - "miniflux.app/http/response" "miniflux.app/http/response/html" "miniflux.app/http/route" "miniflux.app/locale" @@ -22,14 +21,14 @@ func (c *Controller) OAuth2Unlink(w http.ResponseWriter, r *http.Request) { provider := request.RouteStringParam(r, "provider") if provider == "" { logger.Info("[OAuth2] Invalid or missing provider") - response.Redirect(w, r, route.Path(c.router, "login")) + html.Redirect(w, r, route.Path(c.router, "login")) return } authProvider, err := getOAuth2Manager(c.cfg).Provider(provider) if err != nil { logger.Error("[OAuth2] %v", err) - response.Redirect(w, r, route.Path(c.router, "settings")) + html.Redirect(w, r, route.Path(c.router, "settings")) return } @@ -37,21 +36,21 @@ func (c *Controller) OAuth2Unlink(w http.ResponseWriter, r *http.Request) { hasPassword, err := c.store.HasPassword(request.UserID(r)) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } if !hasPassword { sess.NewFlashErrorMessage(printer.Printf("error.unlink_account_without_password")) - response.Redirect(w, r, route.Path(c.router, "settings")) + html.Redirect(w, r, route.Path(c.router, "settings")) return } if err := c.store.RemoveExtraField(request.UserID(r), authProvider.GetUserExtraKey()); err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } sess.NewFlashMessage(printer.Printf("alert.account_unlinked")) - response.Redirect(w, r, route.Path(c.router, "settings")) + html.Redirect(w, r, route.Path(c.router, "settings")) } |