- {{ if hasKey .user.Extra "oidc_id" }}
+ {{ if .user.OpenIDConnectID }}
diff --git a/template/views.go b/template/views.go
index 6e4a2b94..1a56e37c 100644
--- a/template/views.go
+++ b/template/views.go
@@ -1387,7 +1387,7 @@ var templateViewsMap = map[string]string{
{{ if hasOAuth2Provider "google" }}
- {{ if hasKey .user.Extra "oidc_id" }}
+ {{ if .user.OpenIDConnectID }}
{{ t "page.settings.unlink_oidc_account" }}
{{ else }}
{{ t "page.settings.link_oidc_account" }}
@@ -1624,7 +1624,7 @@ var templateViewsMapChecksums = map[string]string{
"login": "9165434b2405e9332de4bebbb54a93dc5692276ea72e7c5e07f655a002dfd290",
"search_entries": "6a3e5876cb7541a2f08f56e30ab46a2d7d64894ec5e170f627b2dd674d8aeefe",
"sessions": "5d5c677bddbd027e0b0c9f7a0dd95b66d9d95b4e130959f31fb955b926c2201c",
- "settings": "6f77f9431beb9aa2e28840a60a6463d1a9eb0e92c1929b204584c85c71d0c7a3",
+ "settings": "ef2155983f362ef001e0d9b27536a3bea9e04869ee600e8285fff894c39ba1c1",
"shared_entries": "f87a42bf44dc3606c5a44b185263c1b9a612a8ae194f75061253d4dde7b095a2",
"unread_entries": "21c584da7ca8192655c62f16a7ac92dbbfdf1307588ffe51eb4a8bbf3f9f7526",
"users": "d7ff52efc582bbad10504f4a04fa3adcc12d15890e45dff51cac281e0c446e45",
diff --git a/ui/form/settings.go b/ui/form/settings.go
index b61d1d5a..9eb51f5d 100644
--- a/ui/form/settings.go
+++ b/ui/form/settings.go
@@ -38,8 +38,8 @@ func (s *SettingsForm) Merge(user *model.User) *model.User {
user.EntriesPerPage = s.EntriesPerPage
user.KeyboardShortcuts = s.KeyboardShortcuts
user.ShowReadingTime = s.ShowReadingTime
- user.Extra["custom_css"] = s.CustomCSS
- user.EntrySwipe = s.EntrySwipe;
+ user.Stylesheet = s.CustomCSS
+ user.EntrySwipe = s.EntrySwipe
if s.Password != "" {
user.Password = s.Password
diff --git a/ui/oauth2_callback.go b/ui/oauth2_callback.go
index e0453675..2c70386f 100644
--- a/ui/oauth2_callback.go
+++ b/ui/oauth2_callback.go
@@ -5,6 +5,7 @@
package ui // import "miniflux.app/ui"
import (
+ "errors"
"net/http"
"miniflux.app/config"
@@ -44,7 +45,7 @@ func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) {
return
}
- authProvider, err := getOAuth2Manager(r.Context()).Provider(provider)
+ authProvider, err := getOAuth2Manager(r.Context()).FindProvider(provider)
if err != nil {
logger.Error("[OAuth2] %v", err)
html.Redirect(w, r, route.Path(h.router, "login"))
@@ -61,20 +62,21 @@ func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) {
logger.Info("[OAuth2] [ClientIP=%s] Successful auth for %s", clientIP, profile)
if request.IsAuthenticated(r) {
- user, err := h.store.UserByExtraField(profile.Key, profile.ID)
+ loggedUser, err := h.store.UserByID(request.UserID(r))
if err != nil {
html.ServerError(w, r, err)
return
}
- if user != nil {
- logger.Error("[OAuth2] User #%d cannot be associated because %s is already associated", request.UserID(r), user.Username)
+ if h.store.AnotherUserWithFieldExists(loggedUser.ID, profile.Key, profile.ID) {
+ logger.Error("[OAuth2] User #%d cannot be associated because it is already associated with another user", loggedUser.ID)
sess.NewFlashErrorMessage(printer.Printf("error.duplicate_linked_account"))
html.Redirect(w, r, route.Path(h.router, "settings"))
return
}
- if err := h.store.UpdateExtraField(request.UserID(r), profile.Key, profile.ID); err != nil {
+ authProvider.PopulateUserWithProfileID(loggedUser, profile)
+ if err := h.store.UpdateUser(loggedUser); err != nil {
html.ServerError(w, r, err)
return
}
@@ -84,7 +86,7 @@ func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) {
return
}
- user, err := h.store.UserByExtraField(profile.Key, profile.ID)
+ user, err := h.store.UserByField(profile.Key, profile.ID)
if err != nil {
html.ServerError(w, r, err)
return
@@ -96,10 +98,15 @@ func (h *handler) oauth2Callback(w http.ResponseWriter, r *http.Request) {
return
}
+ if h.store.UserExists(profile.Username) {
+ html.BadRequest(w, r, errors.New(printer.Printf("error.user_already_exists")))
+ return
+ }
+
user = model.NewUser()
user.Username = profile.Username
user.IsAdmin = false
- user.Extra[profile.Key] = profile.ID
+ authProvider.PopulateUserWithProfileID(user, profile)
if err := h.store.CreateUser(user); err != nil {
html.ServerError(w, r, err)
diff --git a/ui/oauth2_redirect.go b/ui/oauth2_redirect.go
index f083c068..b2fe9bc8 100644
--- a/ui/oauth2_redirect.go
+++ b/ui/oauth2_redirect.go
@@ -24,7 +24,7 @@ func (h *handler) oauth2Redirect(w http.ResponseWriter, r *http.Request) {
return
}
- authProvider, err := getOAuth2Manager(r.Context()).Provider(provider)
+ authProvider, err := getOAuth2Manager(r.Context()).FindProvider(provider)
if err != nil {
logger.Error("[OAuth2] %v", err)
html.Redirect(w, r, route.Path(h.router, "login"))
diff --git a/ui/oauth2_unlink.go b/ui/oauth2_unlink.go
index f87acf93..46cc0df6 100644
--- a/ui/oauth2_unlink.go
+++ b/ui/oauth2_unlink.go
@@ -24,7 +24,7 @@ func (h *handler) oauth2Unlink(w http.ResponseWriter, r *http.Request) {
return
}
- authProvider, err := getOAuth2Manager(r.Context()).Provider(provider)
+ authProvider, err := getOAuth2Manager(r.Context()).FindProvider(provider)
if err != nil {
logger.Error("[OAuth2] %v", err)
html.Redirect(w, r, route.Path(h.router, "settings"))
@@ -32,6 +32,11 @@ func (h *handler) oauth2Unlink(w http.ResponseWriter, r *http.Request) {
}
sess := session.New(h.store, request.SessionID(r))
+ user, err := h.store.UserByID(request.UserID(r))
+ if err != nil {
+ html.ServerError(w, r, err)
+ return
+ }
hasPassword, err := h.store.HasPassword(request.UserID(r))
if err != nil {
@@ -45,7 +50,8 @@ func (h *handler) oauth2Unlink(w http.ResponseWriter, r *http.Request) {
return
}
- if err := h.store.RemoveExtraField(request.UserID(r), authProvider.GetUserExtraKey()); err != nil {
+ authProvider.UnsetUserProfileID(user)
+ if err := h.store.UpdateUser(user); err != nil {
html.ServerError(w, r, err)
return
}
diff --git a/ui/settings_show.go b/ui/settings_show.go
index d877feff..16efcd8e 100644
--- a/ui/settings_show.go
+++ b/ui/settings_show.go
@@ -35,7 +35,7 @@ func (h *handler) showSettingsPage(w http.ResponseWriter, r *http.Request) {
EntriesPerPage: user.EntriesPerPage,
KeyboardShortcuts: user.KeyboardShortcuts,
ShowReadingTime: user.ShowReadingTime,
- CustomCSS: user.Extra["custom_css"],
+ CustomCSS: user.Stylesheet,
EntrySwipe: user.EntrySwipe,
}
diff --git a/ui/static_stylesheet.go b/ui/static_stylesheet.go
index e4300122..dd9b0e3e 100644
--- a/ui/static_stylesheet.go
+++ b/ui/static_stylesheet.go
@@ -18,22 +18,17 @@ func (h *handler) showStylesheet(w http.ResponseWriter, r *http.Request) {
filename := request.RouteStringParam(r, "name")
if filename == "custom_css" {
user, err := h.store.UserByID(request.UserID(r))
- if err != nil {
+ if err != nil || user == nil {
html.NotFound(w, r)
return
}
b := response.New(w, r)
- if user == nil {
- b.WithHeader("Content-Type", "text/css; charset=utf-8")
- b.WithBody("")
- b.Write()
- return
- }
b.WithHeader("Content-Type", "text/css; charset=utf-8")
- b.WithBody(user.Extra["custom_css"])
+ b.WithBody(user.Stylesheet)
b.Write()
return
}
+
etag, found := static.StylesheetsChecksums[filename]
if !found {
html.NotFound(w, r)