diff --git a/app/controllers/concerns/emailer.rb b/app/controllers/concerns/emailer.rb
index cc094bfd..c4a22e83 100644
--- a/app/controllers/concerns/emailer.rb
+++ b/app/controllers/concerns/emailer.rb
@@ -41,14 +41,6 @@ module Emailer
UserMailer.approve_user(user, root_url, logo_image, user_color).deliver_now
end
- def send_approval_user_signup_email(user)
- UserMailer.approval_user_signup(user, root_url, logo_image, user_color, admin_emails).deliver_now
- end
-
- def send_invite_user_signup_email(user)
- UserMailer.invite_user_signup(user, root_url, logo_image, user_color, admin_emails).deliver_now
- end
-
private
# Returns the link the user needs to click to verify their account
@@ -56,17 +48,6 @@ module Emailer
edit_account_activation_url(token: @user.activation_token, email: @user.email)
end
- def admin_emails
- admins = User.with_role(:admin)
-
- if Rails.configuration.loadbalanced_configuration
- admins = admins.without_role(:super_admin)
- .where(provider: user_settings_provider)
- end
-
- admins.collect(&:email).join(",")
- end
-
def reset_link
edit_password_reset_url(@user.reset_token, email: @user.email)
end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 7e1fff5c..e08bb005 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -18,7 +18,6 @@
class SessionsController < ApplicationController
include Registrar
- include Emailer
skip_before_action :verify_authenticity_token, only: [:omniauth, :fail]
@@ -50,24 +49,18 @@ class SessionsController < ApplicationController
begin
@auth = request.env['omniauth.auth']
@user_exists = check_user_exists
-
+
# If using invitation registration method, make sure user is invited
return redirect_to root_path, flash: { alert: I18n.t("registration.invite.no_invite") } unless passes_invite_reqs
-
+
user = User.from_omniauth(@auth)
# Add pending role if approval method and is a new user
if approval_registration && !@user_exists
user.add_role :pending
-
- # Inform admins that a user signed up if emails are turned on
- send_approval_user_signup_email(user) if Rails.configuration.enable_email_verification
-
return redirect_to root_path, flash: { success: I18n.t("registration.approval.signup") }
end
- send_invite_user_signup_email(user) if Rails.configuration.enable_email_verification && invite_registration && !@user_exists
-
login(user)
rescue => e
logger.error "Error authenticating via omniauth: #{e}"
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4b2ba771..cdf60820 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -50,8 +50,6 @@ class UsersController < ApplicationController
flash: { success: I18n.t("registration.approval.signup") } unless Rails.configuration.enable_email_verification
end
- send_registration_email if Rails.configuration.enable_email_verification
-
# Sign in automatically if email verification is disabled or if user is already verified.
login(@user) && return if !Rails.configuration.enable_email_verification || @user.email_verified
@@ -195,19 +193,6 @@ class UsersController < ApplicationController
end
end
- def send_registration_email
- begin
- if invite_registration
- send_invite_user_signup_email(@user)
- elsif approval_registration
- send_approval_user_signup_email(@user)
- end
- rescue => e
- logger.error "Error in email delivery: #{e}"
- flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
- end
- end
-
# Add validation errors to model if they exist
def valid_user_or_captcha
valid_user = @user.valid?
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 6332558c..7f911b6b 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -51,22 +51,4 @@ class UserMailer < ApplicationMailer
@color = color
mail to: user.email, subject: t('mailer.user.approve.subject')
end
-
- def approval_user_signup(user, url, image, color, admin_emails)
- @user = user
- @url = url + "admins"
- @image = image
- @color = color
-
- mail to: admin_emails, subject: t('mailer.user.approve.signup.subject')
- end
-
- def invite_user_signup(user, url, image, color, admin_emails)
- @user = user
- @url = url + "admins"
- @image = image
- @color = color
-
- mail to: admin_emails, subject: t('mailer.user.invite.signup.subject')
- end
end
diff --git a/app/views/user_mailer/approval_user_signup.html.erb b/app/views/user_mailer/approval_user_signup.html.erb
deleted file mode 100644
index fafae3b3..00000000
--- a/app/views/user_mailer/approval_user_signup.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-#
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-#
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see .
-%>
-
-
-
- <%= image_tag(@image, height: '70') %>
-
-
- <%= t('mailer.user.approve.signup.subject') %>
-
-
-
- <%= t('mailer.user.approve.signup.info') %>
-
-
-
- <%= t('mailer.user.approve.signup.username', name: @user.name, email: @user.email) %>
-
-
-
- <%= t('mailer.user.approve.signup.more-info') %>
-
-
-
- <%= t('mailer.user.approve.signup.admins_link') %>
-
-
-
diff --git a/app/views/user_mailer/approval_user_signup.text.erb b/app/views/user_mailer/approval_user_signup.text.erb
deleted file mode 100644
index 418f08d6..00000000
--- a/app/views/user_mailer/approval_user_signup.text.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-#
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-#
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see .
-%>
-
-<%= t('mailer.user.approve.signup.subject') %>
-
-<%= t('mailer.user.approve.signup.info') %>
-
-<%= t('mailer.user.approve.signup.username', name: @user.name, email: @user.email) %>
-
-<%= t('mailer.user.approve.signup.more-info') %>
-
-<%= @url %>
\ No newline at end of file
diff --git a/app/views/user_mailer/invite_user_signup.html.erb b/app/views/user_mailer/invite_user_signup.html.erb
deleted file mode 100644
index 2a950e78..00000000
--- a/app/views/user_mailer/invite_user_signup.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-#
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-#
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see .
-%>
-
-
-
- <%= image_tag(@image, height: '70') %>
-
-
- <%= t('mailer.user.invite.signup.subject') %>
-
-
-
- <%= t('mailer.user.invite.signup.info') %>
-
-
-
- <%= t('mailer.user.invite.signup.username', name: @user.name, email: @user.email) %>
-
-
-
- <%= t('mailer.user.invite.signup.admins_link') %>
-
-
-
diff --git a/app/views/user_mailer/invite_user_signup.text.erb b/app/views/user_mailer/invite_user_signup.text.erb
deleted file mode 100644
index 2f61d9af..00000000
--- a/app/views/user_mailer/invite_user_signup.text.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-#
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-#
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see .
-%>
-
-<%= t('mailer.user.invite.signup.subject') %>
-
-<%= t('mailer.user.invite.signup.info') %>
-
-<%= t('mailer.user.invite.signup.username', name: @user.name, email: @user.email) %>
-
-<%= @url %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 251d4343..987f31e4 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -174,23 +174,12 @@ en:
info: Your account has been approved.
signin: To access your personal rooms, click the button below and sign in.
signin_link: Sign In
- signup:
- info: A new user has signed up to use Greenlight.
- more-info: To allow this user to access Greenlight you must approve their account in organization settings.
- admins_link: Visit the Organization Page
- subject: New Greenlight User Sign Up
- username: The user signed up with the name %{name} and the email %{email}.
subject: Account Approved
username: Your username is %{email}.
invite:
info: You have been invited to your own personal space by %{name}
signup: To signup using your email, click the button below and follow the steps.
signup_link: Sign Up
- signup:
- info: A user that was invited has signed up to use Greenlight.
- admins_link: Visit the Organization Page
- subject: New Greenlight User Sign Up
- username: The user signed up with the name %{name} and the email %{email}.
subject: Invitation to join BigBlueButton
username: Your username is %{email}.
password_reset:
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index ddd25ddf..9720194a 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -223,34 +223,6 @@ describe SessionsController, type: :controller do
expect(response).to redirect_to(root_path)
end
-
- context 'registration notification emails' do
- before do
- allow(Rails.configuration).to receive(:enable_email_verification).and_return(true)
- @user = create(:user, provider: "greenlight")
- @admin = create(:user, provider: "greenlight", email: "test@example.com")
- @admin.add_role :admin
- end
-
- it "should notify admin on new user signup with approve/reject registration" do
- allow_any_instance_of(Registrar).to receive(:approval_registration).and_return(true)
-
- request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
-
- expect { get :omniauth, params: { provider: 'bn_launcher' } }.to change { ActionMailer::Base.deliveries.count }.by(1)
- end
-
- it "should notify admin on new user signup with invite registration" do
- allow_any_instance_of(Registrar).to receive(:invite_registration).and_return(true)
-
- invite = Invitation.create(email: "user@google.com", provider: "greenlight")
- @request.session[:invite_token] = invite.invite_token
-
- request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
-
- expect { get :omniauth, params: { provider: 'bn_launcher' } }.to change { ActionMailer::Base.deliveries.count }.by(1)
- end
- end
end
it "should not create session without omniauth env set for bn_launcher" do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 7405d23d..5207cfc7 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -186,17 +186,6 @@ describe UsersController, type: :controller do
before do
allow_any_instance_of(Registrar).to receive(:invite_registration).and_return(true)
allow(Rails.configuration).to receive(:allow_user_signup).and_return(true)
- @user = create(:user, provider: "greenlight")
- @admin = create(:user, provider: "greenlight", email: "test@example.com")
- @admin.add_role :admin
- end
-
- it "should notify admins that user signed up" do
- params = random_valid_user_params
- invite = Invitation.create(email: params[:user][:email], provider: "greenlight")
- @request.session[:invite_token] = invite.invite_token
-
- expect { post :create, params: params }.to change { ActionMailer::Base.deliveries.count }.by(1)
end
it "rejects the user if they are not invited" do
@@ -251,9 +240,6 @@ describe UsersController, type: :controller do
before do
allow_any_instance_of(Registrar).to receive(:approval_registration).and_return(true)
allow(Rails.configuration).to receive(:allow_user_signup).and_return(true)
- @user = create(:user, provider: "greenlight")
- @admin = create(:user, provider: "greenlight", email: "test@example.com")
- @admin.add_role :admin
end
it "allows any user to sign up" do
@@ -279,14 +265,6 @@ describe UsersController, type: :controller do
expect(u.has_role?(:pending)).to eq(true)
end
-
- it "notifies admins that a user signed up" do
- allow(Rails.configuration).to receive(:enable_email_verification).and_return(true)
-
- params = random_valid_user_params
-
- expect { post :create, params: params }.to change { ActionMailer::Base.deliveries.count }.by(2)
- end
end
end
diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb
index 97498ec4..263eae53 100644
--- a/test/mailers/previews/user_mailer_preview.rb
+++ b/test/mailers/previews/user_mailer_preview.rb
@@ -35,18 +35,4 @@ class UserMailerPreview < ActionMailer::Preview
user = User.first
UserMailer.approve_user(user, "http://example.com/", @logo, @color)
end
-
- # Preview this email at
- # http://localhost:3000/rails/mailers/user_mailer/approval_user_signup
- def approval_user_signup
- user = User.first
- UserMailer.approval_user_signup(user, "http://example.com/", @logo, @color, "test@example.com")
- end
-
- # Preview this email at
- # http://localhost:3000/rails/mailers/user_mailer/invite_user_signup
- def invite_user_signup
- user = User.first
- UserMailer.invite_user_signup(user, "http://example.com/", @logo, @color, "test@example.com")
- end
end