\ No newline at end of file
+
diff --git a/app/views/services/email/new_password.html.erb b/app/views/services/email/new_password.html.erb
new file mode 100644
index 0000000..a9df60a
--- /dev/null
+++ b/app/views/services/email/new_password.html.erb
@@ -0,0 +1,35 @@
+<%= render HeaderCompactComponent.new(title: "New E-Mail Password") %>
+
+<%= render MainCompactComponent.new do %>
+
+
+ Your email password has been updated.
+
+
+ Please store the new one in a password manager or write it down somewhere:
+
+
+ <%= label_tag :new_password, 'New password', class: 'hidden' %>
+ <%= text_field_tag :new_password, @new_password, disabled: true, class: 'text-xl grow',
+ data: { "clipboard-target": "source"} %>
+
+
+ <%= render partial: "icons/copy", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
+
+
+ <%= render partial: "icons/check", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
+
+
+
+ <%= render partial: "icons/qr_code", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
+
+
+
+ <%= link_to "Done", services_email_path, class: "btn-md btn-blue w-full" %>
+
+ <%= render QrCodeModalComponent.new(qr_content: @new_password) %>
+
+<% end %>
diff --git a/app/views/services/email/show.html.erb b/app/views/services/email/show.html.erb
new file mode 100644
index 0000000..2ad55f7
--- /dev/null
+++ b/app/views/services/email/show.html.erb
@@ -0,0 +1,128 @@
+<%= render HeaderComponent.new(title: "E-Mail") %>
+
+<%= render MainSimpleComponent.new do %>
+
+
+ Send and receive electronic mail.
+
+
+
+
+ E-Mail Password
+
+ Your email password is different from your main account password. You can
+ reset your email password in the
+ <%= link_to "email settings", setting_path(:email), class: "ks-text-link" %>.
+
+
+
+ Recommended Apps
+
+
+
+ Android
+
+
+ Linux
+ Windows
+ macOS
+
+
+
+
+
+ <%= render AppInfoComponent.new(
+ name: "K-9 Mail",
+ description: "Soon to become Thunderbird Mobile",
+ icon_path: "/img/logos/icon_k9-mail.png",
+ links: [
+ ["Website", "https://k9mail.app"],
+ ["Google Play", "https://play.google.com/store/apps/details?id=com.fsck.k9"],
+ ["F-Droid", "https://f-droid.org/en/packages/com.fsck.k9/"],
+ ]
+ ) %>
+
+
+ <%= render AppInfoComponent.new(
+ name: "Thunderbird",
+ description: "The most popular open-source email app",
+ icon_path: "/img/logos/icon_thunderbird.png",
+ links: [
+ ["Website", "https://www.thunderbird.net"]
+ ]
+ ) %>
+
+
+ <%= render AppInfoComponent.new(
+ name: "Thunderbird",
+ description: "The most popular open-source email app",
+ icon_path: "/img/logos/icon_thunderbird.png",
+ links: [
+ ["Website", "https://www.thunderbird.net"]
+ ]
+ ) %>
+
+
+ <%= render AppInfoComponent.new(
+ name: "Thunderbird",
+ description: "The most popular open-source email app",
+ icon_path: "/img/logos/icon_thunderbird.png",
+ links: [
+ ["Website", "https://www.thunderbird.net"]
+ ]
+ ) %>
+
+
+<% end %>
diff --git a/app/views/settings/_email.html.erb b/app/views/settings/_email.html.erb
new file mode 100644
index 0000000..8d48661
--- /dev/null
+++ b/app/views/settings/_email.html.erb
@@ -0,0 +1,34 @@
+<%= tag.section data: {
+ controller: "settings--email--password",
+ "settings--email--password-validation-failed-value": @validation_errors.present?
+ } do %>
+
E-Mail Password
+ <%= form_for(@user, url: reset_email_password_settings_path, method: "post") do |f| %>
+ <%= hidden_field_tag :section, "email" %>
+
+ Use the following button to generate a new email password:
+
+
+
+ Reset email password
+
+
+
+
+ <%= f.label :current_password, 'Current account password', class: 'font-bold' %>
+
+
+ <%= f.password_field :current_password, class: "w-full", required: true,
+ data: { 'settings--email--password-target': "currentPasswordField" } %>
+
+ <% if @validation_errors.present? && @validation_errors[:current_password].present? %>
+
<%= @validation_errors[:current_password].first %>
+ <% end %>
+
+ <%= f.submit "Create new email password", class: "btn-md btn-blue w-full md:w-auto" %>
+
+
+ <% end %>
+<% end %>
diff --git a/app/views/shared/_admin_sidenav_settings_services.html.erb b/app/views/shared/_admin_sidenav_settings_services.html.erb
index 8650277..a69f3cc 100644
--- a/app/views/shared/_admin_sidenav_settings_services.html.erb
+++ b/app/views/shared/_admin_sidenav_settings_services.html.erb
@@ -19,6 +19,13 @@
text_icon: Setting.droneci_enabled? ? "◉" : "○",
active: current_page?(admin_settings_services_path(params: { s: "droneci" })),
) %>
+<%= render SidenavLinkComponent.new(
+ level: 2,
+ name: "E-Mail",
+ path: admin_settings_services_path(params: { s: "email" }),
+ text_icon: Setting.email_enabled? ? "◉" : "○",
+ active: current_page?(admin_settings_services_path(params: { s: "email" })),
+) %>
<%= render SidenavLinkComponent.new(
level: 2,
name: "ejabberd",
diff --git a/app/views/shared/_sidenav_settings.html.erb b/app/views/shared/_sidenav_settings.html.erb
index 359f3e1..86947b1 100644
--- a/app/views/shared/_sidenav_settings.html.erb
+++ b/app/views/shared/_sidenav_settings.html.erb
@@ -12,13 +12,21 @@
active: @settings_section.to_s == "xmpp"
) %>
<% end %>
+<% if Setting.email_enabled? &&
+ Flipper.enabled?(:email, current_user) %>
+<%= render SidenavLinkComponent.new(
+ name: "E-Mail", path: setting_path(:email), icon: "mail",
+ active: @settings_section.to_s == "email"
+) %>
+<% end %>
<% if Setting.lndhub_enabled %>
<%= render SidenavLinkComponent.new(
name: "Lightning", path: setting_path(:lightning), icon: "zap",
active: @settings_section.to_s == "lightning"
) %>
<% end %>
-<% if Setting.remotestorage_enabled %>
+<% if Setting.remotestorage_enabled? &&
+ Flipper.enabled?(:remotestorage, current_user) %>
<%= render SidenavLinkComponent.new(
name: "Storage", path: setting_path(:remotestorage), icon: "remotestorage",
active: @settings_section.to_s == "remotestorage"
diff --git a/config/routes.rb b/config/routes.rb
index c9f4281..eaa40c8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,12 @@ Rails.application.routes.draw do
resource :mastodon, only: [:show], controller: 'mastodon'
+ resource :email, only: [:show], controller: 'email' do
+ member do
+ get 'new_password'
+ end
+ end
+
resources :lightning, only: [:index] do
collection do
get 'transactions'
@@ -44,6 +50,7 @@ Rails.application.routes.draw do
collection do
post 'update_email'
post 'reset_password'
+ post 'reset_email_password'
post 'set_nostr_pubkey'
delete 'nostr_pubkey', to: 'settings#remove_nostr_pubkey'
end
diff --git a/public/img/logos/icon_k9-mail.png b/public/img/logos/icon_k9-mail.png
new file mode 100644
index 0000000..0c64d4b
Binary files /dev/null and b/public/img/logos/icon_k9-mail.png differ
diff --git a/public/img/logos/icon_thunderbird.png b/public/img/logos/icon_thunderbird.png
new file mode 100644
index 0000000..101f2c4
Binary files /dev/null and b/public/img/logos/icon_thunderbird.png differ
diff --git a/spec/features/settings/email_spec.rb b/spec/features/settings/email_spec.rb
new file mode 100644
index 0000000..348d0be
--- /dev/null
+++ b/spec/features/settings/email_spec.rb
@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+RSpec.describe 'E-Mail settings', type: :feature do
+ let(:user) { create :user }
+
+ feature "Reset email password" do
+ before do
+ login_as user, :scope => :user
+
+ allow_any_instance_of(User).to receive(:valid_ldap_authentication?)
+ .with("invalid password").and_return(false)
+ allow_any_instance_of(User).to receive(:valid_ldap_authentication?)
+ .with("valid password").and_return(true)
+ end
+
+ scenario 'fails with invalid password' do
+ expect(LdapManager::UpdateEmailPassword).not_to receive(:call)
+ expect(LdapManager::UpdateEmailMaildrop).not_to receive(:call)
+
+ visit setting_path(:email)
+ fill_in 'Current account password', with: "invalid password"
+ click_button "Create new email password"
+
+ within ".error-msg" do
+ expect(page).to have_content("Wrong password")
+ end
+ end
+
+ scenario 'works with valid password' do
+ allow_any_instance_of(User).to receive(:dn)
+ .and_return("cn=#{user.cn},ou=kosmos.org,cn=users,dc=kosmos,dc=org")
+ allow_any_instance_of(User).to receive(:ldap_entry)
+ .and_return({ uid: user.cn, ou: user.ou, email_maildrop: user.address })
+
+ expect(LdapManager::UpdateEmailPassword).to receive(:call).and_return(true)
+ expect(LdapManager::UpdateEmailMaildrop).not_to receive(:call)
+
+ visit setting_path(:email)
+ fill_in 'Current account password', with: "valid password"
+ click_button "Create new email password"
+
+ expect(current_url).to eq(new_password_services_email_url)
+ end
+
+ scenario 'updates the maildrop attribute if necessary' do
+ allow_any_instance_of(User).to receive(:dn)
+ .and_return("cn=#{user.cn},ou=kosmos.org,cn=users,dc=kosmos,dc=org")
+ allow_any_instance_of(User).to receive(:ldap_entry)
+ .and_return({ uid: user.cn, ou: user.ou, email_maildrop: "mahafaly@example.com" })
+
+ expect(LdapManager::UpdateEmailPassword).to receive(:call).and_return(true)
+ expect(LdapManager::UpdateEmailMaildrop).to receive(:call)
+ .with(user.dn, user.address).and_return(true)
+
+ visit setting_path(:email)
+ fill_in 'Current account password', with: "valid password"
+ click_button "Create new email password"
+
+ expect(current_url).to eq(new_password_services_email_url)
+ end
+ end
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a3e8051..bdf8563 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -66,9 +66,9 @@ RSpec.describe User, type: :model do
it "returns the entries from the LDAP service attribute" do
expect(user).to receive(:ldap_entry).and_return({
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
- service: ["discourse", "gitea", "wiki", "xmpp"]
+ service: ["discourse", "email", "gitea", "wiki", "xmpp"]
})
- expect(user.services_enabled).to eq(["discourse", "gitea", "wiki", "xmpp"])
+ expect(user.services_enabled).to eq(["discourse", "email", "gitea", "wiki", "xmpp"])
end
end
@@ -147,7 +147,7 @@ RSpec.describe User, type: :model do
after { clear_enqueued_jobs }
it "enables default services" do
- expect(user).to receive(:enable_service).with(%w[ discourse gitea mediawiki xmpp ])
+ expect(user).to receive(:enable_service).with(%w[ discourse email gitea mediawiki xmpp ])
user.send :devise_after_confirmation
end