diff --git a/app/controllers/newsletters_controller.rb b/app/controllers/newsletters_controller.rb deleted file mode 100644 index 2b3ba0aa..00000000 --- a/app/controllers/newsletters_controller.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -class NewslettersController < ApplicationController - skip_authorization_check - - def show; end - - def update - Faraday.post(Wabosign::NEWSLETTER_URL, newsletter_params.to_json, 'Content-Type' => 'application/json') - rescue StandardError => e - Rails.logger.error(e) - ensure - redirect_to root_path - end - - private - - def newsletter_params - params.require(:user).permit(:email) - end -end diff --git a/app/controllers/setup_controller.rb b/app/controllers/setup_controller.rb index db506928..ee8dd7ce 100644 --- a/app/controllers/setup_controller.rb +++ b/app/controllers/setup_controller.rb @@ -40,7 +40,7 @@ class SetupController < ApplicationController sign_in(@user) - redirect_to newsletter_path + redirect_to root_path else render :index, status: :unprocessable_content end diff --git a/app/views/newsletters/show.html.erb b/app/views/newsletters/show.html.erb deleted file mode 100644 index b33a7c40..00000000 --- a/app/views/newsletters/show.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
-

👨‍💻 <%= t('developer_newsletters') %>

- <%= form_for current_user, url: newsletter_path do |f| %> -
- <%= f.email_field :email, placeholder: t('email'), required: true, class: 'base-input' %> -
-
- <%= f.button button_title, class: 'base-button' %> -
-
- <%= t('skip') %> -
- <% end %> -
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml index 0b9e36d8..3e3a3175 100644 --- a/config/locales/i18n.yml +++ b/config/locales/i18n.yml @@ -291,7 +291,6 @@ en: &en code_is_invalid: Code is invalid 2fa_has_been_removed: 2FA has been removed. 2fa_has_been_set_up_already: 2FA has been set up already. - developer_newsletters: Developer Newsletters skip: Skip email_notifications: Email Notifications receive_notification_emails_on_completed_submission: Receive notification emails on completed submission @@ -1343,7 +1342,6 @@ es: &es code_is_invalid: El código no es válido 2fa_has_been_removed: 2FA ha sido eliminado. 2fa_has_been_set_up_already: 2FA ya ha sido configurado. - developer_newsletters: Boletines para desarrolladores skip: Omitir email_notifications: Notificaciones por correo electrónico receive_notification_emails_on_completed_submission: Recibir notificaciones por correo electrónico sobre formularios completados @@ -2392,7 +2390,6 @@ it: &it code_is_invalid: Il codice non è valido 2fa_has_been_removed: 2FA è stata rimossa. 2fa_has_been_set_up_already: 2FA è già stata configurata. - developer_newsletters: Newsletter per sviluppatori skip: Salta email_notifications: Notifiche email receive_notification_emails_on_completed_submission: Ricevi notifiche email su moduli completati @@ -3441,7 +3438,6 @@ fr: &fr code_is_invalid: Le code est invalide 2fa_has_been_removed: La 2FA a été supprimée. 2fa_has_been_set_up_already: La 2FA est déjà configurée. - developer_newsletters: Newsletters développeur skip: Ignorer email_notifications: Notifications par e‑mail receive_notification_emails_on_completed_submission: Recevoir des e‑mails de notification lors de la finalisation d’une soumission @@ -4487,7 +4483,6 @@ pt: &pt code_is_invalid: O código é inválido 2fa_has_been_removed: 2FA foi removido. 2fa_has_been_set_up_already: 2FA já foi configurado. - developer_newsletters: Newsletters para desenvolvedores skip: Pular email_notifications: Notificações por e-mail receive_notification_emails_on_completed_submission: Receber notificações por e-mail ao concluir uma submissão @@ -5536,7 +5531,6 @@ de: &de code_is_invalid: Der Code ist ungültig 2fa_has_been_removed: 2FA wurde entfernt. 2fa_has_been_set_up_already: 2FA wurde bereits eingerichtet. - developer_newsletters: Entwickler-Newsletter skip: Überspringen email_notifications: E-Mail-Benachrichtigungen receive_notification_emails_on_completed_submission: Benachrichtigungs-E-Mails bei abgeschlossener Einreichung erhalten @@ -6998,7 +6992,6 @@ nl: &nl code_is_invalid: Code is ongeldig 2fa_has_been_removed: 2FA is verwijderd. 2fa_has_been_set_up_already: 2FA is al ingesteld. - developer_newsletters: Nieuwsbrieven voor ontwikkelaars skip: Overslaan email_notifications: E-mailmeldingen receive_notification_emails_on_completed_submission: Ontvang e-mailmeldingen bij voltooide inzendingen diff --git a/config/routes.rb b/config/routes.rb index 0cf74373..40baa4b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,7 +66,6 @@ Rails.application.routes.draw do resources :timestamp_server, only: %i[create] resources :dashboard, only: %i[index] resources :setup, only: %i[index create] - resource :newsletter, only: %i[show update] resources :enquiries, only: %i[create] resources :users, only: %i[new create edit update destroy] do resource :send_reset_password, only: %i[update], controller: 'users_send_reset_password' diff --git a/lib/wabosign.rb b/lib/wabosign.rb index 835b9b24..e6f41d00 100644 --- a/lib/wabosign.rb +++ b/lib/wabosign.rb @@ -3,7 +3,6 @@ module Wabosign PRODUCT_URL = ENV.fetch('PRODUCT_URL', 'https://sign.wabo.cc') PRODUCT_EMAIL_URL = ENV.fetch('PRODUCT_EMAIL_URL', PRODUCT_URL) - NEWSLETTER_URL = "#{PRODUCT_URL}/newsletters".freeze ENQUIRIES_URL = "#{PRODUCT_URL}/enquiries".freeze PRODUCT_NAME = 'WaboSign' # AGPLv3 §7(b) upstream attribution — must remain visible in interactive UIs. diff --git a/spec/system/newsletters_spec.rb b/spec/system/newsletters_spec.rb deleted file mode 100644 index 19595a07..00000000 --- a/spec/system/newsletters_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -RSpec.describe 'Newsletter' do - let(:user) { create(:user, account: create(:account)) } - - before do - sign_in(user) - stub_request(:post, Wabosign::NEWSLETTER_URL).to_return(status: 200) - visit newsletter_path - end - - it 'shows the newsletter page' do - expect(page).to have_content('Developer Newsletters') - expect(page).to have_button('Submit') - expect(page).to have_content('Skip') - expect(page).to have_field('user[email]', with: user.email) - end - - it 'submits the newsletter form' do - click_button 'Submit' - - expect(a_request(:post, Wabosign::NEWSLETTER_URL)).to have_been_made.once - end - - it 'skips the newsletter form' do - click_on 'Skip' - - expect(page).to have_current_path(root_path, ignore_query: true) - end -end