fix unable to signout

peertube
Namekuji 2023-01-18 21:22:20 -05:00
rodzic 609fd256b3
commit 0755f91e61
2 zmienionych plików z 8 dodań i 7 usunięć

Wyświetl plik

@ -210,12 +210,9 @@ func logoutHandler(c echo.Context) (err error) {
return echo.NewHTTPError(http.StatusInternalServerError) return echo.NewHTTPError(http.StatusInternalServerError)
} }
request.Header.Add("User-Agent", USER_AGENT) request.Header.Add("User-Agent", USER_AGENT)
resp, err := http.DefaultClient.Do(request) http.DefaultClient.Do(request) // don't care even if revoking failed
if err == nil && resp.StatusCode == http.StatusOK { writeSessionData(c, nil) // to reset, write nil to user's session
return c.NoContent(http.StatusOK) return c.NoContent(http.StatusOK)
}
c.Logger().Error(err)
return echo.NewHTTPError(http.StatusBadRequest)
} }
return echo.NewHTTPError(http.StatusUnauthorized, "login_required") return echo.NewHTTPError(http.StatusUnauthorized, "login_required")

Wyświetl plik

@ -280,7 +280,11 @@ func writeSessionData(c echo.Context, data *SessionData) error {
return err return err
} }
sess.Values[SESSION_DATASTORE_NAME] = data if data == nil {
sess.Values[SESSION_DATASTORE_NAME] = ""
} else {
sess.Values[SESSION_DATASTORE_NAME] = data
}
return sess.Save(c.Request(), c.Response()) return sess.Save(c.Request(), c.Response())
} }