WIP Edit nostr profile

Gemfile

@@ -44,8 +44,6 @@ gem 'pagy', '~> 6.0', '>= 6.0.2'
 gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'
-gem 'gpgme', '~> 2.0.24'
-gem 'zbase32', '~> 0.1.1'
 
 # HTTP requests
 gem 'faraday'

Gemfile.lock

@@ -197,8 +197,6 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    gpgme (2.0.24)
-      mini_portile2 (~> 2.7)
     hashdiff (1.1.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -485,7 +483,6 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.34)
-    zbase32 (0.1.1)
     zeitwerk (2.6.12)
 
 PLATFORMS
@@ -510,7 +507,6 @@ DEPENDENCIES
   flipper
   flipper-active_record
   flipper-ui
-  gpgme (~> 2.0.24)
   image_processing (~> 1.12.2)
   importmap-rails
   jbuilder (~> 2.7)
@@ -544,7 +540,6 @@ DEPENDENCIES
   warden
   web-console (~> 4.2)
   webmock
-  zbase32 (~> 0.1.1)
 
 BUNDLED WITH
    2.5.5

app/components/settings/nostr_edit_profile_component.html.erb

@@ -0,0 +1,44 @@
+<div class="w-[72vw] md:w-[500px]">
+  <header class="absolute z-10 h-36 sm:h-44 inset-x-1 top-1 rounded-t
+                 bg-cover bg-center bg-gray-50"
+          style="background-image: url('<%= @profile["banner"]%>');">
+    <div class="inline-block z-20 size-28 sm:size-32 ml-4 mt-16 sm:mt-20">
+    <% if @profile["picture"].present? %>
+      <img src="<%= @profile["picture"] %>"
+           class="inline-block size:28 sm:size-32 rounded-full border-2 border-white" />
+    <% else %>
+      <span class="inline-block size:28 sm:size-32 overflow-hidden rounded-full border-2 border-white bg-gray-100">
+        <svg class="size-full text-gray-300" fill="currentColor" viewBox="0 0 24 24">
+          <path d="M24 20.993V24H0v-2.996A14.977 14.977 0 0112.004 15c4.904 0 9.26 2.354 11.996 5.993zM16.002 8.999a4 4 0 11-8 0 4 4 0 018 0z" />
+        </svg>
+      </span>
+    <% end %>
+    </div>
+  </header>
+  <main class="mt-44 sm:mt-52">
+    <%= form_for(@user, url: setting_path(:nostr), html: { :method => :put }) do |f| %>
+      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Display name") do %>
+        <%= f.text_field :display_name, value: @display_name, class: "w-full sm:w-3/5" %>
+        <% if @validation_errors.present? && @validation_errors[:display_name].present? %>
+          <p class="error-msg mt-2"><%= @validation_errors[:display_name].first %></p>
+        <% end %>
+      <% end %>
+      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Nostr address (NIP-05)") do %>
+        <%= f.text_field :nip05_address, value: @profile["nip05"], class: "w-full sm:w-3/5" %>
+        <% if @validation_errors.present? && @validation_errors[:nip05_address].present? %>
+          <p class="error-msg mt-2"><%= @validation_errors[:nip05_address].first %></p>
+        <% end %>
+      <% end %>
+      <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Ligtning address for Zaps") do %>
+        <%= f.text_field :lud16_address, value: @profile["lud16"], class: "w-full sm:w-3/5" %>
+        <% if @validation_errors.present? && @validation_errors[:lud16_address].present? %>
+          <p class="error-msg mt-2"><%= @validation_errors[:lud16_address].first %></p>
+        <% end %>
+      <% end %>
+    <% end %>
+  </main>
+  <footer>
+    <%# <%= @profile.inspect %>
+    <%# <%= @profile_event.inspect %>
+  </footer>
+</div>

app/components/settings/nostr_edit_profile_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Settings
+  class NostrEditProfileComponent < ViewComponent::Base
+    def initialize(user:, profile_event:)
+      if profile_event.present?
+        @user = user
+        @profile_event = profile_event
+        @profile = JSON.parse(profile_event["content"])
+        @display_name = @profile["display_name"] || @profile["displayName"]
+
+        if @profile["nip05"].present? && @profile["nip05"] == @user.address
+          # "Your profile's Nostr address is set to <strong>#{ user_address }</strong>"
+        else
+          # "Your profile's Nostr address is not set to <strong>#{ user_address }</strong> yet"
+        end
+
+        if @profile["lud16"].present? && @profile["lud16"] == @user.address
+          # "Your profile's Lightning address is set to <strong>#{ user_address }</strong>"
+        else
+          # "Your profile's Lightning address is not set to <strong>#{ user_address }</strong> yet"
+        end
+      else
+        # "We could not find a profile for your public key"
+      end
+    end
+  end
+end

app/components/settings/nostr_profile_status_component.html.erb

@@ -0,0 +1,21 @@
+<% @statuses.each do |status| %>
+  <%= render StatusTextComponent.new(
+    text: status[:text],
+    icon_name: status[:icon_name],
+    icon_color: status[:icon_color]
+  ) %>
+<% end %>
+
+<% if @status == 1 %>
+  <p class="mt-8">
+    <button class="btn-md btn-blue">
+      Edit my profile
+    </button>
+  </p>
+<% elsif @status == 2 %>
+  <p class="mt-8">
+    <button class="btn-md btn-blue">
+      Create my profile
+    </button>
+  </p>
+<% end %>

app/components/settings/nostr_profile_status_component.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Settings
+  class NostrProfileStatusComponent < ViewComponent::Base
+    def initialize(profile_event:, user_address:)
+      @statuses = []
+
+      if profile_event.present?
+        profile = JSON.parse(profile_event["content"])
+
+        @statuses.push({
+          text: "You have a public Nostr profile",
+          icon_name: "check-circle",
+          icon_color: "emerald-500"
+        })
+
+        if profile["nip05"].present? && profile["nip05"] == user_address
+          @statuses.push({
+            text: "Your profile's Nostr address is set to <strong>#{ user_address }</strong>",
+            icon_name: "check-circle",
+            icon_color: "emerald-500"
+          })
+        else
+          @statuses.push({
+            text: "Your profile's Nostr address is not set to <strong>#{ user_address }</strong> yet",
+            icon_name: "alert-octagon",
+            icon_color: "amber-500"
+          })
+        end
+
+        if profile["lud16"].present? && profile["lud16"] == user_address
+          @statuses.push({
+            text: "Your profile's Lightning address is set to <strong>#{ user_address }</strong>",
+            icon_name: "check-circle",
+            icon_color: "emerald-500"
+          })
+        else
+          @statuses.push({
+            text: "Your profile's Lightning address is not set to <strong>#{ user_address }</strong> yet",
+            icon_name: "alert-octagon",
+            icon_color: "amber-500"
+          })
+        end
+      else
+        @statuses.push({
+          text: "We could not find a profile for your public key",
+          icon_name: "alert-octagon",
+          icon_color: "amber-500"
+        })
+      end
+    end
+  end
+end

app/components/settings/nostr_relay_status_component.html.erb

@@ -0,0 +1,18 @@
+<%= render StatusTextComponent.new(
+  text: @text,
+  icon_name: @icon_name,
+  icon_color: @icon_color) %>
+
+<% if @status == 1 %>
+  <p class="mt-8">
+    <button class="btn-md btn-blue">
+      Add the relay to my list
+    </button>
+  </p>
+<% elsif @status == 2 %>
+  <p class="mt-8">
+    <button class="btn-md btn-blue">
+      Set up default relays
+    </button>
+  </p>
+<% end %>

app/components/settings/nostr_relay_status_component.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Settings
+  class NostrRelayStatusComponent < ViewComponent::Base
+    def initialize(nip65_event:)
+      if nip65_event.present?
+        if relay_urls(nip65_event).any? { |r| r.include?("wss://nostr.kosmos.org") }
+          @text = "You have a relay list, and the Kosmos relay is part of it"
+          @icon_name = "check-circle"
+          @icon_color = "emerald-500"
+          @status = 0
+        else
+          @text = "The Kosmos relay is missing from your relay list"
+          @icon_name = "alert-octagon"
+          @icon_color = "amber-500"
+          @status = 1
+        end
+      else
+        @text = "We could not find a relay list for your public key"
+        @icon_name = "alert-octagon"
+        @icon_color = "amber-500"
+        @status = 2
+      end
+    end
+
+    private
+
+    def relay_urls(nip65_event)
+      nip65_event["tags"].select{ |t| t[0] == "r" }.map{ |t| t[1] }
+      # @inbox_relay_urls  = relay_tags&.select{ |t| t[2] == "read" }&.map{ |t| t[1] }
+      # @outbox_relay_urls = relay_tags&.select{ |t| t[2] != "read" }&.map{ |t| t[1] }
+    end
+  end
+end

app/components/status_text_component.html.erb

@@ -0,0 +1,8 @@
+<p class="flex gap-x-4 items-center">
+  <span class="inline-block h-6 w-6 grow-0 text-<%= @icon_color %>">
+    <%= render "icons/#{@icon_name}" %>
+  </span>
+  <span>
+    <%= raw @text %>
+  </span>
+</p>

app/components/status_text_component.rb

@@ -0,0 +1,7 @@
+class StatusTextComponent < ViewComponent::Base
+  def initialize(text:, icon_name:, icon_color:)
+    @text = text
+    @icon_name = icon_name
+    @icon_color = icon_color
+  end
+end

app/controllers/admin/users_controller.rb

@@ -30,7 +30,7 @@ class Admin::UsersController < Admin::BaseController
     amount = params[:amount].to_i
     notify_user = ActiveRecord::Type::Boolean.new.cast(params[:notify_user])
 
-    UserManager::CreateInvitations.call(user: @user, amount: amount, notify: notify_user)
+    CreateInvitations.call(user: @user, amount: amount, notify: notify_user)
 
     redirect_to admin_user_path(@user.cn), flash: {
       success: "Added #{amount} invitations to #{@user.cn}'s account"

app/controllers/settings_controller.rb

@@ -4,8 +4,13 @@ require "bcrypt"
 class SettingsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_main_nav_section
-  before_action :set_settings_section, only: [:show, :update, :update_email, :reset_email_password]
-  before_action :set_user, only: [:show, :update, :update_email, :reset_email_password]
+  before_action :set_settings_section, only: [
+    :show, :update, :update_email, :reset_email_password
+  ]
+  before_action :set_user, only: [
+    :show, :update, :update_email, :reset_email_password,
+    :fetch_nostr_user_metadata
+  ]
 
   def index
     redirect_to setting_path(:profile)
@@ -21,12 +26,10 @@ class SettingsController < ApplicationController
     end
   end
 
-  # PUT /settings/:section
   def update
     @user.preferences.merge!(user_params[:preferences] || {})
     @user.display_name = user_params[:display_name]
-    @user.avatar_new   = user_params[:avatar]
-    @user.pgp_pubkey   = user_params[:pgp_pubkey]
+    @user.avatar_new = user_params[:avatar]
 
     if @user.save
       if @user.display_name && (@user.display_name != @user.ldap_entry[:display_name])
@@ -37,10 +40,6 @@ class SettingsController < ApplicationController
         LdapManager::UpdateAvatar.call(dn: @user.dn, file: @user.avatar_new)
       end
 
-      if @user.pgp_pubkey && (@user.pgp_pubkey != @user.ldap_entry[:pgp_key])
-        UserManager::UpdatePgpKey.call(user: @user)
-      end
-
       redirect_to setting_path(@settings_section), flash: {
         success: 'Settings saved.'
       }
@@ -50,7 +49,6 @@ class SettingsController < ApplicationController
     end
   end
 
-  # POST /settings/update_email
   def update_email
     if @user.valid_ldap_authentication?(security_params[:current_password])
       if @user.update email: email_params[:email]
@@ -68,7 +66,6 @@ class SettingsController < ApplicationController
     end
   end
 
-  # POST /settings/reset_email_password
   def reset_email_password
     @user.current_password = security_params[:current_password]
 
@@ -91,7 +88,6 @@ class SettingsController < ApplicationController
     end
   end
 
-  # POST /settings/reset_password
   def reset_password
     current_user.send_reset_password_instructions
     sign_out current_user
@@ -99,7 +95,6 @@ class SettingsController < ApplicationController
     redirect_to check_your_email_path, notice: msg
   end
 
-  # POST /settings/set_nostr_pubkey
   def set_nostr_pubkey
     signed_event = Nostr::Event.new(**nostr_event_from_params)
 
@@ -138,6 +133,28 @@ class SettingsController < ApplicationController
     }
   end
 
+  def fetch_nostr_user_metadata
+    if @user.nostr_pubkey.present?
+      outbox_relay_urls = nil
+
+      # if @nip65_event = NostrManager::DiscoverUserRelays.call(pubkey: @user.nostr_pubkey)
+      #   relay_tags = @nip65_event["tags"].select{ |t| t[0] == "r" }
+      #   outbox_relay_urls = relay_tags&.select{ |t| t[2] != "read" }&.map{ |t| t[1] }
+      # end
+
+      # @profile = NostrManager::DiscoverUserProfile.call(
+      #   pubkey: @user.nostr_pubkey,
+      #   relays: outbox_relay_urls
+      # )
+      @profile = {"content"=>"{\"name\":\"jimmy\",\"picture\":\"https://storage.kosmos.org/jimmy/public/shares/241028-1117-tony.jpg\",\"banner\":\"https://storage.kosmos.org/raucao/public/shares/240604-1517-1500x500.jpg\",\"nip05\":\"jimmy@kosmos.org\",\"lud16\":\"jimmy@kosmos.org\",\"pubkey\":\"07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3\",\"display_name\":\"Jimmy\",\"displayName\":\"Jimmy\",\"about\":\"I don't exist. Follow at your own peril.\"}", "created_at"=>1730114246, "id"=>"6b15b1308a61ee837bd3b50319978314650e435891c259f4ea499f819f35a4f6", "kind"=>0, "pubkey"=>"07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3", "sig"=>"4f681f4b95646bbf88a6eae9ca92c0f2ce5effecfa017556a23490f91a99243aedf81d956ee2466ed64fecb9a03b6b89cd80ff116df0178830977e203867d7ae", "tags"=>[]}
+      # @profile = {"content"=>"{\"name\":\"jimmy\",\"nip05\":\"jimmy@kosmos.org\",\"lud16\":\"jimmy@kosmos.org\",\"pubkey\":\"07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3\",\"display_name\":\"Jimmy\",\"displayName\":\"Jimmy\",\"about\":\"I don't exist. Follow at your own peril.\"}", "created_at"=>1730114246, "id"=>"6b15b1308a61ee837bd3b50319978314650e435891c259f4ea499f819f35a4f6", "kind"=>0, "pubkey"=>"07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3", "sig"=>"4f681f4b95646bbf88a6eae9ca92c0f2ce5effecfa017556a23490f91a99243aedf81d956ee2466ed64fecb9a03b6b89cd80ff116df0178830977e203867d7ae", "tags"=>[]}
+    else
+      @relays, @profile = [nil, nil]
+    end
+
+    render partial: 'nostr_user_metadata'
+  end
+
   private
 
     def set_main_nav_section
@@ -162,8 +179,7 @@ class SettingsController < ApplicationController
 
     def user_params
       params.require(:user).permit(
-        :display_name, :avatar, :pgp_pubkey,
-        preferences: UserPreferences.pref_keys
+        :display_name, :avatar, preferences: UserPreferences.pref_keys
       )
     end
 

app/controllers/signup_controller.rb

@@ -96,7 +96,7 @@ class SignupController < ApplicationController
     session[:new_user] = nil
     session[:validation_error] = nil
 
-    UserManager::CreateAccount.call(account: {
+    CreateAccount.call(account: {
       username: @user.cn,
       domain: Setting.primary_domain,
       email: @user.email,

app/models/concerns/settings/nostr_settings.rb

@@ -20,6 +20,19 @@ module Settings
 
       field :nostr_zaps_relay_limit, type: :integer,
         default: 12
+
+      field :nostr_discovery_relays, type: :array, default: %w[
+        wss://nostr.kosmos.org
+        wss://purplepag.es
+        wss://relay.nostr.band
+        wss://njump.me
+        wss://relay.damus.io
+      ]
+
+      def self.nostr_relay_url_http
+        self.nostr_relay_url.gsub(/^ws:/, "http:")
+                            .gsub(/^wss:/, "https:")
+      end
     end
   end
 end

app/models/user.rb

@@ -3,10 +3,9 @@ require 'nostr'
 class User < ApplicationRecord
   include EmailValidatable
 
-  attr_accessor :current_password
-  attr_accessor :avatar_new
   attr_accessor :display_name
-  attr_accessor :pgp_pubkey
+  attr_accessor :avatar_new
+  attr_accessor :current_password
 
   serialize :preferences, coder: UserPreferences
 
@@ -52,8 +51,6 @@ class User < ApplicationRecord
 
   validate :acceptable_avatar
 
-  validate :acceptable_pgp_key_format, if: -> { defined?(@pgp_pubkey) && @pgp_pubkey.present? }
-
   #
   # Scopes
   #
@@ -168,23 +165,6 @@ class User < ApplicationRecord
     Nostr::PublicKey.new(nostr_pubkey).to_bech32
   end
 
-  def pgp_pubkey
-    @pgp_pubkey ||= ldap_entry[:pgp_key]
-  end
-
-  def gnupg_key
-    return nil unless pgp_pubkey.present?
-    @gnupg_key ||= GPGME::Key.get(pgp_fpr)
-  end
-
-  def pgp_pubkey_contains_user_address?
-    gnupg_key.uids.map(&:email).include?(address)
-  end
-
-  def wkd_hash
-    ZBase32.encode(Digest::SHA1.digest(cn))
-  end
-
   def avatar
     @avatar_base64 ||= LdapManager::FetchAvatar.call(cn: cn)
   end
@@ -234,10 +214,4 @@ class User < ApplicationRecord
         errors.add(:avatar, "must be a JPEG or PNG file")
       end
     end
-
-    def acceptable_pgp_key_format
-      unless GPGME::Key.valid?(pgp_pubkey)
-        errors.add(:pgp_pubkey, 'is not a valid armored PGP public key block')
-      end
-    end
 end

app/services/create_account.rb

@@ -0,0 +1,54 @@
+class CreateAccount < ApplicationService
+  def initialize(account:)
+    @username   = account[:username]
+    @domain     = account[:ou] || Setting.primary_domain
+    @email      = account[:email]
+    @password   = account[:password]
+    @invitation = account[:invitation]
+    @confirmed  = account[:confirmed]
+  end
+
+  def call
+    user = create_user_in_database
+    add_ldap_document
+    create_lndhub_account(user) if Setting.lndhub_enabled
+
+    if @invitation.present?
+      update_invitation(user.id)
+    end
+  end
+
+  private
+
+  def create_user_in_database
+    User.create!(
+      cn: @username,
+      ou: @domain,
+      email: @email,
+      password: @password,
+      password_confirmation: @password,
+      confirmed_at: @confirmed ? DateTime.now : nil
+    )
+  end
+
+  def update_invitation(user_id)
+    @invitation.update! invited_user_id: user_id, used_at: DateTime.now
+  end
+
+  def add_ldap_document
+    hashed_pw = Devise.ldap_auth_password_builder.call(@password)
+    CreateLdapUserJob.perform_later(
+      username: @username,
+      domain: @domain,
+      email: @email,
+      hashed_pw: hashed_pw,
+      confirmed: @confirmed
+    )
+  end
+
+  def create_lndhub_account(user)
+    #TODO enable in development when we have a local lndhub (mock?) API
+    return if Rails.env.development?
+    CreateLndhubAccountJob.perform_later(user)
+  end
+end

app/services/create_invitations.rb

@@ -0,0 +1,17 @@
+class CreateInvitations < ApplicationService
+  def initialize(user:, amount:, notify: true)
+    @user = user
+    @amount = amount
+    @notify = notify
+  end
+
+  def call
+    @amount.times do
+      Invitation.create(user: @user)
+    end
+
+    if @notify
+      NotificationMailer.with(user: @user).new_invitations_available.deliver_later
+    end
+  end
+end

app/services/ldap_manager/update_pgp_key.rb

@@ -1,16 +0,0 @@
-module LdapManager
-  class UpdatePgpKey < LdapManagerService
-    def initialize(dn:, pubkey:)
-      @dn = dn
-      @pubkey = pubkey
-    end
-
-    def call
-      if @pubkey.present?
-        replace_attribute @dn, :pgpKey, @pubkey
-      else
-        delete_attribute @dn, :pgpKey
-      end
-    end
-  end
-end

app/services/ldap_service.rb

@@ -58,7 +58,7 @@ class LdapService < ApplicationService
 
     attributes = %w[
       dn cn uid mail displayName admin serviceEnabled
-      mailRoutingAddress mailpassword nostrKey pgpKey
+      mailRoutingAddress mailpassword nostrKey
     ]
     filter = Net::LDAP::Filter.eq("uid", args[:uid] || "*")
 
@@ -73,8 +73,7 @@ class LdapService < ApplicationService
         services_enabled: e.try(:serviceEnabled),
         email_maildrop: e.try(:mailRoutingAddress),
         email_password: e.try(:mailpassword),
-        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil,
-        pgp_key: e.try(:pgpKey) ? e.pgpKey.first : nil
+        nostr_key: e.try(:nostrKey) ? e.nostrKey.first : nil
       }
     end
   end
@@ -102,7 +101,7 @@ class LdapService < ApplicationService
     dn = "ou=#{ou},cn=users,#{ldap_suffix}"
 
     aci = <<-EOS
-(target="ldap:///cn=*,ou=#{ou},cn=users,#{ldap_suffix}")(targetattr="cn || sn || uid || userPassword || mail || mailRoutingAddress || serviceEnabled || nostrKey || pgpKey || nsRole || objectClass") (version 3.0; acl "service-#{ou.gsub(".", "-")}-read-search"; allow (read,search) userdn="ldap:///uid=service,ou=#{ou},cn=applications,#{ldap_suffix}";)
+(target="ldap:///cn=*,ou=#{ou},cn=users,#{ldap_suffix}")(targetattr="cn || sn || uid || userPassword || mail || mailRoutingAddress || serviceEnabled || nostrKey || nsRole || objectClass") (version 3.0; acl "service-#{ou.gsub(".", "-")}-read-search"; allow (read,search) userdn="ldap:///uid=service,ou=#{ou},cn=applications,#{ldap_suffix}";)
     EOS
 
     attrs = {

app/services/nostr_manager/discover_user_profile.rb

@@ -0,0 +1,21 @@
+module NostrManager
+  class DiscoverUserProfile < NostrManagerService
+    def initialize(pubkey:, relays: nil)
+      @pubkey = pubkey
+      @relays = relays.present? ? relays : Setting.nostr_discovery_relays
+    end
+
+    def call
+      filter = Nostr::Filter.new(
+        authors: [@pubkey],
+        kinds: [0],
+        limit: 1,
+      )
+
+      NostrManager::FetchLatestEvent.call(
+        relays: @relays,
+        filter: filter
+      )
+    end
+  end
+end

app/services/nostr_manager/discover_user_relays.rb

@@ -0,0 +1,21 @@
+module NostrManager
+  class DiscoverUserRelays < NostrManagerService
+    def initialize(pubkey:)
+      @pubkey = pubkey
+      @relays = Setting.nostr_discovery_relays
+    end
+
+    def call
+      filter = Nostr::Filter.new(
+        authors: [@pubkey],
+        kinds: [10002],
+        limit: 1,
+      )
+
+      NostrManager::FetchLatestEvent.call(
+        relays: @relays,
+        filter: filter
+      )
+    end
+  end
+end

app/services/nostr_manager/fetch_event.rb

@@ -0,0 +1,59 @@
+module NostrManager
+  class FetchEvent < NostrManagerService
+    TIMEOUT = 10
+
+    def initialize(filter:, relay_url:)
+      @filter = filter
+      @relay = new_relay(relay_url)
+      @client = Nostr::Client.new
+    end
+
+    def call
+      filter, client, relay = @filter, @client, @relay
+      event = nil
+      mutex = Mutex.new
+      received_event = ConditionVariable.new
+      log_prefix = "[nostr][#{@relay.name}]"
+
+      thread = Thread.new do
+        client.on :connect do
+          client.subscribe(filter: filter)
+        end
+
+        client.on :error do |e|
+          Rails.logger.info "#{log_prefix} Error: #{e}"
+          Thread.current.exit
+        end
+
+        client.on :message do |m|
+          msg = JSON.parse(m) rescue nil
+          if msg && msg[0] == "EVENT" && msg[2]
+            Rails.logger.debug "#{log_prefix} Event received: #{msg[2]["id"]}"
+            mutex.synchronize do
+              event = msg[2]
+              received_event.signal
+            end
+          elsif msg && msg[0] == "EOSE"
+            Thread.current.exit
+          end
+        end
+
+        client.connect relay
+      end
+
+      begin
+        Timeout.timeout(TIMEOUT) do
+          mutex.synchronize do
+            received_event.wait(mutex) if event.nil?
+          end
+        end
+      rescue Timeout::Error
+        Rails.logger.debug "#{log_prefix} Timeout: No event received within #{TIMEOUT} seconds"
+      ensure
+        thread.exit
+      end
+
+      event
+    end
+  end
+end

app/services/nostr_manager/fetch_latest_event.rb

@@ -0,0 +1,44 @@
+module NostrManager
+  class FetchLatestEvent < NostrManagerService
+    TIMEOUT = 20
+
+    def initialize(relays:, filter:, max_events: 2)
+      @relays = relays
+      @filter = filter
+      @max_events = max_events
+    end
+
+    def call
+      received_events = 0
+      events = []
+
+      begin
+        Timeout.timeout(TIMEOUT) do
+          @relays.each do |url|
+            event = NostrManager::FetchEvent.call(filter: @filter, relay_url: url)
+
+            if event.present?
+              events << event if events.none? { |e| e["id"] == event["id"] }
+              received_events += 1
+            end
+
+            if received_events >= @max_events
+              Rails.logger.debug "Found #{@max_events} events, ending the search"
+              break
+            end
+          end
+
+          events.min_by { |e| e["created_at"] }
+        end
+      rescue Timeout::Error
+        if events.size == 1
+          Rails.logger.debug "[nostr] Timeout: only found 1 event within #{TIMEOUT} seconds for filter: #{@filter.inspect}"
+          events.first
+        else
+          Rails.logger.debug "[nostr] Timeout: no events found within #{TIMEOUT} seconds for filter: #{@filter.inspect}"
+          nil
+        end
+      end
+    end
+  end
+end

app/services/nostr_manager/publish_event.rb

@@ -19,28 +19,28 @@ module NostrManager
 
       thread = Thread.new do
         client.on :connect do
-          puts "#{log_prefix} Publishing #{event.id}..."
+          Rails.logger.debug "#{log_prefix} Publishing #{event.id}..."
           client.publish event
         end
 
         client.on :error do |e|
-          puts "#{log_prefix} Error: #{e}"
-          puts "#{log_prefix} Closing thread..."
+          Rails.logger.debug "#{log_prefix} Error: #{e}"
+          Rails.logger.debug "#{log_prefix} Closing thread..."
           thread.exit
         end
 
         client.on :message do |m|
-          puts "#{log_prefix} Message: #{m}"
+          Rails.logger.debug "#{log_prefix} Message: #{m}"
           msg = JSON.parse(m) rescue []
           if msg[0] == "OK" && msg[1] == event.id && msg[2]
-            puts "#{log_prefix} Event published. Closing thread..."
+            Rails.logger.debug "#{log_prefix} Event published. Closing thread..."
           else
-            puts "#{log_prefix} Unexpected message from relay. Closing thread..."
+            Rails.logger.debug "#{log_prefix} Unexpected message from relay. Closing thread..."
           end
           thread.exit
         end
 
-        puts "#{log_prefix} Connecting to #{relay.url}..."
+        Rails.logger.debug "#{log_prefix} Connecting to #{relay.url}..."
         client.connect relay
       end
 

app/services/nostr_manager_service.rb

@@ -3,6 +3,7 @@ require "nostr"
 class NostrManagerService < ApplicationService
   def parse_tags(tags)
     out = {}
+    # TODO support more than 1 item for each tag type
     tags.each do |tag|
       out[tag[0].to_sym] = tag[1, tag.length]
     end
@@ -19,4 +20,8 @@ class NostrManagerService < ApplicationService
   def site_user
     Nostr::User.new(keypair: site_keypair)
   end
+
+  def new_relay(url)
+    Nostr::Relay.new(url: url, name: URI.parse(url).host)
+  end
 end

app/services/user_manager/create_account.rb

@@ -1,56 +0,0 @@
-module UserManager
-  class CreateAccount < UserManagerService
-    def initialize(account:)
-      @username   = account[:username]
-      @domain     = account[:ou] || Setting.primary_domain
-      @email      = account[:email]
-      @password   = account[:password]
-      @invitation = account[:invitation]
-      @confirmed  = account[:confirmed]
-    end
-
-    def call
-      user = create_user_in_database
-      add_ldap_document
-      create_lndhub_account(user) if Setting.lndhub_enabled
-
-      if @invitation.present?
-        update_invitation(user.id)
-      end
-    end
-
-    private
-
-    def create_user_in_database
-      User.create!(
-        cn: @username,
-        ou: @domain,
-        email: @email,
-        password: @password,
-        password_confirmation: @password,
-        confirmed_at: @confirmed ? DateTime.now : nil
-      )
-    end
-
-    def update_invitation(user_id)
-      @invitation.update! invited_user_id: user_id, used_at: DateTime.now
-    end
-
-    def add_ldap_document
-      hashed_pw = Devise.ldap_auth_password_builder.call(@password)
-      CreateLdapUserJob.perform_later(
-        username: @username,
-        domain: @domain,
-        email: @email,
-        hashed_pw: hashed_pw,
-        confirmed: @confirmed
-      )
-    end
-
-    def create_lndhub_account(user)
-      #TODO enable in development when we have a local lndhub (mock?) API
-      return if Rails.env.development?
-      CreateLndhubAccountJob.perform_later(user)
-    end
-  end
-end

app/services/user_manager/create_invitations.rb

@@ -1,19 +0,0 @@
-module UserManager
-  class CreateInvitations < UserManagerService
-    def initialize(user:, amount:, notify: true)
-      @user = user
-      @amount = amount
-      @notify = notify
-    end
-
-    def call
-      @amount.times do
-        Invitation.create(user: @user)
-      end
-
-      if @notify
-        NotificationMailer.with(user: @user).new_invitations_available.deliver_later
-      end
-    end
-  end
-end

app/services/user_manager/update_pgp_key.rb

@@ -1,24 +0,0 @@
-module UserManager
-  class UpdatePgpKey < UserManagerService
-    def initialize(user:)
-      @user = user
-    end
-
-    def call
-      if @user.pgp_pubkey.blank?
-        @user.update! pgp_fpr: nil
-      else
-        result = GPGME::Key.import(@user.pgp_pubkey)
-
-        if result.imports.present?
-          @user.update! pgp_fpr: result.imports.first.fpr
-        else
-          # TODO notify Sentry, user
-          raise "Failed to import OpenPGP pubkey"
-        end
-      end
-
-      LdapManager::UpdatePgpKey.call(dn: @user.dn, pubkey: @user.pgp_pubkey)
-    end
-  end
-end

app/services/user_manager_service.rb

@@ -1,2 +0,0 @@
-class UserManagerService < ApplicationService
-end

app/views/admin/settings/services/_nostr.html.erb

@@ -31,13 +31,28 @@
       ) %>
 </ul>
 </section>
+
 <section>
 <h3>Zaps</h3>
 <ul role="list">
   <%= render FormElements::FieldsetResettableSettingComponent.new(
         key: :nostr_zaps_relay_limit,
         title: "Relay limit",
-        description: "The maximum number of relays to publish zap receipts to"
+        description: "The maximum number of sender-defined relays to try to publish zap receipts to"
       ) %>
 </ul>
+</section>
+
+<section>
+<h3>Onboarding</h3>
+<ul role="list">
+  <%= render FormElements::FieldsetComponent.new(
+        title: "Discovery relays",
+        description: "Used to discover a user's published relay list and/or profile"
+      ) do %>
+    <%= f.text_area :nostr_discovery_relays,
+      value: Setting.nostr_discovery_relays.join("\n"),
+      class: "h-44 w-80" %>
+  <% end %>
+</ul>
 <% end %>

app/views/admin/users/show.html.erb

@@ -184,7 +184,7 @@
           <td>XMPP (ejabberd)</td>
           <td>
             <%= render FormElements::ToggleComponent.new(
-              enabled: @services_enabled.include?("xmpp"),
+              enabled: @services_enabled.include?("ejabberd"),
               input_enabled: false
             ) %>
           </td>

app/views/settings/_account.html.erb

@@ -1,6 +1,6 @@
 <%= tag.section data: {
       controller: "settings--account--email",
-      "settings--account--email-validation-failed-value": @validation_errors&.[](:email)&.present?
+      "settings--account--email-validation-failed-value": @validation_errors.present?
     } do %>
   <h3>E-Mail</h3>
   <%= form_for(@user, url: update_email_settings_path, method: "post") do |f| %>
@@ -23,7 +23,7 @@
         </span>
       </button>
     </p>
-    <% if @validation_errors&.[](:email)&.present? %>
+    <% if @validation_errors.present? && @validation_errors[:email].present? %>
       <p class="error-msg"><%= @validation_errors[:email].first %></p>
     <% end %>
     <div class="initial-hidden">
@@ -41,33 +41,10 @@
 <% end %>
 <section>
   <h3>Password</h3>
-  <p class="mb-6">Use the following button to request an email with a password reset link:</p>
+  <p class="mb-8">Use the following button to request an email with a password reset link:</p>
   <%= form_with(url: reset_password_settings_path, method: :post) do %>
     <p>
       <%= submit_tag("Send me a password reset link", class: 'btn-md btn-gray w-full sm:w-auto') %>
     </p>
   <% end %>
 </section>
-<%= form_for(@user, url: setting_path(:account), html: { :method => :put }) do |f| %>
-  <section class="!pt-8 sm:!pt-12">
-    <h3>OpenPGP</h3>
-    <ul role="list">
-      <%= render FormElements::FieldsetComponent.new(
-            title: "Public key",
-            description: "Your OpenPGP public key in ASCII Armor format ([example])"
-          ) do %>
-        <%= f.text_area :pgp_pubkey,
-          value: @user.pgp_pubkey,
-          class: "h-24 w-full" %>
-        <% if @validation_errors&.[](:pgp_pubkey)&.present? %>
-          <p class="error-msg">This <%= @validation_errors[:pgp_pubkey].first %></p>
-        <% end %>
-      <% end %>
-    </ul>
-  </section>
-  <section>
-    <p class="pt-6 border-t border-gray-200 text-right">
-      <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
-    </p>
-  </section>
-<% end %>

app/views/settings/_nostr.html.erb

@@ -1,47 +1,43 @@
-<section>
-  <h3>Nostr</h3>
-  <h4 class="mb-0">Public Key</h4>
-  <div data-controller="settings--nostr-pubkey"
-       data-settings--nostr-pubkey-user-address-value="<%= current_user.address %>"
-       data-settings--nostr-pubkey-site-value="<%= Setting.accounts_domain %>"
-       data-settings--nostr-pubkey-shared-secret-value="<%= session[:shared_secret] %>"
-       data-settings--nostr-pubkey-pubkey-hex-value="<%= current_user.nostr_pubkey %>">
-
-    <p class="<%= current_user.nostr_pubkey.present? ? '' : 'hidden' %> mt-2 flex gap-1">
+<div data-controller="settings--nostr-pubkey"
+     data-settings--nostr-pubkey-user-address-value="<%= current_user.address %>"
+     data-settings--nostr-pubkey-site-value="<%= Setting.accounts_domain %>"
+     data-settings--nostr-pubkey-shared-secret-value="<%= session[:shared_secret] %>"
+     data-settings--nostr-pubkey-pubkey-hex-value="<%= current_user.nostr_pubkey %>">
+  <section class="mb-8 sm:mb-12">
+    <h3>Nostr</h3>
+    <h4 class="mb-0">
+      Public Key
+    </h4>
+    <p class="<%= current_user.nostr_pubkey.present? ? '' : 'hidden' %> mt-2 flex gap-x-1">
       <input type="text" value="<%= current_user.nostr_pubkey_bech32 %>" disabled
              data-settings--nostr-pubkey-target="pubkeyBech32Input"
-             name="nostr_public_key" class="relative grow" />
+             name="nostr_public_key" class="w-full" />
       <%= link_to nostr_pubkey_settings_path,
-            class: 'btn-md btn-outline text-red-700 relative shrink-0',
+            class: 'btn-md btn-outline relative grow-0 shrink-0 text-red-700',
             data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' } do %>
         Remove
       <% end %>
     </p>
 
     <% if current_user.nostr_pubkey.present? %>
-    <div class="rounded-md bg-blue-50 p-4">
-      <div class="flex">
-        <div class="flex-shrink-0">
-          <svg class="h-5 w-5 text-blue-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z" clip-rule="evenodd" />
-          </svg>
-        </div>
-        <div class="ml-3 flex-1">
-          <p class="text-sm text-blue-800">
-            Your user address <strong><%= current_user.address %></strong> is
-            also a Nostr address now. Use your favorite Nostr app, or for
-            example <a href="http://metadata.nostr.com" target="_blank"
-              class="underline">metadata.nostr.com</a>, to add this
-            <strong>NIP-05</strong> address to your public profile.
-          </p>
-        </div>
-      </div>
-    </div>
+    <!-- <div> -->
+    <!--   Pubkey present -->
+    <!-- </div> -->
     <% else %>
     <p class="my-4">
-      If you use any apps on the Nostr network, you can verify your public key
-      with us in order to enable Nostr-specific features for your account.
+      Verify your Nostr public key with us in order to enable Nostr-specific
+      features for your account:
     </p>
+    <ul class="list-disc list-inside">
+      <li>Log in with Nostr (no password needed)</li>
+      <li>Verified Nostr address</li>
+      <% if Setting.lndhub_enabled? %>
+      <li>Receive zaps in your Lightning account</li>
+      <% end %>
+      <% if Setting.nostr_relay_url.present? %>
+      <li>Publish notes on <%= link_to "our relay", Setting.nostr_relay_url_http, class: "ks-text-link", target: "_blank" %></li>
+      <% end %>
+    </ul>
     <% end %>
 
     <div data-settings--nostr-pubkey-target="noExtension"
@@ -58,8 +54,8 @@
           </h3>
           <div class="mt-2 mb-0 text-sm text-blue-800">
             <p>
-              We recommend Alby, which you can also use for your Lightning
-              Wallet.
+              We recommend Alby, which you can also use a wallet for your
+              Lightning account.
             </p>
           </div>
           <div class="mt-4">
@@ -86,5 +82,11 @@
       </button>
     </p>
     <% end %>
-  </div>
-</section>
+  </section>
+
+  <% if current_user.nostr_pubkey.present? %>
+    <%= turbo_frame_tag "nostr_user_metadata", src: nostr_user_metadata_settings_path do %>
+      <p>Loading...</p>
+    <% end %>
+  <% end %>
+</div>

app/views/settings/_nostr_user_metadata.html.erb

@@ -0,0 +1,27 @@
+<%= turbo_frame_tag "nostr_user_metadata" do %>
+  <section>
+    <h3>Relays</h3>
+    <%= render Settings::NostrRelayStatusComponent.new(
+      nip65_event: @nip65_event
+    ) %>
+  </section>
+
+  <section>
+    <h3>Profile</h3>
+    <%= render Settings::NostrProfileStatusComponent.new(
+      profile_event: @profile,
+      user_address: current_user.address
+    ) %>
+    <div class="mt-8" data-controller="modal" data-action="keydown.esc->modal#close">
+      <button data-action="click->modal#open" class="btn-md btn-blue w-full sm:w-auto">
+        Edit profile
+      </button>
+      <%= render ModalComponent.new(show_close_button: false) do %>
+        <%= render Settings::NostrEditProfileComponent.new(
+          user: current_user,
+          profile_event: @profile
+        ) %>
+      <% end %>
+    </div>
+  </section>
+<% end %>

app/views/shared/_sidenav_settings.html.erb

@@ -19,12 +19,6 @@
   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? &&
       Flipper.enabled?(:remotestorage, current_user) %>
 <%= render SidenavLinkComponent.new(
@@ -32,6 +26,12 @@
   active: @settings_section.to_s == "remotestorage"
 ) %>
 <% 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.nostr_enabled %>
 <%= render SidenavLinkComponent.new(
   name: "Nostr", path: setting_path(:nostr), icon: "nostrich-head",

app/views/shared/nostr/_edit_user_profile.html.erb

@@ -0,0 +1,3 @@
+<div>
+  <%= profile.inspect %>
+</div>

config/routes.rb

@@ -65,6 +65,7 @@ Rails.application.routes.draw do
       post 'reset_email_password'
       post 'set_nostr_pubkey'
       delete 'nostr_pubkey', to: 'settings#remove_nostr_pubkey'
+      get 'fetch_nostr_user_metadata', as: 'nostr_user_metadata'
     end
   end
 

db/migrate/20240922205634_add_pgp_fpr_to_users.rb

@@ -1,5 +0,0 @@
-class AddPgpFprToUsers < ActiveRecord::Migration[7.1]
-  def change
-    add_column :users, :pgp_fpr, :string
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_09_22_205634) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_07_123654) do
   create_table "active_storage_attachments", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -132,7 +132,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_09_22_205634) do
     t.datetime "remember_created_at"
     t.string "remember_token"
     t.text "preferences"
-    t.string "pgp_fpr"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end

lib/tasks/ldap.rake

@@ -21,7 +21,7 @@ namespace :ldap do
 
   desc "Add custom attributes to schema"
   task add_custom_attributes: :environment do |t, args|
-    %w[ admin service_enabled nostr_key pgp_key ].each do |name|
+    %w[ admin service_enabled nostr_key ].each do |name|
       Rake::Task["ldap:modify_ldap_schema"].invoke(name, "add")
       Rake::Task['ldap:modify_ldap_schema'].reenable
     end
@@ -29,7 +29,7 @@ namespace :ldap do
 
   desc "Delete custom attributes from schema"
   task delete_custom_attributes: :environment do |t, args|
-    %w[ admin service_enabled nostr_key pgp_key ].each do |name|
+    %w[ admin service_enabled nostr_key ].each do |name|
       Rake::Task["ldap:modify_ldap_schema"].invoke(name, "delete")
       Rake::Task['ldap:modify_ldap_schema'].reenable
     end

schemas/ldap/pgp_key.ldif

@@ -1,8 +0,0 @@
-dn: cn=schema
-changetype: modify
-add: attributeTypes
-attributeTypes: ( 1.3.6.1.4.1.3401.8.2.11
-  NAME 'pgpKey'
-  DESC 'OpenPGP public key block'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE )

spec/features/settings/account_spec.rb

@@ -14,7 +14,6 @@ RSpec.describe 'Account settings', type: :feature do
         .with("invalid password").and_return(false)
       allow_any_instance_of(User).to receive(:valid_ldap_authentication?)
         .with("valid password").and_return(true)
-      allow_any_instance_of(User).to receive(:pgp_pubkey).and_return(nil)
     end
 
     scenario 'fails with invalid password' do
@@ -56,44 +55,4 @@ RSpec.describe 'Account settings', type: :feature do
       end
     end
   end
-
-  feature "Update OpenPGP key" do
-    let(:invalid_key) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_invalid.asc") }
-    let(:valid_key_alice) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_valid_alice.asc") }
-    let(:fingerprint_alice) { "EB85BB5FA33A75E15E944E63F231550C4F47E38E" }
-
-    before do
-      login_as user, :scope => :user
-      allow_any_instance_of(User).to receive(:ldap_entry).and_return({
-        uid: user.cn, ou: user.ou, display_name: nil, pgp_key: nil
-      })
-    end
-
-    scenario 'rejects an invalid key' do
-      expect(UserManager::UpdatePgpKey).not_to receive(:call)
-
-      visit setting_path(:account)
-      fill_in 'Public key', with: invalid_key
-      click_button "Save"
-
-      expect(current_url).to eq(setting_url(:account))
-      within ".error-msg" do
-        expect(page).to have_content("This is not a valid armored PGP public key block")
-      end
-    end
-
-    scenario 'stores a valid key' do
-      expect(UserManager::UpdatePgpKey).to receive(:call)
-        .with(user: user).and_return(true)
-
-      visit setting_path(:account)
-      fill_in 'Public key', with: valid_key_alice
-      click_button "Save"
-
-      expect(current_url).to eq(setting_url(:account))
-      within ".flash-msg" do
-        expect(page).to have_content("Settings saved")
-      end
-    end
-  end
 end

spec/features/settings/profile_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Profile settings', type: :feature do
     allow(user).to receive(:display_name).and_return("Mark")
     allow_any_instance_of(User).to receive(:dn).and_return("cn=mwahlberg,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, display_name: "Mark", pgp_key: nil
+      uid: user.cn, ou: user.ou, display_name: "Mark"
     })
     allow_any_instance_of(User).to receive(:avatar).and_return(avatar_base64)
 

spec/features/signup_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe "Signup", type: :feature do
       click_button "Continue"
       expect(page).to have_content("Choose a password")
 
-      expect(UserManager::CreateAccount).to receive(:call)
+      expect(CreateAccount).to receive(:call)
         .with(account: {
           username: "tony", domain: "kosmos.org",
           email: "tony@example.com", password: "a-valid-password",
@@ -96,7 +96,7 @@ RSpec.describe "Signup", type: :feature do
       click_button "Create account"
       expect(page).to have_content("Password is too short")
 
-      expect(UserManager::CreateAccount).to receive(:call)
+      expect(CreateAccount).to receive(:call)
         .with(account: {
           username: "tony", domain: "kosmos.org",
           email: "tony@example.com", password: "a-valid-password",

spec/fixtures/files/pgp_key_invalid.asc

@@ -1,11 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE
-ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy
-MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO
-dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4
-OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s
-E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb
-DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn
-0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
-=iIGO
------END PGP PUBLIC KEY BLOCK-----

spec/fixtures/files/pgp_key_valid_alice.asc

@@ -1,16 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: Alice's OpenPGP certificate
-Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
-
-mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
-b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE
-ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy
-MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO
-dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4
-OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s
-E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb
-DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn
-0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
-=iIGO
-
------END PGP PUBLIC KEY BLOCK-----

spec/fixtures/files/pgp_key_valid_jimmy.asc

@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZvFjRhYJKwYBBAHaRw8BAQdACUxVX9bGlbuNR0MNYUyHHxTcOgm4qjwq8Bjg
-7P41OFK0GEppbW15IDxqaW1teUBrb3Ntb3Mub3JnPoiZBBMWCgBBFiEEMWv1FiNt
-r3cjaxX2BX2Tly+4YsMFAmbxY0YCGwMFCQWjmoAFCwkIBwICIgIGFQoJCAsCBBYC
-AwECHgcCF4AACgkQBX2Tly+4YsMjHgEAoOOLrv9pWbi8hhrSMkqJ7FJvsBTQF//U
-aJUQRa8CTgoBAI3kyGKZ8gOC8UOOKsUC0LiNCVXPyX45h8T4QFRdEVYKuDgEZvFj
-RhIKKwYBBAGXVQEFAQEHQIomqcQ59UjtQex54pz8qGqyxCj2DPJYUat9pXinDgN8
-AwEIB4h+BBgWCgAmFiEEMWv1FiNtr3cjaxX2BX2Tly+4YsMFAmbxY0YCGwwFCQWj
-moAACgkQBX2Tly+4YsPoVgEA/9Q5Gs1klP4u/nw343V57e9s4RKmEiRSkErnC9wW
-Iu0A/jp6Elz2pDQPB2XLwcb+n7JlgA05HI0zWj1+EoM7TC4J
-=KQbn
------END PGP PUBLIC KEY BLOCK-----

spec/models/user_spec.rb

@@ -1,16 +1,20 @@
 require 'rails_helper'
 
 RSpec.describe User, type: :model do
-  let(:user) { create :user, cn: "philipp", ou: "kosmos.org", email: "philipp@example.com" }
+  let(:user) { create :user, cn: "philipp" }
   let(:dn) { "cn=philipp,ou=kosmos.org,cn=users,dc=kosmos,dc=org" }
 
   describe "#address" do
+    let(:user) { build :user, cn: "jimmy", ou: "kosmos.org" }
+
     it "returns the user address" do
-      expect(user.address).to eq("philipp@kosmos.org")
+      expect(user.address).to eq("jimmy@kosmos.org")
     end
   end
 
   describe "#mastodon_address" do
+    let(:user) { build :user, cn: "jimmy", ou: "kosmos.org" }
+
     context "Mastodon service not configured" do
       before do
         Setting.mastodon_enabled = false
@@ -28,7 +32,7 @@ RSpec.describe User, type: :model do
 
       describe "domain is the same as primary domain" do
         it "returns the user address" do
-          expect(user.mastodon_address).to eq("philipp@kosmos.org")
+          expect(user.mastodon_address).to eq("jimmy@kosmos.org")
         end
       end
 
@@ -38,7 +42,7 @@ RSpec.describe User, type: :model do
         end
 
         it "returns the user address" do
-          expect(user.mastodon_address).to eq("philipp@kosmos.social")
+          expect(user.mastodon_address).to eq("jimmy@kosmos.social")
         end
       end
 
@@ -235,7 +239,7 @@ RSpec.describe User, type: :model do
 
   describe "#nostr_pubkey" do
     before do
-      allow(user).to receive(:ldap_entry)
+      allow_any_instance_of(User).to receive(:ldap_entry)
         .and_return({ nostr_key: "07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3" })
     end
 
@@ -246,7 +250,7 @@ RSpec.describe User, type: :model do
 
   describe "#nostr_pubkey_bech32" do
     before do
-      allow(user).to receive(:ldap_entry)
+      allow_any_instance_of(User).to receive(:ldap_entry)
         .and_return({ nostr_key: "07e188a1ff87ce171d517b8ed2bb7a31b1d3453a0db3b15379ec07b724d232f3" })
     end
 
@@ -254,73 +258,4 @@ RSpec.describe User, type: :model do
       expect(user.nostr_pubkey_bech32).to eq("npub1qlsc3g0lsl8pw8230w8d9wm6xxcax3f6pkemz5measrmwfxjxteslf2hac")
     end
   end
-
-  describe "OpenPGP key" do
-    let(:alice) { create :user, id: 2, cn: "alice", email: "alice@example.com" }
-    let(:jimmy) { create :user, id: 3, cn: "jimmy", email: "jimmy@example.com" }
-    let(:valid_key_alice) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_valid_alice.asc") }
-    let(:valid_key_jimmy) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_valid_jimmy.asc") }
-    let(:fingerprint_alice) { "EB85BB5FA33A75E15E944E63F231550C4F47E38E" }
-    let(:fingerprint_jimmy) { "316BF516236DAF77236B15F6057D93972FB862C3" }
-    let(:invalid_key) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_invalid.asc") }
-
-    before do
-      GPGME::Key.import(valid_key_alice)
-      GPGME::Key.import(valid_key_jimmy)
-      alice.update pgp_fpr: fingerprint_alice
-      jimmy.update pgp_fpr: fingerprint_jimmy
-      allow(alice).to receive(:ldap_entry).and_return({ pgp_key: valid_key_alice })
-      allow(jimmy).to receive(:ldap_entry).and_return({ pgp_key: valid_key_jimmy })
-    end
-
-    after do
-      alice.gnupg_key.delete!
-      jimmy.gnupg_key.delete!
-    end
-
-    describe "#acceptable_pgp_key_format" do
-      it "validates the record when the key is valid" do
-        alice.pgp_pubkey = valid_key_alice
-        expect(alice).to be_valid
-      end
-
-      it "adds a validation error when the key is not valid" do
-        user.pgp_pubkey = invalid_key
-        expect(user).to_not be_valid
-        expect(user.errors[:pgp_pubkey]).to be_present
-      end
-    end
-
-    describe "#pgp_pubkey" do
-      it "returns the raw pubkey from LDAP" do
-        expect(alice.pgp_pubkey).to eq(valid_key_alice)
-      end
-    end
-
-    describe "#gnupg_key" do
-      subject { alice.gnupg_key }
-
-      it "returns a GPGME::Key object from the system's GPG keyring" do
-        expect(subject).to be_a(GPGME::Key)
-        expect(subject.fingerprint).to eq(fingerprint_alice)
-        expect(subject.email).to eq("alice@openpgp.example")
-      end
-    end
-
-    describe "#pgp_pubkey_contains_user_address?" do
-      it "returns false when the user address is one of the UIDs of the key" do
-        expect(alice.pgp_pubkey_contains_user_address?).to eq(false)
-      end
-
-      it "returns true when the user address is missing from the UIDs of the key" do
-        expect(jimmy.pgp_pubkey_contains_user_address?).to eq(true)
-      end
-    end
-
-    describe "wkd_hash" do
-      it "returns a z-base32 encoded SHA-1 digest of the username" do
-        expect(alice.wkd_hash).to eq("kei1q4tipxxu1yj79k9kfukdhfy631xe")
-      end
-    end
-  end
 end

spec/services/create_account_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
-RSpec.describe UserManager::CreateAccount, type: :model do
+RSpec.describe CreateAccount, type: :model do
   describe "#create_user_in_database" do
-    let(:service) { described_class.new(account: {
+    let(:service) { CreateAccount.new(account: {
       username: 'isaacnewton',
       email: 'isaacnewton@example.com',
       password: 'bright-ideas-in-autumn'
@@ -19,7 +19,7 @@ RSpec.describe UserManager::CreateAccount, type: :model do
 
   describe "#update_invitation" do
     let(:invitation) { create :invitation }
-    let(:service) { described_class.new(account: {
+    let(:service) { CreateAccount.new(account: {
       username: 'isaacnewton',
       email: 'isaacnewton@example.com',
       password: 'bright-ideas-in-autumn',
@@ -42,7 +42,7 @@ RSpec.describe UserManager::CreateAccount, type: :model do
   describe "#add_ldap_document" do
     include ActiveJob::TestHelper
 
-    let(:service) { described_class.new(account: {
+    let(:service) { CreateAccount.new(account: {
       username: 'halfinney',
       email: 'halfinney@example.com',
       password: 'remember-remember-the-5th-of-november'
@@ -68,7 +68,7 @@ RSpec.describe UserManager::CreateAccount, type: :model do
   describe "#add_ldap_document for pre-confirmed account" do
     include ActiveJob::TestHelper
 
-    let(:service) { described_class.new(account: {
+    let(:service) { CreateAccount.new(account: {
       username: 'halfinney',
       email: 'halfinney@example.com',
       password: 'remember-remember-the-5th-of-november',
@@ -89,7 +89,7 @@ RSpec.describe UserManager::CreateAccount, type: :model do
   describe "#create_lndhub_account" do
     include ActiveJob::TestHelper
 
-    let(:service) { described_class.new(account: {
+    let(:service) { CreateAccount.new(account: {
       username: 'halfinney', email: 'halfinney@example.com',
       password: 'bright-ideas-in-winter'
     })}

spec/services/create_invitations_spec.rb

@@ -1,13 +1,13 @@
 require 'rails_helper'
 
-RSpec.describe UserManager::CreateInvitations, type: :model do
+RSpec.describe CreateInvitations, type: :model do
   include ActiveJob::TestHelper
 
   let(:user) { create :user }
 
   describe "#call" do
     before do
-      described_class.call(user: user, amount: 5)
+      CreateInvitations.call(user: user, amount: 5)
     end
 
     after(:each) { clear_enqueued_jobs }
@@ -28,7 +28,7 @@ RSpec.describe UserManager::CreateInvitations, type: :model do
 
   describe "#call with notification disabled" do
     before do
-      described_class.call(user: user, amount: 3, notify: false)
+      CreateInvitations.call(user: user, amount: 3, notify: false)
     end
 
     after(:each) { clear_enqueued_jobs }

spec/services/user_manager/update_pgp_key_spec.rb

@@ -1,74 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe UserManager::UpdatePgpKey, type: :model do
-  include ActiveJob::TestHelper
-
-  let(:alice) { create :user, cn: "alice" }
-  let(:dn)    { "cn=alice,ou=kosmos.org,cn=users,dc=kosmos,dc=org" }
-  let(:pubkey_asc) { File.read("#{Rails.root}/spec/fixtures/files/pgp_key_valid_alice.asc") }
-  let(:fingerprint) { "EB85BB5FA33A75E15E944E63F231550C4F47E38E" }
-
-  before do
-    allow(alice).to receive(:dn).and_return(dn)
-    allow(alice).to receive(:ldap_entry).and_return({
-      uid: alice.cn, ou: alice.ou, pgp_key: nil
-    })
-  end
-
-  describe "#call" do
-    context "with valid key" do
-      before do
-        alice.pgp_pubkey = pubkey_asc
-
-        allow(LdapManager::UpdatePgpKey).to receive(:call)
-          .with(dn: alice.dn, pubkey: pubkey_asc)
-      end
-
-      after do
-        alice.gnupg_key.delete!
-      end
-
-      it "imports the key into the GnuPG keychain" do
-        described_class.call(user: alice)
-        expect(alice.gnupg_key).to be_present
-      end
-
-      it "stores the key's fingerprint on the user record" do
-        described_class.call(user: alice)
-        expect(alice.pgp_fpr).to eq(fingerprint)
-      end
-
-      it "updates the user's LDAP entry with the new key" do
-        expect(LdapManager::UpdatePgpKey).to receive(:call)
-          .with(dn: alice.dn, pubkey: pubkey_asc)
-        described_class.call(user: alice)
-      end
-    end
-
-    context "with empty key" do
-      before do
-        alice.update pgp_fpr: fingerprint
-        alice.pgp_pubkey = ""
-
-        allow(LdapManager::UpdatePgpKey).to receive(:call)
-          .with(dn: alice.dn, pubkey: "")
-      end
-
-      it "does not attempt to import the key" do
-        expect(GPGME::Key).not_to receive(:import)
-        described_class.call(user: alice)
-      end
-
-      it "removes the key's fingerprint from the user record" do
-        described_class.call(user: alice)
-        expect(alice.pgp_fpr).to be_nil
-      end
-
-      it "removes the key from the user's LDAP entry" do
-        expect(LdapManager::UpdatePgpKey).to receive(:call)
-          .with(dn: alice.dn, pubkey: "")
-        described_class.call(user: alice)
-      end
-    end
-  end
-end