Skip to content
Snippets Groups Projects
Unverified Commit cc9ab54f authored by Ahmad Farhat's avatar Ahmad Farhat Committed by GitHub
Browse files

More fixes for email notification (#5566)

parent b360602e
Branches
No related tags found
No related merge requests found
...@@ -77,7 +77,7 @@ module Api ...@@ -77,7 +77,7 @@ module Api
activation_url: activate_account_url(token), base_url: request.base_url, activation_url: activate_account_url(token), base_url: request.base_url,
provider: current_provider).activate_account_email.deliver_later provider: current_provider).activate_account_email.deliver_later
UserMailer.with(user:, admin_panel_url:, provider: current_provider).new_user_signup_email.deliver_later UserMailer.with(user:, admin_panel_url:, base_url: request.base_url, provider: current_provider).new_user_signup_email.deliver_later
end end
create_default_room(user) create_default_room(user)
......
...@@ -29,9 +29,8 @@ module Api ...@@ -29,9 +29,8 @@ module Api
def create def create
token = @user.generate_activation_token! token = @user.generate_activation_token!
UserMailer.with(user: @user, UserMailer.with(user: @user, activation_url: activate_account_url(token),
activation_url: activate_account_url(token), base_url: request.base_url, base_url: request.base_url, provider: current_provider).activate_account_email.deliver_later
provider: current_provider).activate_account_email.deliver_later
render_data status: :ok render_data status: :ok
end end
......
...@@ -55,7 +55,10 @@ class ExternalController < ApplicationController ...@@ -55,7 +55,10 @@ class ExternalController < ApplicationController
create_default_room(user) create_default_room(user)
# Send admins an email if smtp is enabled # Send admins an email if smtp is enabled
UserMailer.with(user:, admin_panel_url:, provider: current_provider).new_user_signup_email.deliver_later if ENV['SMTP_SERVER'].present? if ENV['SMTP_SERVER'].present?
UserMailer.with(user:, admin_panel_url:, base_url: request.base_url,
provider: current_provider).new_user_signup_email.deliver_later
end
end end
if SettingGetter.new(setting_name: 'ResyncOnLogin', provider:).call if SettingGetter.new(setting_name: 'ResyncOnLogin', provider:).call
......
...@@ -66,7 +66,7 @@ en: ...@@ -66,7 +66,7 @@ en:
valid_invitation: The invitation is valid for 24 hours. valid_invitation: The invitation is valid for 24 hours.
sign_up: Sign Up sign_up: Sign Up
new_user_signup: new_user_signup:
new_user: New User Signup new_user: New BigBlueButton User Signup
new_user_description: A new user has signed up to use BigBlueButton. new_user_description: A new user has signed up to use BigBlueButton.
name: "Name: %{name}" name: "Name: %{name}"
email: "Email: %{email}" email: "Email: %{email}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment