diff options
Diffstat (limited to 'internal/storage/user.go')
| -rw-r--r-- | internal/storage/user.go | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/internal/storage/user.go b/internal/storage/user.go index 43baf0e1..39a019ca 100644 --- a/internal/storage/user.go +++ b/internal/storage/user.go @@ -84,6 +84,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m gesture_nav, stylesheet, custom_js, + external_font_hosts, google_id, openid_connect_id, display_mode, @@ -126,6 +127,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m &user.GestureNav, &user.Stylesheet, &user.CustomJS, + &user.ExternalFontHosts, &user.GoogleID, &user.OpenIDConnectID, &user.DisplayMode, @@ -165,6 +167,8 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m // UpdateUser updates a user. func (s *Storage) UpdateUser(user *model.User) error { + user.ExternalFontHosts = strings.TrimSpace(user.ExternalFontHosts) + if user.Password != "" { hashedPassword, err := crypto.HashPassword(user.Password) if err != nil { @@ -187,21 +191,22 @@ func (s *Storage) UpdateUser(user *model.User) error { gesture_nav=$12, stylesheet=$13, custom_js=$14, - google_id=$15, - openid_connect_id=$16, - display_mode=$17, - entry_order=$18, - default_reading_speed=$19, - cjk_reading_speed=$20, - default_home_page=$21, - categories_sorting_order=$22, - mark_read_on_view=$23, - mark_read_on_media_player_completion=$24, - media_playback_rate=$25, - block_filter_entry_rules=$26, - keep_filter_entry_rules=$27 + external_font_hosts=$15, + google_id=$16, + openid_connect_id=$167, + display_mode=$18, + entry_order=$19, + default_reading_speed=$20, + cjk_reading_speed=$21, + default_home_page=$22, + categories_sorting_order=$23, + mark_read_on_view=$24, + mark_read_on_media_player_completion=$25, + media_playback_rate=$26, + block_filter_entry_rules=$27, + keep_filter_entry_rules=$28 WHERE - id=$28 + id=$29 ` _, err = s.db.Exec( @@ -220,6 +225,7 @@ func (s *Storage) UpdateUser(user *model.User) error { user.GestureNav, user.Stylesheet, user.CustomJS, + user.ExternalFontHosts, user.GoogleID, user.OpenIDConnectID, user.DisplayMode, @@ -254,21 +260,22 @@ func (s *Storage) UpdateUser(user *model.User) error { gesture_nav=$11, stylesheet=$12, custom_js=$13, - google_id=$14, - openid_connect_id=$15, - display_mode=$16, - entry_order=$17, - default_reading_speed=$18, - cjk_reading_speed=$19, - default_home_page=$20, - categories_sorting_order=$21, - mark_read_on_view=$22, - mark_read_on_media_player_completion=$23, - media_playback_rate=$24, - block_filter_entry_rules=$25, - keep_filter_entry_rules=$26 + external_font_hosts=$14, + google_id=$15, + openid_connect_id=$16, + display_mode=$17, + entry_order=$18, + default_reading_speed=$19, + cjk_reading_speed=$20, + default_home_page=$21, + categories_sorting_order=$22, + mark_read_on_view=$23, + mark_read_on_media_player_completion=$24, + media_playback_rate=$25, + block_filter_entry_rules=$26, + keep_filter_entry_rules=$27 WHERE - id=$27 + id=$28 ` _, err := s.db.Exec( @@ -286,6 +293,7 @@ func (s *Storage) UpdateUser(user *model.User) error { user.GestureNav, user.Stylesheet, user.CustomJS, + user.ExternalFontHosts, user.GoogleID, user.OpenIDConnectID, user.DisplayMode, @@ -339,6 +347,7 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) { last_login_at, stylesheet, custom_js, + external_font_hosts, google_id, openid_connect_id, display_mode, @@ -379,6 +388,7 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) { last_login_at, stylesheet, custom_js, + external_font_hosts, google_id, openid_connect_id, display_mode, @@ -419,6 +429,7 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) { last_login_at, stylesheet, custom_js, + external_font_hosts, google_id, openid_connect_id, display_mode, @@ -466,6 +477,7 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) { u.last_login_at, u.stylesheet, u.custom_js, + u.external_font_hosts, u.google_id, u.openid_connect_id, u.display_mode, @@ -507,6 +519,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err &user.LastLoginAt, &user.Stylesheet, &user.CustomJS, + &user.ExternalFontHosts, &user.GoogleID, &user.OpenIDConnectID, &user.DisplayMode, @@ -620,6 +633,7 @@ func (s *Storage) Users() (model.Users, error) { last_login_at, stylesheet, custom_js, + external_font_hosts, google_id, openid_connect_id, display_mode, @@ -662,6 +676,7 @@ func (s *Storage) Users() (model.Users, error) { &user.LastLoginAt, &user.Stylesheet, &user.CustomJS, + &user.ExternalFontHosts, &user.GoogleID, &user.OpenIDConnectID, &user.DisplayMode, |