diff options
Diffstat (limited to 'storage/integration.go')
| -rw-r--r-- | storage/integration.go | 221 |
1 files changed, 55 insertions, 166 deletions
diff --git a/storage/integration.go b/storage/integration.go index f65aff6e..f6378c8f 100644 --- a/storage/integration.go +++ b/storage/integration.go @@ -223,13 +223,7 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) { // UpdateIntegration saves user integration settings. func (s *Storage) UpdateIntegration(integration *model.Integration) error { - var err error - if integration.GoogleReaderPassword != "" { - integration.GoogleReaderPassword, err = hashPassword(integration.GoogleReaderPassword) - if err != nil { - return err - } - query := ` + query := ` UPDATE integrations SET @@ -276,167 +270,62 @@ func (s *Storage) UpdateIntegration(integration *model.Integration) error { matrix_bot_password=$41, matrix_bot_url=$42, matrix_bot_chat_id=$43, - notion_enabled=$45, - notion_token=$46, - notion_page_id=$47 + notion_enabled=$44, + notion_token=$45, + notion_page_id=$46 WHERE - user_id=$44 + user_id=$47 ` - _, err = s.db.Exec( - query, - integration.PinboardEnabled, - integration.PinboardToken, - integration.PinboardTags, - integration.PinboardMarkAsUnread, - integration.InstapaperEnabled, - integration.InstapaperUsername, - integration.InstapaperPassword, - integration.FeverEnabled, - integration.FeverUsername, - integration.FeverToken, - integration.WallabagEnabled, - integration.WallabagOnlyURL, - integration.WallabagURL, - integration.WallabagClientID, - integration.WallabagClientSecret, - integration.WallabagUsername, - integration.WallabagPassword, - integration.NunuxKeeperEnabled, - integration.NunuxKeeperURL, - integration.NunuxKeeperAPIKey, - integration.PocketEnabled, - integration.PocketAccessToken, - integration.PocketConsumerKey, - integration.GoogleReaderEnabled, - integration.GoogleReaderUsername, - integration.GoogleReaderPassword, - integration.TelegramBotEnabled, - integration.TelegramBotToken, - integration.TelegramBotChatID, - integration.EspialEnabled, - integration.EspialURL, - integration.EspialAPIKey, - integration.EspialTags, - integration.LinkdingEnabled, - integration.LinkdingURL, - integration.LinkdingAPIKey, - integration.LinkdingTags, - integration.LinkdingMarkAsUnread, - integration.MatrixBotEnabled, - integration.MatrixBotUser, - integration.MatrixBotPassword, - integration.MatrixBotURL, - integration.MatrixBotChatID, - integration.NotionEnabled, - integration.NotionToken, - integration.NotionPageID, - integration.UserID, - ) - } else { - query := ` - UPDATE - integrations - SET - pinboard_enabled=$1, - pinboard_token=$2, - pinboard_tags=$3, - pinboard_mark_as_unread=$4, - instapaper_enabled=$5, - instapaper_username=$6, - instapaper_password=$7, - fever_enabled=$8, - fever_username=$9, - fever_token=$10, - wallabag_enabled=$11, - wallabag_only_url=$12, - wallabag_url=$13, - wallabag_client_id=$14, - wallabag_client_secret=$15, - wallabag_username=$16, - wallabag_password=$17, - nunux_keeper_enabled=$18, - nunux_keeper_url=$19, - nunux_keeper_api_key=$20, - pocket_enabled=$21, - pocket_access_token=$22, - pocket_consumer_key=$23, - googlereader_enabled=$24, - googlereader_username=$25, - googlereader_password=$26, - telegram_bot_enabled=$27, - telegram_bot_token=$28, - telegram_bot_chat_id=$29, - espial_enabled=$30, - espial_url=$31, - espial_api_key=$32, - espial_tags=$33, - linkding_enabled=$34, - linkding_url=$35, - linkding_api_key=$36, - linkding_tags=$37, - linkding_mark_as_unread=$38, - matrix_bot_enabled=$39, - matrix_bot_user=$40, - matrix_bot_password=$41, - matrix_bot_url=$42, - matrix_bot_chat_id=$43, - notion_enabled=$45, - notion_token=$46, - notion_page_id=$47 - WHERE - user_id=$44 - ` - _, err = s.db.Exec( - query, - integration.PinboardEnabled, - integration.PinboardToken, - integration.PinboardTags, - integration.PinboardMarkAsUnread, - integration.InstapaperEnabled, - integration.InstapaperUsername, - integration.InstapaperPassword, - integration.FeverEnabled, - integration.FeverUsername, - integration.FeverToken, - integration.WallabagEnabled, - integration.WallabagOnlyURL, - integration.WallabagURL, - integration.WallabagClientID, - integration.WallabagClientSecret, - integration.WallabagUsername, - integration.WallabagPassword, - integration.NunuxKeeperEnabled, - integration.NunuxKeeperURL, - integration.NunuxKeeperAPIKey, - integration.PocketEnabled, - integration.PocketAccessToken, - integration.PocketConsumerKey, - integration.GoogleReaderEnabled, - integration.GoogleReaderUsername, - integration.GoogleReaderPassword, - integration.TelegramBotEnabled, - integration.TelegramBotToken, - integration.TelegramBotChatID, - integration.EspialEnabled, - integration.EspialURL, - integration.EspialAPIKey, - integration.EspialTags, - integration.LinkdingEnabled, - integration.LinkdingURL, - integration.LinkdingAPIKey, - integration.LinkdingTags, - integration.LinkdingMarkAsUnread, - integration.MatrixBotEnabled, - integration.MatrixBotUser, - integration.MatrixBotPassword, - integration.MatrixBotURL, - integration.MatrixBotChatID, - integration.UserID, - integration.NotionEnabled, - integration.NotionToken, - integration.NotionPageID, - ) - } + _, err := s.db.Exec( + query, + integration.PinboardEnabled, + integration.PinboardToken, + integration.PinboardTags, + integration.PinboardMarkAsUnread, + integration.InstapaperEnabled, + integration.InstapaperUsername, + integration.InstapaperPassword, + integration.FeverEnabled, + integration.FeverUsername, + integration.FeverToken, + integration.WallabagEnabled, + integration.WallabagOnlyURL, + integration.WallabagURL, + integration.WallabagClientID, + integration.WallabagClientSecret, + integration.WallabagUsername, + integration.WallabagPassword, + integration.NunuxKeeperEnabled, + integration.NunuxKeeperURL, + integration.NunuxKeeperAPIKey, + integration.PocketEnabled, + integration.PocketAccessToken, + integration.PocketConsumerKey, + integration.GoogleReaderEnabled, + integration.GoogleReaderUsername, + integration.GoogleReaderPassword, + integration.TelegramBotEnabled, + integration.TelegramBotToken, + integration.TelegramBotChatID, + integration.EspialEnabled, + integration.EspialURL, + integration.EspialAPIKey, + integration.EspialTags, + integration.LinkdingEnabled, + integration.LinkdingURL, + integration.LinkdingAPIKey, + integration.LinkdingTags, + integration.LinkdingMarkAsUnread, + integration.MatrixBotEnabled, + integration.MatrixBotUser, + integration.MatrixBotPassword, + integration.MatrixBotURL, + integration.MatrixBotChatID, + integration.NotionEnabled, + integration.NotionToken, + integration.NotionPageID, + integration.UserID, + ) if err != nil { return fmt.Errorf(`store: unable to update integration row: %v`, err) |