Merge branch 'master' into feature/rs-oauth

.env.example

@@ -19,8 +19,6 @@ LDAP_SUFFIX='dc=kosmos,dc=org'
 WEBHOOKS_ALLOWED_IPS='10.1.1.163'
 
 DISCOURSE_PUBLIC_URL='https://community.kosmos.org'
-DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'
-
 GITEA_PUBLIC_URL='https://gitea.kosmos.org'
 MASTODON_PUBLIC_URL='https://kosmos.social'
 MEDIAWIKI_PUBLIC_URL='https://wiki.kosmos.org'

.env.test

@@ -1,6 +1,3 @@
-DISCOURSE_PUBLIC_URL='http://discourse.example.com'
-DISCOURSE_CONNECT_SECRET='discourse_connect_ftw'
-
 EJABBERD_API_URL='http://xmpp.example.com/api'
 
 BTCPAY_API_URL='http://btcpay.example.com/api/v1'

Gemfile

@@ -40,9 +40,6 @@ gem 'net-ldap'
 gem "rqrcode", "~> 2.0"
 gem 'rails-settings-cached', '~> 2.8.3'
 gem 'pagy', '~> 6.0', '>= 6.0.2'
-gem 'flipper'
-gem 'flipper-active_record'
-gem 'flipper-ui'
 
 # HTTP requests
 gem 'faraday'
@@ -51,9 +48,6 @@ gem 'faraday'
 gem 'sidekiq', '< 7'
 gem 'sidekiq-scheduler'
 
-# Service integrations
-gem 'discourse_api'
-
 # Monitoring
 gem "sentry-ruby"
 gem "sentry-rails"

Gemfile.lock

@@ -108,11 +108,6 @@ GEM
       devise (>= 3.4.1)
       net-ldap (>= 0.16.0)
     diff-lcs (1.5.0)
-    discourse_api (2.0.0)
-      faraday (~> 2.7)
-      faraday-follow_redirects
-      faraday-multipart
-      rack (>= 1.6)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
@@ -131,23 +126,8 @@ GEM
     faraday (2.7.1)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
     faraday-net_http (3.0.2)
     ffi (1.15.5)
-    flipper (0.28.0)
-      concurrent-ruby (< 2)
-    flipper-active_record (0.28.0)
-      activerecord (>= 4.2, < 8)
-      flipper (~> 0.28.0)
-    flipper-ui (0.28.0)
-      erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 0.28.0)
-      rack (>= 1.4, < 3)
-      rack-protection (>= 1.5.3, <= 4.0.0)
-      sanitize (< 7)
     fugit (1.7.2)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -192,7 +172,6 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
-    multipart-post (2.3.0)
     net-imap (0.3.1)
       net-protocol
     net-ldap (0.17.1)
@@ -220,8 +199,6 @@ GEM
     raabro (1.4.0)
     racc (1.6.0)
     rack (2.2.4)
-    rack-protection (3.0.6)
-      rack
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.4)
@@ -306,9 +283,6 @@ GEM
     ruby2_keywords (0.0.5)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
     sentry-rails (5.8.0)
       railties (>= 5.0)
       sentry-ruby (~> 5.8.0)
@@ -396,14 +370,10 @@ DEPENDENCIES
   database_cleaner
   devise (~> 4.9.0)
   devise_ldap_authenticatable
-  discourse_api
   dotenv-rails
   factory_bot_rails
   faker
   faraday
-  flipper
-  flipper-active_record
-  flipper-ui
   importmap-rails
   jbuilder (~> 2.7)
   letter_opener

README.md

@@ -114,10 +114,6 @@ command:
 * [Sidekiq](https://github.com/mperham/sidekiq/wiki/)
 * [ActiveJob](https://github.com/mperham/sidekiq/wiki/Active-Job)
 
-### Feature Flags
-
-* [Flipper](https://www.flippercloud.io/docs/get-started/self-hosted)
-
 ## License
 
 [GNU Affero General Public License v3.0](https://choosealicense.com/licenses/agpl-3.0/)

app/assets/stylesheets/components/buttons.css

@@ -32,4 +32,8 @@
     @apply bg-red-600 hover:bg-red-700 text-white
            focus:ring-red-500 focus:ring-opacity-75;
   }
+
+  input[type=text]:disabled {
+    @apply text-gray-700;
+  }
 }

app/assets/stylesheets/components/forms.css

@@ -6,13 +6,12 @@
            focus:ring-blue-600 focus:ring-opacity-75;
   }
 
-  input[type=text]:disabled,
-  input[type=email]:disabled {
-    @apply text-gray-700;
+  .field_with_errors {
+    @apply inline-block;
   }
 
-  input.field_with_errors {
-    @apply border-b-red-600;
+  .field_with_errors input {
+    @apply w-full bg-red-100;
   }
 
   .error-msg {

app/controllers/account_controller.rb

@@ -1,5 +1,5 @@
 class AccountController < ApplicationController
-  before_action :authenticate_user!
+  before_action :require_user_signed_in
 
   def index
     @current_section = :account

app/controllers/contributions/donations_controller.rb

@@ -1,5 +1,5 @@
 class Contributions::DonationsController < ApplicationController
-  before_action :authenticate_user!
+  before_action :require_user_signed_in
 
   # GET /donations
   # GET /donations.json

app/controllers/contributions/projects_controller.rb

@@ -1,5 +1,5 @@
 class Contributions::ProjectsController < ApplicationController
-  before_action :authenticate_user!
+  before_action :require_user_signed_in
 
   # GET /contributions
   def index

app/controllers/dashboard_controller.rb

@@ -1,7 +1,7 @@
 class DashboardController < ApplicationController
-  before_action :authenticate_user!
+  before_action :require_user_signed_in
 
   def index
-    @current_section = :services
+    @current_section = :dashboard
   end
 end

app/controllers/discourse/sso_controller.rb

@@ -1,17 +0,0 @@
-class Discourse::SsoController < ApplicationController
-  before_action :authenticate_user!
-
-  def connect
-    secret = Setting.discourse_connect_secret
-    sso = DiscourseApi::SingleSignOn.parse(request.query_string, secret)
-    sso.external_id = current_user.id
-    sso.email = current_user.email
-    sso.username = current_user.cn
-    sso.name = current_user.display_name
-    sso.admin = current_user.is_admin?
-    sso.sso_secret = secret
-
-    redirect_to sso.to_url("#{Setting.discourse_public_url}/session/sso_login"),
-                allow_other_host: true
-  end
-end

app/controllers/invitations_controller.rb

@@ -1,5 +1,5 @@
 class InvitationsController < ApplicationController
-  before_action :authenticate_user!, except: ["show"]
+  before_action :require_user_signed_in, except: ["show"]
   before_action :require_user_signed_out, only: ["show"]
 
   # GET /invitations

app/controllers/rs/oauth_controller.rb

@@ -0,0 +1,130 @@
+class Rs::OauthController < ApplicationController
+  before_action :require_user_signed_in
+
+  def new
+    username, org  = params[:useraddress].split("@")
+    @user          = User.where(cn: username.downcase, ou: org).first
+    @scopes        = parse_scopes params[:scope]
+    @redirect_uri  = params[:redirect_uri]
+    @client_id     = params[:client_id]
+    @state         = params[:state]
+    @root_access_requested = (@scopes & [":r",":rw"]).any?
+
+    @denial_url = url_with_state("#{@redirect_uri}#error=access_denied", @state)
+
+    @expire_at_dates = [["Never", nil],
+                        ["In 1 month", 1.month.from_now],
+                        ["In 1 day", 1.day.from_now]]
+
+    http_status :bad_request and return unless @redirect_uri.present?
+
+    unless current_user == @user
+      sign_out :user
+
+      redirect_to new_rs_oauth_url(@user.address,
+                                   scope: params[:scope],
+                                   redirect_uri: params[:redirect_uri],
+                                   client_id: params[:client_id],
+                                   state: params[:state])
+      return
+    end
+
+    unless @client_id.present?
+      redirect_to url_with_state("#{@redirect_uri}#error=invalid_request", @state) and return
+    end
+
+    if @scopes.empty?
+      redirect_to url_with_state("#{@redirect_uri}#error=invalid_scope", @state) and return
+    end
+
+    unless hostname_of(@client_id) == hostname_of(@redirect_uri)
+      redirect_to url_with_state("#{@redirect_uri}#error=invalid_client", @state) and return
+    end
+
+    @client_id.gsub!(/http(s)?:\/\//, "")
+
+    # TODO
+    # if auth = current_user.remote_storage_authorizations.valid.where(permissions: @scopes, client_id: @client_id).first
+    #   redirect_to url_with_state("#{@redirect_uri}#access_token=#{auth.token}", @state), allow_other_host: true
+    # end
+  end
+
+  def create
+    unless current_user.id.to_s == params[:user_id]
+      Rails.logger.info("NO MATCH: #{params[:user_id]}, #{current_user.id}")
+      http_status :forbidden and return
+    end
+
+    permissions  = parse_scopes params[:scope]
+    redirect_uri = params[:redirect_uri].presence
+    client_id    = params[:client_id].presence
+    state        = params[:state].presence
+    expire_at    = params[:expire_at].presence
+
+    http_status :bad_request and return unless redirect_uri.present?
+
+    if permissions.empty?
+      redirect_to url_with_state("#{redirect_uri}#error=invalid_scope", state), allow_other_host: true and return
+    end
+
+    unless client_id.present?
+      redirect_to url_with_state("#{redirect_uri}#error=invalid_request", state), allow_other_host: true and return
+    end
+
+    unless hostname_of(client_id) == hostname_of(redirect_uri)
+      redirect_to url_with_state("#{redirect_uri}#error=invalid_client", state), allow_other_host: true and return
+    end
+
+    client_id.gsub!(/http(s)?:\/\//, "")
+
+    auth = current_user.remote_storage_authorizations.create!(
+      permissions: permissions,
+      client_id: client_id,
+      redirect_uri: redirect_uri,
+      app_name: client_id, #TODO use user-defined name
+      expire_at: expire_at
+    )
+
+    redirect_to url_with_state("#{redirect_uri}#access_token=#{auth.token}", state), allow_other_host: true
+  end
+
+  # GET /rs/oauth/token/:id/launch_app
+  def launch_app
+    auth = current_user.remote_storage_authorizations.find(params[:id])
+
+    redirect_to app_auth_url(auth)
+  end
+
+  private
+
+  def app_auth_url(auth)
+    url = "#{auth.url}#remotestorage=#{current_user.address}"
+    url += "&access_token=#{auth.token}"
+    url
+  end
+
+  def hostname_of(uri)
+    uri.gsub(/http(s)?:\/\//, "").split(":")[0].split("/")[0]
+  end
+
+  def parse_scopes(scope_string)
+    return [] if scope_string.blank?
+
+    scopes = scope_string.
+      gsub(/\[|\]/, "").
+      gsub(/\,/, " ").
+      gsub(/\/:/, ":").
+      split(/\s/).map(&:strip).
+      reject(&:empty?)
+
+    scopes = [":r"] if scopes.include?("*:r")
+    scopes = [":rw"] if scopes.include?("*:rw")
+
+    scopes
+  end
+
+  def url_with_state(url, state)
+    state ? "#{url}&state=#{CGI.escape(state)}" : url
+  end
+
+end

app/controllers/services/remotestorage_controller.rb

@@ -1,30 +0,0 @@
-class Services::RemotestorageController < ApplicationController
-  before_action :require_user_signed_in
-  before_action :require_service_enabled
-  before_action :require_feature_enabled
-  before_action :set_current_section
-
-  def dashboard
-    # unless current_user.services_enabled.include?(:remotestorage)
-    #   redirect_to service_remotestorage_info_path
-    # end
-  end
-
-  private
-
-    def require_feature_enabled
-      unless Flipper.enabled?(:remotestorage, current_user)
-        http_status :forbidden
-      end
-    end
-
-    def require_service_enabled
-      unless Setting.remotestorage_enabled?
-        http_status :not_found
-      end
-    end
-
-    def set_current_section
-      @current_section = :services
-    end
-end

app/controllers/settings_controller.rb

@@ -1,49 +1,24 @@
 class SettingsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_main_nav_section
-  before_action :set_settings_section, only: [:show, :update, :update_email]
-  before_action :set_user, only: [:show, :update, :update_email]
+  before_action :set_settings_section, only: ['show', 'update']
 
   def index
     redirect_to setting_path(:profile)
   end
 
   def show
+    @user = current_user
   end
 
   def update
-    @user.preferences.merge!(user_params[:preferences] || {})
-    @user.display_name = user_params[:display_name]
+    @user = current_user
+    @user.preferences.merge! user_params[:preferences]
+    @user.save!
 
-    if @user.save
-      if @user.display_name && (@user.display_name != @user.ldap_entry[:display_name])
-        LdapManager::UpdateDisplayName.call(@user.dn, user_params[:display_name])
-      end
-
-      redirect_to setting_path(@settings_section), flash: {
-        success: 'Settings saved.'
-      }
-    else
-      @validation_errors = @user.errors
-      render :show, status: :unprocessable_entity
-    end
-  end
-
-  def update_email
-    if @user.valid_ldap_authentication?(email_params[:current_password])
-      if @user.update email: email_params[:email]
-        redirect_to setting_path(:account), flash: {
-          notice: 'Please confirm your new address using the confirmation link we just sent you.'
-        }
-      else
-        @validation_errors = @user.errors
-        render :show, status: :unprocessable_entity
-      end
-    else
-      redirect_to setting_path(:account), flash: {
-        error: 'Password did not match your current password. Try again.'
-      }
-    end
+    redirect_to setting_path(@settings_section), flash: {
+      success: 'Settings saved.'
+    }
   end
 
   def reset_password
@@ -55,31 +30,23 @@ class SettingsController < ApplicationController
 
   private
 
-    def set_main_nav_section
-      @current_section = :settings
-    end
+  def set_main_nav_section
+    @current_section = :settings
+  end
 
-    def set_settings_section
-      @settings_section = params[:section]
-      allowed_sections = [:profile, :account, :lightning, :xmpp]
+  def set_settings_section
+    @settings_section = params[:section]
+    allowed_sections = [:profile, :account, :lightning, :xmpp]
 
-      unless allowed_sections.include?(@settings_section.to_sym)
-        redirect_to setting_path(:profile)
-      end
+    unless allowed_sections.include?(@settings_section.to_sym)
+      redirect_to setting_path(:profile)
     end
+  end
 
-    def set_user
-      @user = current_user
-    end
-
-    def user_params
-      params.require(:user).permit(:display_name, preferences: [
-        :lightning_notify_sats_received,
-        :xmpp_exchange_contacts_with_invitees
-      ])
-    end
-
-    def email_params
-      params.require(:user).permit(:email, :current_password)
-    end
+  def user_params
+    params.require(:user).permit(preferences: [
+      :lightning_notify_sats_received,
+      :xmpp_exchange_contacts_with_invitees
+    ])
+  end
 end

app/controllers/wallet_controller.rb

@@ -1,7 +1,7 @@
 require "rqrcode"
 
-class Services::LightningController < ApplicationController
-  before_action :authenticate_user!
+class WalletController < ApplicationController
+  before_action :require_user_signed_in
   before_action :authenticate_with_lndhub
   before_action :set_current_section
   before_action :fetch_balance
@@ -42,7 +42,7 @@ class Services::LightningController < ApplicationController
   end
 
   def set_current_section
-    @current_section = :services
+    @current_section = :wallet
   end
 
   def fetch_balance
@@ -78,7 +78,6 @@ class Services::LightningController < ApplicationController
         tx["received"] = true
       else
         tx["amount_sats"] = tx["value"] || tx["amt"]
-        tx["fee"] = tx["type"] == "paid_invoice" ? tx["fee"] : nil
         tx["datetime"] = Time.at(tx["timestamp"].to_i)
         tx["title"] = tx["type"] == "paid_invoice" ? "Sent" : "Received"
         tx["description"] = tx["memo"] || tx["description"]

app/helpers/oauth_helper.rb

@@ -0,0 +1,11 @@
+module OauthHelper
+
+  def scope_name(scope)
+    scope.gsub(/(\:.+)/, '')
+  end
+
+  def scope_permissions(scope)
+    scope.match(/\:r$/) ? "r" : "rw"
+  end
+
+end

app/javascript/controllers/settings/account/email_controller.js

@@ -1,27 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = [ "emailField", "editEmailButton" ]
-  static values = { validationFailed: Boolean }
-
-  connect () {
-    if (this.validationFailedValue) return;
-
-    this.emailFieldTarget.disabled = true;
-    this.element.querySelectorAll(".initial-hidden").forEach(el => {
-      el.classList.add("hidden");
-    })
-    this.element.querySelectorAll(".initial-visible").forEach(el => {
-      el.classList.remove("hidden");
-    })
-  }
-
-  editEmail () {
-    this.emailFieldTarget.disabled = false;
-    this.emailFieldTarget.select();
-    this.editEmailButtonTarget.classList.add("hidden");
-    this.element.querySelectorAll(".initial-hidden").forEach(el => {
-      el.classList.remove("hidden");
-    })
-  }
-}

app/jobs/xmpp_exchange_contacts_job.rb

@@ -1,22 +1,18 @@
 class XmppExchangeContactsJob < ApplicationJob
   queue_as :default
 
-  def perform(inviter, invitee)
-    return unless inviter.services_enabled.include?("xmpp") &&
-                  invitee.services_enabled.include?("xmpp") &&
-                  inviter.preferences[:xmpp_exchange_contacts_with_invitees]
-
+  def perform(inviter, username, domain)
     ejabberd = EjabberdApiClient.new
 
     ejabberd.add_rosteritem({
-      "localuser": invitee.cn, "localhost": invitee.ou,
+      "localuser": username, "localhost": domain,
       "user": inviter.cn, "host": inviter.ou,
       "nick": inviter.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
     })
     ejabberd.add_rosteritem({
       "localuser": inviter.cn, "localhost": inviter.ou,
-      "user": invitee.cn, "host": invitee.ou,
-      "nick": invitee.cn, "group": Setting.ejabberd_buddy_roster, "subs": "both"
+      "user": username, "host": domain,
+      "nick": username, "group": Setting.ejabberd_buddy_roster, "subs": "both"
     })
   end
 end

app/jobs/xmpp_set_default_bookmarks_job.rb

@@ -1,26 +0,0 @@
-class XmppSetDefaultBookmarksJob < ApplicationJob
-  queue_as :default
-
-  def perform(user)
-    return unless Setting.xmpp_default_rooms.any?
-    @user = user
-    ejabberd = EjabberdApiClient.new
-    ejabberd.private_set user, storage_content
-  end
-
-  def storage_content
-    bookmarks = ""
-    Setting.xmpp_default_rooms.each do |r|
-      bookmarks << conference_element(
-        jid: r[/<(.+)>/, 1], name: r[/^(.+)\s/, 1], nick: @user.cn,
-        autojoin: Setting.xmpp_autojoin_default_rooms
-      )
-    end
-
-    "<storage xmlns='storage:bookmarks'>#{bookmarks}</storage>"
-  end
-
-  def conference_element(jid:, name:, autojoin: false, nick:)
-    "<conference jid='#{jid}' name='#{name}' autojoin='#{autojoin.to_s}'><nick>#{nick}</nick></conference>"
-  end
-end

app/mailers/devise/mailer.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(ActionMailer)
-  class Devise::Mailer < Devise.parent_mailer.constantize
-    include Devise::Mailers::Helpers
-
-    def confirmation_instructions(record, token, opts = {})
-      @token = token
-      if record.pending_reconfirmation?
-        devise_mail(record, :reconfirmation_instructions, opts)
-      else
-        devise_mail(record, :confirmation_instructions, opts)
-      end
-    end
-
-    def reset_password_instructions(record, token, opts = {})
-      @token = token
-      devise_mail(record, :reset_password_instructions, opts)
-    end
-
-    def unlock_instructions(record, token, opts = {})
-      @token = token
-      devise_mail(record, :unlock_instructions, opts)
-    end
-
-    def email_changed(record, opts = {})
-      devise_mail(record, :email_changed, opts)
-    end
-
-    def password_change(record, opts = {})
-      devise_mail(record, :password_change, opts)
-    end
-  end
-end

app/models/remote_storage_authorization.rb

@@ -0,0 +1,32 @@
+class RemoteStorageAuthorization < ApplicationRecord
+  belongs_to :user
+
+  serialize :permissions
+
+  validates_presence_of :permissions
+  validates_presence_of :client_id
+
+  scope :valid, -> { where(expire_at: nil).or(where(expire_at: (DateTime.now)..)) }
+  scope :expired, -> { where(expire_at: ..(DateTime.now)) }
+
+  after_initialize do |a|
+    a.permisisons = [] if a.permissions == nil
+  end
+
+  before_create  :generate_token
+
+  def url
+    if self.redirect_uri
+      uri = URI.parse self.redirect_uri
+      "#{uri.scheme}://#{client_id}"
+    else
+      "http://#{client_id}"
+    end
+  end
+
+  private
+
+  def generate_token(length=16)
+    self.token = SecureRandom.hex(length) if self.token.blank?
+  end
+end

app/models/setting.rb

@@ -2,9 +2,6 @@
 class Setting < RailsSettings::Base
   cache_prefix { "v1" }
 
-  field :accounts_domain, type: :string,
-    default: ENV["AKKOUNTS_DOMAIN"].presence
-
   #
   # Internal services
   #
@@ -20,13 +17,6 @@ class Setting < RailsSettings::Base
     account accounts donations mail webmaster support
   ]
 
-  #
-  # XMPP
-  #
-
-  field :xmpp_default_rooms, type: :array, default: []
-  field :xmpp_autojoin_default_rooms, type: :boolean, default: false
-
   #
   # Sentry
   #
@@ -44,9 +34,6 @@ class Setting < RailsSettings::Base
   field :discourse_enabled, type: :boolean,
     default: (ENV["DISCOURSE_PUBLIC_URL"].present?.to_s || false)
 
-  field :discourse_connect_secret, type: :string, readonly: true,
-    default: ENV["DISCOURSE_CONNECT_SECRET"].presence
-
   #
   # ejabberd
   #

app/models/user.rb

@@ -1,8 +1,6 @@
 class User < ApplicationRecord
   include EmailValidatable
 
-  attr_accessor :display_name
-
   serialize :preferences, UserPreferences
 
   # Relations
@@ -18,8 +16,10 @@ class User < ApplicationRecord
 
   has_many :accounts, through: :lndhub_user
 
+  has_many :remote_storage_authorizations
+
   validates_uniqueness_of :cn
-  validates_length_of :cn, minimum: 3
+  validates_length_of :cn, :minimum => 3
   validates_format_of :cn, with: /\A([a-z0-9\-])*\z/,
                            if: Proc.new{ |u| u.cn.present? },
                            message: "is invalid. Please use only letters, numbers and -"
@@ -33,9 +33,6 @@ class User < ApplicationRecord
   validates_uniqueness_of :email
   validates :email, email: true
 
-  validates_length_of :display_name, minimum: 3, maximum: 35, allow_blank: true,
-                                     if: -> { defined?(@display_name) }
-
   scope :confirmed, -> { where.not(confirmed_at: nil) }
   scope :pending,   -> { where(confirmed_at: nil) }
 
@@ -63,18 +60,16 @@ class User < ApplicationRecord
   end
 
   def devise_after_confirmation
-    if ldap_entry[:mail] != self.email
-      # E-Mail update confirmed
-      LdapManager::UpdateEmail.call(self.dn, self.email)
-    else
-      # E-Mail from signup confirmed (i.e. account activation)
-      enable_service %w[ discourse gitea mediawiki xmpp ]
+    enable_service %w[ discourse gitea mediawiki xmpp ]
 
-      #TODO enable in development when we have easy setup of ejabberd etc.
-      return if Rails.env.development? || !Setting.ejabberd_enabled?
+    #TODO enable in development when we have easy setup of ejabberd etc.
+    return if Rails.env.development?
 
-      XmppExchangeContactsJob.perform_later(inviter, self) if inviter.present?
-      XmppSetDefaultBookmarksJob.perform_later(self)
+    if inviter.present?
+      if Setting.ejabberd_enabled? &&
+          inviter.preferences[:xmpp_exchange_contacts_with_invitees]
+        exchange_xmpp_contact_with_inviter
+      end
     end
   end
 
@@ -120,13 +115,8 @@ class User < ApplicationRecord
     @dn = Devise::LDAP::Adapter.get_dn(self.cn)
   end
 
-  def ldap_entry(reload: false)
-    return @ldap_entry if defined?(@ldap_entry) && !reload
-    @ldap_entry = ldap.fetch_users(uid: self.cn, ou: self.ou).first
-  end
-
-  def display_name
-    @display_name ||= ldap_entry[:display_name]
+  def ldap_entry
+    ldap.fetch_users(uid: self.cn, ou: self.ou).first
   end
 
   def services_enabled
@@ -151,6 +141,12 @@ class User < ApplicationRecord
     ldap.delete_attribute(dn,:service)
   end
 
+  def exchange_xmpp_contact_with_inviter
+    return unless inviter.services_enabled.include?("xmpp") &&
+                  services_enabled.include?("xmpp")
+    XmppExchangeContactsJob.perform_later(inviter, self.cn, self.ou)
+  end
+
   private
 
     def ldap

app/services/ejabberd_api_client.rb

@@ -10,7 +10,7 @@ class EjabberdApiClient
     if res.status != 200
       Rails.logger.error "[ejabberd] API request failed:"
       Rails.logger.error res.body
-      #TODO Send custom event to Sentry
+      #TODO add some kind of exception tracking/notifications
     end
   end
 
@@ -21,9 +21,4 @@ class EjabberdApiClient
   def send_message(payload)
     post "send_message", payload
   end
-
-  def private_set(user, content)
-    payload = { user: user.cn, host: user.ou, element: content }
-    post "private_set", payload
-  end
 end

app/services/ldap_manager/update_display_name.rb

@@ -1,12 +0,0 @@
-module LdapManager
-  class UpdateDisplayName < LdapManagerService
-    def initialize(dn, display_name)
-      @dn = dn
-      @display_name = display_name
-    end
-
-    def call
-      replace_attribute @dn, :displayName, @display_name
-    end
-  end
-end

app/services/ldap_manager/update_email.rb

@@ -1,12 +0,0 @@
-module LdapManager
-  class UpdateEmail < LdapManagerService
-    def initialize(dn, address)
-      @dn = dn
-      @address = address
-    end
-
-    def call
-      replace_attribute @dn, :mail, @address
-    end
-  end
-end

app/services/ldap_manager_service.rb

@@ -1,2 +0,0 @@
-class LdapManagerService < LdapService
-end

app/services/ldap_service.rb

@@ -50,7 +50,7 @@ class LdapService < ApplicationService
       treebase = ldap_config["base"]
     end
 
-    attributes = %w{dn cn uid mail displayName admin service}
+    attributes = %w{dn cn uid mail admin service}
     filter     = Net::LDAP::Filter.eq("uid", args[:uid] || "*")
 
     entries = ldap_client.search(base: treebase, filter: filter, attributes: attributes)
@@ -59,7 +59,6 @@ class LdapService < ApplicationService
       {
         uid: e.uid.first,
         mail: e.try(:mail) ? e.mail.first : nil,
-        display_name: e.try(:displayName) ? e.displayName.first : nil,
         admin: e.try(:admin) ? 'admin' : nil,
         service: e.try(:service)
       }

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

@@ -7,46 +7,11 @@
     title: "Enable Discourse integration",
     description: "Discourse configuration present and features enabled"
   ) %>
-<% if Setting.discourse_enabled? %>
-  <%= render FormElements::FieldsetComponent.new(title: "Public URL") do %>
-    <%= f.text_field :discourse_public_url,
-      value: Setting.discourse_public_url,
-      class: "w-full", disabled: true %>
+  <% if Setting.discourse_enabled? %>
+    <%= render FormElements::FieldsetComponent.new(title: "Public URL") do %>
+      <%= f.text_field :discourse_public_url,
+        value: Setting.discourse_public_url,
+        class: "w-full", disabled: true %>
+    <% end %>
   <% end %>
-  <%= render FormElements::FieldsetComponent.new(title: "Connect secret") do %>
-    <%= f.password_field :discourse_connect_secret,
-      value: Setting.discourse_connect_secret,
-      class: "w-full", disabled: true %>
-  <% end %>
-<% end %>
 </ul>
-<% if Setting.discourse_enabled? %>
-  <% content_for :documentation do %>
-    <h3 class="mt-8">How to configure Discourse</h3>
-    <ol class="list-decimal list-inside">
-    <li class="mb-6">
-      Set the <strong>Discourse Connect URL</strong> to the following URL:
-    </li>
-    <li data-controller="clipboard" class="mb-6 flex gap-1">
-      <input type="text" class="grow" disabled="disabled"
-             value="https://<%= Setting.accounts_domain %>/discourse/connect"
-             data-clipboard-target="source" />
-      <button class="btn-md btn-icon btn-blue shrink-0"
-              data-clipboard-target="trigger" data-action="clipboard#copy"
-              title="Copy to clipboard">
-        <span class="content-initial">
-          <%= render partial: "icons/copy", locals: { custom_class: "text-white h-4 w-4 inline" } %>
-        </span>
-        <span class="content-active hidden">
-          <%= render partial: "icons/check", locals: { custom_class: "text-white h-4 w-4 inline" } %>
-        </span>
-      </button>
-    </li>
-    <li class="mb-6">
-      Set the <strong>Discourse Connect Secret</strong> to the value above.
-    </li>
-    <li>
-      Enable Discourse Connect.
-    </li>
-  <% end %>
-<% end %>

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

@@ -7,43 +7,24 @@
     title: "Enable ejabberd integration",
     description: "ejabberd configuration present and features enabled"
   ) %>
-<% if Setting.ejabberd_enabled? %>
-  <%= render FormElements::FieldsetComponent.new(title: "API URL") do %>
-    <%= f.text_field :ejabberd_api_url,
-      value: Setting.ejabberd_api_url,
-      class: "w-full", disabled: true %>
-  <% end %>
-  <%= render FormElements::FieldsetComponent.new(title: "Admin URL") do %>
-    <%= f.text_field :ejabberd_admin_url,
-      value: Setting.ejabberd_admin_url,
-      class: "w-full", disabled: true %>
+  <% if Setting.ejabberd_enabled? %>
+    <%= render FormElements::FieldsetComponent.new(title: "API URL") do %>
+      <%= f.text_field :ejabberd_api_url,
+        value: Setting.ejabberd_api_url,
+        class: "w-full", disabled: true %>
+    <% end %>
+    <%= render FormElements::FieldsetComponent.new(title: "Admin URL") do %>
+      <%= f.text_field :ejabberd_admin_url,
+        value: Setting.ejabberd_admin_url,
+        class: "w-full", disabled: true %>
+    <% end %>
+    <%= render FormElements::FieldsetComponent.new(
+          title: "Contact roster name",
+          description: "Used when exchanging contacts after signup from invitation"
+        ) do %>
+      <%= f.text_field :ejabberd_buddy_roster,
+        value: Setting.ejabberd_buddy_roster,
+        class: "w-full" %>
+    <% end %>
   <% end %>
 </ul>
-<h3 class="mt-10">User default settings</h3>
-<ul role="list">
-  <%= render FormElements::FieldsetComponent.new(
-        title: "Default rooms",
-        description: "Add these default rooms to new users' bookmarks"
-      ) do %>
-    <%= f.text_area :xmpp_default_rooms,
-          value: Setting.xmpp_default_rooms.join("\n"),
-          placeholder: "Welcome <welcome@kosmos.chat>\nKosmos <kosmos@kosmos.chat>",
-          class: "h-24 w-full" %>
-  <% end %>
-  <%= render FormElements::FieldsetToggleComponent.new(
-    form: f,
-    attribute: :xmpp_autojoin_default_rooms,
-    enabled: Setting.xmpp_autojoin_default_rooms?,
-    title: "Auto-join default rooms",
-    description: "Automatically join above default rooms in chat clients"
-  ) %>
-  <%= render FormElements::FieldsetComponent.new(
-        title: "Contact roster name",
-        description: "Used when exchanging contacts after signup from invitation"
-      ) do %>
-    <%= f.text_field :ejabberd_buddy_roster,
-      value: Setting.ejabberd_buddy_roster,
-      class: "w-full" %>
-  <% end %>
-<% end %>
-</ul>

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

@@ -20,10 +20,4 @@
       </p>
     </section>
   <% end %>
-
-  <% if content_for?(:documentation) %>
-  <section>
-    <%= yield :documentation %>
-  </section>
-  <% end %>
 <% end %>

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

@@ -6,10 +6,6 @@
       <h3>Account</h3>
       <table class="divided">
         <tbody>
-          <tr>
-            <th>ID</th>
-            <td><%= @user.id %></td>
-          </tr>
           <tr>
             <th>Created at</th>
             <td><%= @user.created_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>

app/views/dashboard/index.html.erb

@@ -43,9 +43,9 @@
       <div class="border border-gray-300 rounded-md hover:border-gray-400
                   bg-cover bg-center sm:bg-[center_top_-140px] bg-no-repeat
                   bg-[url(/img/logos/icon_lightning.svg)]">
-        <%= link_to services_lightning_index_path,
+        <%= link_to wallet_path,
               class: "block h-full px-6 py-6 rounded-md" do %>
-          <h3 class="mb-3.5">Lightning Network</h3>
+          <h3 class="mb-3.5">Wallet</h3>
           <p class="text-gray-600">
             Send and receive sats over the Bitcoin Lightning Network
           </p>
@@ -73,17 +73,6 @@
           </p>
         <% end %>
       </div>
-      <% if Setting.remotestorage_enabled? && Flipper.enabled?(:remotestorage, current_user) %>
-        <div class="border border-gray-300 rounded-md hover:border-gray-400">
-          <%= link_to services_storage_path,
-                class: "block h-full px-6 py-6 rounded-md" do %>
-            <h3 class="mb-3.5">Storage</h3>
-            <p class="text-gray-600">
-              Sync your data between apps and devices
-            </p>
-          <% end %>
-        </div>
-      <% end %>
       <!-- <div class="border border&#45;gray&#45;300 rounded&#45;md hover:border&#45;gray&#45;400 -->
       <!--             bg&#45;[length:80%] bg&#45;[right_top_&#45;30px] bg&#45;no&#45;repeat -->
       <!--             bg&#45;[url(/img/logos/icon_mastodon.svg)]"> -->

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +1,5 @@
-<p>Welcome <%= @resource.cn %>!</p>
+<p>Welcome <%= @email %>!</p>
 
-<p>Please confirm your email address through the link below:</p>
+<p>You can confirm your account email through the link below:</p>
 
 <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

app/views/devise/mailer/email_changed.html.erb

@@ -1,4 +1,4 @@
-<p>Hello <%= @resource.cn %>!</p>
+<p>Hello <%= @email %>!</p>
 
 <% if @resource.try(:unconfirmed_email?) %>
   <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>

app/views/devise/mailer/password_change.html.erb

@@ -1,3 +1,3 @@
-<p>Hello <%= @resource.cn %>!</p>
+<p>Hello <%= @resource.email %>!</p>
 
 <p>We're contacting you to notify you that your password has been changed.</p>

app/views/devise/mailer/reconfirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-<p>Hello <%= @resource.cn %>,</p>
-
-<p>Please confirm your new email address through the link below:</p>
-
-<p><%= link_to 'Confirm my address', confirmation_url(@resource, confirmation_token: @token) %></p>

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,4 +1,4 @@
-<p>Hello <%= @resource.cn %>!</p>
+<p>Hello <%= @resource.email %>!</p>
 
 <p>Someone has requested a link to change your password. You can do this through the link below.</p>
 

app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,4 +1,4 @@
-<p>Hello <%= @resource.cn %>!</p>
+<p>Hello <%= @resource.email %>!</p>
 
 <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 

app/views/devise/sessions/new.html.erb

@@ -1,13 +1,7 @@
-<%
-  # TODO remove when https://github.com/hotwired/turbo/issues/203 is fixed
-  enable_turbo = !session[:user_return_to].match?('/discourse/connect')
-%>
-
 <%= render HeaderCompactComponent.new(title: "Log in") %>
 
 <%= render MainCompactComponent.new do %>
-  <%= form_for(resource, as: resource_name, url: session_path(resource_name),
-                         data: { turbo: enable_turbo.to_s }) do |f| %>
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
     <%= render "devise/shared/error_messages", resource: resource %>
     <div class="mb-6">
       <%= f.label :cn, 'User', class: 'block mb-2 font-bold' %>

app/views/icons/_asterisk.html.erb

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512" fill="currentColor" stroke="currentColor" stroke-width="2" class="<%= custom_class %>"><path d="M475.31 364.144L288 256l187.31-108.144c5.74-3.314 7.706-10.653 4.392-16.392l-4-6.928c-3.314-5.74-10.653-7.706-16.392-4.392L272 228.287V12c0-6.627-5.373-12-12-12h-8c-6.627 0-12 5.373-12 12v216.287L52.69 120.144c-5.74-3.314-13.079-1.347-16.392 4.392l-4 6.928c-3.314 5.74-1.347 13.079 4.392 16.392L224 256 36.69 364.144c-5.74 3.314-7.706 10.653-4.392 16.392l4 6.928c3.314 5.74 10.653 7.706 16.392 4.392L240 283.713V500c0 6.627 5.373 12 12 12h8c6.627 0 12-5.373 12-12V283.713l187.31 108.143c5.74 3.314 13.079 1.347 16.392-4.392l4-6.928c3.314-5.74 1.347-13.079-4.392-16.392z"/></svg>

app/views/icons/_edit-2.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-2 <%= custom_class %>"><path d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-2"><path d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"></path></svg>

app/views/icons/_edit-3.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-3 <%= custom_class %>"><path d="M12 20h9"></path><path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-3"><path d="M12 20h9"></path><path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"></path></svg>

app/views/icons/_edit.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit <%= custom_class %>"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>

app/views/icons/_folder.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder <%= custom_class %>"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path></svg>

app/views/notification_mailer/lightning_sats_received.text.erb

@@ -1,3 +1,3 @@
 You just received <%= number_with_delimiter @amount_sats %> sats in your Lightning account (<%= @user.address %>). Check your wallet app, or open the account page for details:
 
-<%= transactions_services_lightning_index_url %>
+<%= wallet_transactions_url %>

app/views/rs/oauth/new.html.erb

@@ -0,0 +1,60 @@
+<%= render HeaderComponent.new(title: "App Authorization") %>
+
+<%= render MainSimpleComponent.new do %>
+  <section class="px-16 pb-8 mt-8">
+    <p class="text-lg mb-8">
+      The app
+      <%= link_to @client_id, "https://#{@client_id}", class: "ks-text-link" %>
+      is asking for access to these folders:
+    </p>
+
+    <p class="text-xl mb-8">
+      <% if @root_access_requested %>
+        <span class="text-red-700">
+          <span class="text-red-700">
+            <%= render partial: "icons/asterisk", locals: { custom_class: "inline-block align-middle mb-1" } %>
+            All files and directories
+          </span>
+          <% if (@scopes & [":r"]).any? %>
+            <span class="text-sm text-gray-500">(read only)</span>
+          <% end %>
+        </span>
+      <% else %>
+        <% @scopes.each do |scope| %>
+          <span class="text-gray-500">
+            <span>
+              <%= render partial: "icons/folder", locals: { custom_class: "inline-block align-middle mb-2" } %>
+              <%= scope_name(scope) %>
+            </span>
+            <% if scope_permissions(scope) == "r" %>
+              <span class="text-sm text-gray-500">(read only)</span>
+            <% end %>
+          </span>
+        <% end %>
+      <% end %>
+    </p>
+
+    <%= form_with(url: rs_oauth_path, method: :post, data: { turbo: false }) do |f| %>
+      <%= f.hidden_field :redirect_uri, value: @redirect_uri %>
+      <%= f.hidden_field :scope, value: @scopes.join(" ") %>
+      <%= f.hidden_field :user_id, value: @user.id %>
+      <%= f.hidden_field :client_id, value: @client_id %>
+      <%= f.hidden_field :state, value: @state %>
+      <p>
+        <%= f.label :expire_at, "Expire:" %>
+        <%= f.select :expire_at, options_for_select(@expire_at_dates) %>
+      </p>
+      <p class="text-sm text-gray-500 my-10">
+        You can revoke access for this app at any time on your storage dashboard.
+      </p>
+      <div>
+        <%= f.submit class: "btn-md btn-blue w-full sm:w-auto", data: { disable_with: "Saving..." } do %>
+          Allow
+        <% end %>
+        <%= link_to @denial_url, class: "btn-md btn-red w-full sm:w-auto" do %>
+          Deny
+        <% end %>
+      </div>
+    <% end %>
+  </section>
+<% end %>

app/views/services/remotestorage/dashboard.html.erb

@@ -1,7 +0,0 @@
-<%= render HeaderComponent.new(title: "Storage") %>
-
-<%= render MainSimpleComponent.new do %>
-  <section>
-    <h3>Feature enabled</h3>
-  </section>
-<% end %>

app/views/settings/_account.html.erb

@@ -1,44 +1,13 @@
-<%= tag.section data: {
-      controller: "settings--account--email",
-      "settings--account--email-validation-failed-value": @validation_errors.present?
-    } do %>
+<section>
   <h3>E-Mail</h3>
-  <%= form_for(@user, url: update_email_settings_path, method: "post") do |f| %>
-    <%= hidden_field_tag :section, "account" %>
-    <p class="mb-2">
-      <%= f.label :email, 'Address', class: 'font-bold' %>
-    </p>
-    <p class="mb-2 flex gap-1 sm:w-3/5">
-      <%= f.email_field :email, class: "grow", data: {
-            'settings--account--email-target': 'emailField'
-          }, required: true %>
-      <button type="button" id="edit-email"
-              class="btn-md btn-icon btn-blue shrink-0 hidden initial-visible"
-              data-settings--account--email-target="editEmailButton"
-              data-action="settings--account--email#editEmail"
-              title="Edit email address">
-        <span class="">
-          <%= render partial: "icons/edit-3", locals: {
-                custom_class: "text-white h-4 w-4 inline" } %>
-        </span>
-      </button>
-    </p>
-    <% if @validation_errors.present? && @validation_errors[:email].present? %>
-      <p class="error-msg"><%= @validation_errors[:email].first %></p>
-    <% end %>
-    <div class="initial-hidden">
-      <p class="mt-4 mb-2">
-        <%= f.label :current_password, 'Current password', class: 'font-bold' %>
-      </p>
-      <p class="sm:w-3/5">
-        <%= f.password_field :current_password, class: "w-full", required: true %>
-      </p>
-      <p class="mt-6">
-        <%= f.submit "Update", class: "btn-md btn-blue w-full md:w-auto" %>
-      </p>
-    </div>
-  <% end %>
-<% end %>
+  <p class="mb-2">
+    <%= label :email, 'Address', class: 'font-bold' %>
+  </p>
+  <p class="flex gap-1 mb-2 sm:w-3/5">
+    <input type="text" id="email" class="grow"
+           value=<%= current_user.email %> disabled="disabled" />
+  </p>
+</section>
 <section>
   <h3>Password</h3>
   <p class="mb-8">Use the following button to request an email with a password reset link:</p>

app/views/settings/_profile.html.erb

@@ -21,15 +21,10 @@
   <p class="text-sm text-gray-500">
     Your user address for Chat and Lightning Network.
   </p>
-  <%= form_for(@user, url: setting_path(:profile), html: { :method => :put }) do |f| %>
-    <%= render FormElements::FieldsetComponent.new(tag: "div", title: "Display name") do %>
-      <%= f.text_field :display_name, class: "w-full sm:w-3/5 mb-2" %>
-      <% if @validation_errors.present? && @validation_errors[:display_name].present? %>
-        <p class="error-msg"><%= @validation_errors[:display_name].first %></p>
-      <% end %>
-    <% end %>
-    <p class="mt-8 pt-6 border-t border-gray-200 text-right">
-      <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
-    </p>
-  <% end %>
+
+  <%# <%= form_for(@user, as: "profile", url: settings_profile_path) do |f| %>
+  <%#   <p class="mt-8">
+  <%#     <%= f.submit "Save changes", class: 'btn-md btn-blue w-full sm:w-auto' %>
+  <%#   </p>
+  <%# <% end %>
 </section>

app/views/shared/_main_nav.html.erb

@@ -1,8 +1,10 @@
 <%= link_to "Services", root_path,
-      class: main_nav_class(@current_section, :services) %>
-<%= link_to "Invitations", invitations_path,
-      class: main_nav_class(@current_section, :invitations) %>
+      class: main_nav_class(@current_section, :dashboard) %>
 <%= link_to "Contributions", contributions_donations_path,
       class: main_nav_class(@current_section, :contributions) %>
+<%= link_to "Invitations", invitations_path,
+      class: main_nav_class(@current_section, :invitations) %>
+<%= link_to "Wallet", wallet_path,
+      class: main_nav_class(@current_section, :wallet) %>
 <%= link_to "Settings", settings_path,
       class: main_nav_class(@current_section, :settings) %>

app/views/shared/_sidenav_settings.html.erb

@@ -1,20 +1,20 @@
 <%= render SidenavLinkComponent.new(
   name: "Profile", path: setting_path(:profile), icon: "user",
-  active: @settings_section.to_s == "profile"
+  active: current_page?(setting_path(:profile))
 ) %>
 <%= render SidenavLinkComponent.new(
   name: "Account", path: setting_path(:account), icon: "key",
-  active: @settings_section.to_s == "account"
+  active: current_page?(setting_path(:account))
 ) %>
 <% if Setting.ejabberd_enabled %>
 <%= render SidenavLinkComponent.new(
   name: "Chat", path: setting_path(:xmpp), icon: "message-circle",
-  active: @settings_section.to_s == "xmpp"
+  active: current_page?(setting_path(:xmpp))
 ) %>
 <% end %>
 <% if Setting.lndhub_enabled %>
 <%= render SidenavLinkComponent.new(
-  name: "Lightning", path: setting_path(:lightning), icon: "zap",
-  active: @settings_section.to_s == "lightning"
+  name: "Wallet", path: setting_path(:lightning), icon: "zap",
+  active: current_page?(setting_path(:lightning))
 ) %>
 <% end %>

app/views/shared/_tabnav_lightning.html.erb

@@ -1,14 +0,0 @@
-<section>
-  <div class="border-b border-gray-200">
-    <nav class="-mb-px flex" aria-label="Tabs">
-      <%= render TabnavLinkComponent.new(
-        name: "Info", path: services_lightning_index_path,
-        active: current_page?(services_lightning_index_path)
-      ) %>
-      <%= render TabnavLinkComponent.new(
-        name: "Transactions", path: transactions_services_lightning_index_path,
-        active: current_page?(transactions_services_lightning_index_path)
-      ) %>
-    </nav>
-  </div>
-</section>

app/views/shared/_tabnav_wallet.html.erb

@@ -0,0 +1,14 @@
+<section>
+  <div class="border-b border-gray-200">
+    <nav class="-mb-px flex" aria-label="Tabs">
+      <%= render TabnavLinkComponent.new(
+        name: "Info", path: wallet_path,
+        active: current_page?(wallet_path)
+      ) %>
+      <%= render TabnavLinkComponent.new(
+        name: "Transactions", path: wallet_transactions_path,
+        active: current_page?(wallet_transactions_path)
+      ) %>
+    </nav>
+  </div>
+</section>

app/views/wallet/index.html.erb

@@ -1,9 +1,9 @@
-<%= render HeaderComponent.new(title: "Lightning Network") %>
+<%= render HeaderComponent.new(title: "Wallet") %>
 
 <%= render MainSimpleComponent.new do %>
   <%= render WalletSummaryComponent.new(balance: @balance) %>
 
-  <%= render partial: "shared/tabnav_lightning" %>
+  <%= render partial: "shared/tabnav_wallet" %>
 
   <section>
     <h3>Lightning Address</h3>

app/views/wallet/transactions.html.erb

@@ -1,9 +1,9 @@
-<%= render HeaderComponent.new(title: "Lightning Network") %>
+<%= render HeaderComponent.new(title: "Wallet") %>
 
 <%= render MainSimpleComponent.new do %>
   <%= render WalletSummaryComponent.new(balance: @balance) %>
 
-  <%= render partial: "shared/tabnav_lightning" %>
+  <%= render partial: "shared/tabnav_wallet" %>
 
   <section>
     <h3 class="hidden">Transactions</h3>
@@ -27,7 +27,7 @@
             <p class="col-span-2 md:col-span-1 mb-0 text-right">
               <span class="text-xl font-mono <%= tx["received"] ? "text-emerald-600" : "" %>">
                 <%= tx["received"] ? "+" : "" %><%= number_with_delimiter tx["amount_sats"]  %>
-                <span class="text-base md:text-lg">sats</span>
+                <span class="hidden md:inline">sats</span>
               </span>
             </p>
             <p class="col-span-4 md:col-span-3 mb-0 text-gray-500">
@@ -35,10 +35,7 @@
             </p>
             <p class="col-span-4 md:col-span-1 md:text-right mb-0">
               <span class="col-span-2 md:col-span-1 text-sm text-gray-500">
-                <%= tx["datetime"].strftime("%B %e, %H:%M") -%>
-                <% if tx["fee"] && (tx["fee"] > 0) %>
-                  ~ Fee: <%= pluralize tx["fee"], "sat" %>
-                <% end %>
+                <%= tx["datetime"].strftime("%B %e, %H:%M") %>
               </span>
             </p>
           </li>

config/initializers/field_with_errors.rb

@@ -1,9 +0,0 @@
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  if html_tag.match('class')
-    html_tag.gsub(/class="(.*?)"/, 'class="\1 field_with_errors"').html_safe
-  else
-    parts = html_tag.split('>', 2)
-    parts[0] += ' class="field_with_errors">'
-    (parts[0] + parts[1]).html_safe
-  end
-end

config/locales/devise.en.yml

@@ -3,7 +3,7 @@
 en:
   devise:
     confirmations:
-      confirmed: "Thanks for confirming your email address."
+      confirmed: "Thanks for confirming your email address! Your account has been activated."
       send_instructions: "You will receive an email with instructions for how to confirm your email address in a moment."
       send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
     failure:

config/routes.rb

@@ -1,7 +1,7 @@
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-  devise_for :users, controllers: { confirmations: 'users/confirmations' }
+  devise_for :users, controllers: { confirmations: "users/confirmations" }
 
   get 'welcome', to: 'welcome#index'
   get 'check_your_email', to: 'welcome#check_your_email'
@@ -18,19 +18,11 @@ Rails.application.routes.draw do
 
   resources :invitations, only: ['index', 'show', 'create', 'destroy']
 
-  namespace :services do
-    get 'storage', to: 'remotestorage#dashboard'
-
-    resources :lightning, only: [:index] do
-      collection do
-        get 'transactions'
-      end
-    end
-  end
+  get 'wallet', to: 'wallet#index'
+  get 'wallet/transactions', to: 'wallet#transactions'
 
   resources :settings, param: 'section', only: ['index', 'show', 'update'] do
     collection do
-      post 'update_email'
       post 'reset_password'
     end
   end
@@ -61,20 +53,22 @@ Rails.application.routes.draw do
     end
   end
 
-  get ".well-known/webfinger", to: 'webfinger#show'
-
-  namespace :discourse do
-    get "connect", to: 'sso#connect'
+  namespace :rs do
+    resource :oauth, only: [:new, :create], path_names: { new: ':useraddress' },
+      controller: 'oauth', constraints: { useraddress: /[^\/]+/}
+    get 'oauth/token/:id/launch_app' => 'oauth#launch_app', as: :launch_app
   end
 
+  get ".well-known/webfinger" => "webfinger#show"
+
+
   authenticate :user, ->(user) { user.is_admin? } do
-    mount Sidekiq::Web, at: '/sidekiq'
-    mount Flipper::UI.app(Flipper), at: '/flipper'
+    mount Sidekiq::Web => '/sidekiq'
   end
 
   # Letter Opener (open "sent" emails in dev and staging)
   if Rails.env.match(/staging|development/)
-    mount LetterOpenerWeb::Engine, at: '/letter_opener'
+    mount LetterOpenerWeb::Engine, at: "letter_opener"
   end
 
   root to: 'dashboard#index'

db/migrate/20230312212030_create_remote_storage_authorizations.rb

@@ -0,0 +1,17 @@
+class CreateRemoteStorageAuthorizations < ActiveRecord::Migration[7.0]
+  def change
+    create_table :remote_storage_authorizations do |t|
+      t.references :user, null: false, foreign_key: true
+      t.string :token
+      t.text :permissions, array: true, default: [].to_yaml
+      t.string :client_id
+      t.string :redirect_uri
+      t.string :app_name
+      t.datetime :expire_at
+
+      t.timestamps
+    end
+
+    add_index :remote_storage_authorizations, :permissions, using: 'gin'
+  end
+end

db/migrate/20230523120753_create_flipper_tables.rb

@@ -1,22 +0,0 @@
-class CreateFlipperTables < ActiveRecord::Migration[7.0]
-  def self.up
-    create_table :flipper_features do |t|
-      t.string :key, null: false
-      t.timestamps null: false
-    end
-    add_index :flipper_features, :key, unique: true
-
-    create_table :flipper_gates do |t|
-      t.string :feature_key, null: false
-      t.string :key, null: false
-      t.string :value
-      t.timestamps null: false
-    end
-    add_index :flipper_gates, [:feature_key, :key, :value], unique: true
-  end
-
-  def self.down
-    drop_table :flipper_gates
-    drop_table :flipper_features
-  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.0].define(version: 2023_05_23_120753) do
+ActiveRecord::Schema[7.0].define(version: 2023_04_03_150200) do
   create_table "donations", force: :cascade do |t|
     t.integer "user_id"
     t.integer "amount_sats"
@@ -23,22 +23,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_23_120753) do
     t.index ["user_id"], name: "index_donations_on_user_id"
   end
 
-  create_table "flipper_features", force: :cascade do |t|
-    t.string "key", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["key"], name: "index_flipper_features_on_key", unique: true
-  end
-
-  create_table "flipper_gates", force: :cascade do |t|
-    t.string "feature_key", null: false
-    t.string "key", null: false
-    t.string "value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
-  end
-
   create_table "invitations", force: :cascade do |t|
     t.string "token"
     t.integer "user_id"
@@ -50,6 +34,20 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_23_120753) do
     t.index ["user_id"], name: "index_invitations_on_user_id"
   end
 
+  create_table "remote_storage_authorizations", force: :cascade do |t|
+    t.integer "user_id", null: false
+    t.string "token"
+    t.text "permissions", default: "--- []\n"
+    t.string "client_id"
+    t.string "redirect_uri"
+    t.string "app_name"
+    t.datetime "expire_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["permissions"], name: "index_remote_storage_authorizations_on_permissions"
+    t.index ["user_id"], name: "index_remote_storage_authorizations_on_user_id"
+  end
+
   create_table "settings", force: :cascade do |t|
     t.string "var", null: false
     t.text "value"
@@ -81,4 +79,5 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_23_120753) do
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "remote_storage_authorizations", "users"
 end

package.json

@@ -11,7 +11,7 @@
     "postcss-preset-env": "^7.8.3",
     "tailwindcss": "^3.2.4"
   },
-  "version": "0.6.0",
+  "version": "0.5.0",
   "scripts": {
     "build:css:tailwind": "tailwindcss --postcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css",
     "build:css": "yarn run build:css:tailwind"

spec/features/settings/account_spec.rb

@@ -1,58 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Account settings', type: :feature do
-  let(:user) { create :user }
-
-  feature "Update email address" do
-    let(:geraint) { create :user, id: 2, cn: 'geraint', email: "lamagliarosa@example.com" }
-
-    before do
-      login_as user, :scope => :user
-      geraint.save!
-
-      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
-      visit setting_path(:account)
-      fill_in 'Address', with: "lamagliarosa@example.com"
-      fill_in 'Current password', with: "invalid password"
-      click_button "Update"
-
-      expect(current_url).to eq(setting_url(:account))
-      expect(user.reload.unconfirmed_email).to be_nil
-      within ".flash-msg" do
-        expect(page).to have_content("did not match your current password")
-      end
-    end
-
-    scenario 'fails when new address already taken' do
-      visit setting_path(:account)
-      fill_in 'Address', with: "lamagliarosa@example.com"
-      fill_in 'Current password', with: "valid password"
-      click_button "Update"
-
-      expect(current_url).to eq(setting_url(:update_email))
-      expect(user.reload.unconfirmed_email).to be_nil
-      within ".error-msg" do
-        expect(page).to have_content("has already been taken")
-      end
-    end
-
-    scenario 'works with valid password and address' do
-      visit setting_path(:account)
-      fill_in 'Address', with: "lamagliabianca@example.com"
-      fill_in 'Current password', with: "valid password"
-      click_button "Update"
-
-      expect(current_url).to eq(setting_url(:account))
-      expect(user.reload.unconfirmed_email).to eq("lamagliabianca@example.com")
-      within ".flash-msg" do
-        expect(page).to have_content("Please confirm your new address")
-      end
-    end
-  end
-end

spec/features/settings/profile_spec.rb

@@ -1,45 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Profile settings', type: :feature do
-  let(:user) { create :user, cn: "mwahlberg" }
-
-  before do
-    login_as user, :scope => :user
-  end
-
-  feature "Update display name" do
-    before 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"
-      })
-    end
-
-    scenario 'fails with validation error' do
-      visit setting_path(:profile)
-      fill_in 'Display name', with: "M"
-      click_button "Save"
-
-      expect(current_url).to eq(setting_url(:profile))
-      expect(page).to have_field('Display name', with: 'M')
-      within ".error-msg" do
-        expect(page).to have_content("is too short")
-      end
-    end
-
-    scenario 'works with valid input' do
-      expect(LdapManager::UpdateDisplayName).to receive(:call)
-        .with(user.dn, "Marky Mark").and_return(true)
-
-      visit setting_path(:profile)
-      fill_in 'Display name', with: "Marky Mark"
-      click_button "Save"
-
-      expect(current_url).to eq(setting_url(:profile))
-      within ".flash-msg" do
-        expect(page).to have_content("Settings saved")
-      end
-    end
-  end
-end

spec/jobs/xmpp_exchange_contacts_job_spec.rb

@@ -2,18 +2,15 @@ require 'rails_helper'
 require 'webmock/rspec'
 
 RSpec.describe XmppExchangeContactsJob, type: :job do
-  let(:user)  { create :user, cn: "willherschel", ou: "kosmos.org" }
-  let(:guest) { create :user, cn: "isaacnewton", ou: "kosmos.org",
-                              id: 2, email: "hotapple42@eol.com" }
+  let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
 
   subject(:job) {
-    described_class.perform_later(user, guest)
+    described_class.perform_later(user, 'isaacnewton', 'kosmos.org')
   }
 
   before do
     stub_request(:post, "http://xmpp.example.com/api/add_rosteritem")
       .to_return(status: 200, body: "", headers: {})
-    allow_any_instance_of(User).to receive(:services_enabled).and_return(["xmpp"])
   end
 
   it "posts add_rosteritem commands to the ejabberd API" do

spec/jobs/xmpp_set_default_bookmarks_job_spec.rb

@@ -1,34 +0,0 @@
-require 'rails_helper'
-require 'webmock/rspec'
-
-RSpec.describe XmppSetDefaultBookmarksJob, type: :job do
-  let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
-
-  before do
-    Setting.xmpp_default_rooms = [
-      "Welcome <welcome@kosmos.chat>",
-      "Kosmos Dev <kosmos-dev@kosmos.chat>"
-    ]
-  end
-
-  subject(:job) {
-    described_class.perform_later(user)
-  }
-
-  before do
-    stub_request(:post, "http://xmpp.example.com/api/private_set")
-      .to_return(status: 200, body: "", headers: {})
-  end
-
-  it "posts a private_set command to the ejabberd API" do
-    perform_enqueued_jobs { job }
-
-    expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/private_set")
-      .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","element":"\u003cstorage xmlns=\'storage:bookmarks\'\u003e\u003cconference jid=\'welcome@kosmos.chat\' name=\'Welcome\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003cconference jid=\'kosmos-dev@kosmos.chat\' name=\'Kosmos Dev\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003c/storage\u003e"}' }
-  end
-
-  after do
-    clear_enqueued_jobs
-    clear_performed_jobs
-  end
-end

spec/models/user_spec.rb

@@ -101,75 +101,64 @@ RSpec.describe User, type: :model do
     end
   end
 
-  describe "#devise_after_confirmation" do
+  describe "#exchange_xmpp_contact_with_inviter" do
     include ActiveJob::TestHelper
 
-    let(:user) { create :user, cn: "willherschel", ou: "kosmos.org", email: "will@hrsch.el" }
+    let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
+    let(:guest) { create :user, id: 2, cn: "isaacnewton", ou: "kosmos.org", email: "newt@example.com" }
 
     before do
-      allow(user).to receive(:ldap_entry).and_return({
-        uid: "willherschel", ou: "kosmos.org", mail: "will@hrsch.el"
-      })
+      Invitation.create! user: user, invited_user_id: guest.id, used_at: DateTime.now
+      allow_any_instance_of(User).to receive(:services_enabled).and_return(%w[ xmpp ])
     end
 
-    after { clear_enqueued_jobs }
+    it "enqueues a job to exchange XMPP contacts between inviter and invitee" do
+      guest.send(:exchange_xmpp_contact_with_inviter)
+
+      expect(enqueued_jobs.size).to eq(1)
+      args = enqueued_jobs.first['arguments']
+      expect(args[0]['_aj_globalid']).to match('gid://akkounts/User')
+      expect(args[1]).to eq('isaacnewton')
+      expect(args[2]).to eq('kosmos.org')
+    end
+
+    after do
+      clear_enqueued_jobs
+    end
+  end
+
+  describe "#devise_after_confirmation" do
+    let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
 
     it "enables default services" do
       expect(user).to receive(:enable_service).with(%w[ discourse gitea mediawiki xmpp ])
-      user.send :devise_after_confirmation
-    end
-
-    it "enqueues a job to set default chatroom bookmarks for XMPP" do
-      allow(user).to receive(:enable_service).and_return(true)
-      user.send :devise_after_confirmation
-
-      job = enqueued_jobs.select{|j| j['job_class'] == "XmppSetDefaultBookmarksJob"}.first
-      expect(job['arguments'][0]['_aj_globalid']).to eq('gid://akkounts/User/1')
+      user.send(:devise_after_confirmation)
     end
 
     context "for invited user with xmpp enabled" do
       let(:guest) { create :user, id: 2, cn: "isaacnewton", ou: "kosmos.org", email: "newt@example.com" }
 
       before do
+        # TODO remove when defaults are implemented
+        user.update! preferences: { xmpp_exchange_contacts_with_invitees: true }
         Invitation.create! user: user, invited_user_id: guest.id, used_at: DateTime.now
-        allow_any_instance_of(User).to receive(:enable_service)
-        allow(guest).to receive(:ldap_entry).and_return({
-          uid: "isaacnewton", ou: "kosmos.org", mail: "newt@example.com"
-        })
+        allow_any_instance_of(User).to receive(:enable_service).and_return(true)
       end
 
-      it "enqueues jobs to exchange XMPP contacts between inviter and invitee" do
-        guest.send :devise_after_confirmation
-
-        job = enqueued_jobs.select{|j| j['job_class'] == "XmppExchangeContactsJob"}.first
-        expect(job["arguments"][0]['_aj_globalid']).to eq('gid://akkounts/User/1')
-        expect(job["arguments"][1]['_aj_globalid']).to eq('gid://akkounts/User/2')
-      end
-    end
-
-    context "for email address update of existing account" do
-      before do
-        allow(user).to receive(:ldap_entry)
-          .and_return({ uid: "willherschel", ou: "kosmos.org", mail: "willyboy@aol.com" })
-        allow(user).to receive(:dn)
-          .and_return("cn=willherschel,ou=kosmos.org,cn=users,dc=kosmos,dc=org")
-        allow(LdapManager::UpdateEmail).to receive(:call)
+      it "exchanges XMPP contacts with the inviter" do
+        expect(guest).to receive(:exchange_xmpp_contact_with_inviter)
+        guest.send(:devise_after_confirmation)
       end
 
-      it "updates the LDAP 'mail' attribute" do
-        expect(LdapManager::UpdateEmail).to receive(:call)
-          .with("cn=willherschel,ou=kosmos.org,cn=users,dc=kosmos,dc=org", "will@hrsch.el")
-        user.send :devise_after_confirmation
-      end
+      context "automatic contact exchange disabled" do
+        before do
+          user.update! preferences: { xmpp_exchange_contacts_with_invitees: false }
+        end
 
-      it "does not re-enable default services" do
-        expect(user).not_to receive(:enable_service)
-        user.send :devise_after_confirmation
-      end
-
-      it "does not enqueue any delayed jobs" do
-        user.send :devise_after_confirmation
-        expect(enqueued_jobs).to be_empty
+        it "does not exchange XMPP contacts with the inviter" do
+          expect(guest).to_not receive(:exchange_xmpp_contact_with_inviter)
+          guest.send(:devise_after_confirmation)
+        end
       end
     end
   end

spec/requests/discourse/sso_spec.rb

@@ -1,41 +0,0 @@
-require 'rails_helper'
-require 'webmock/rspec'
-
-RSpec.describe "Discourse SSO", type: :request do
-
-  describe "GET /discourse/connect" do
-    let(:user) { create :user, cn: 'jimmy', ou: 'kosmos.org' }
-
-    before do
-      Warden.test_mode!
-      login_as user, scope: :user
-      allow(user).to receive(:display_name).and_return('Jimbo')
-      allow(user).to receive(:is_admin?).and_return(false)
-    end
-
-    after do
-      Warden.test_reset!
-    end
-
-    context "with invalid SSO credentials" do
-      it "results in a failed signature check" do
-        expect {
-          get discourse_connect_path(
-            sso: "bm9uY2U9ODk2N2NiMmFlZTdlMjdjNzZiZTNkZWQ5ODIwYzMzN2QmcmV0dXJuX3Nzb191cmw9aHR0cCUzQSUyRiUyRmxvY2FsaG9zdCUzQTMwMDAlMkZzZXNzaW9uJTJGc3NvX2xvZ2lu",
-            sig: "01fc008ff7b51855217e879b6f14aaddefbbd4df2d128951f7bb70cfde834c2a"
-          )
-        }.to raise_error(DiscourseApi::SingleSignOn::ParseError)
-      end
-    end
-
-    context "valid SSO credentials" do
-      it "redirects to the Discourse SSO endpoint" do
-        get discourse_connect_path(
-          sso: "bm9uY2U9YjQwYWZmYzg0YWQ2NWE1ZTk5MjdlZWU1NWEzMjdhMTQmcmV0dXJuX3Nzb191cmw9aHR0cCUzQSUyRiUyRmxvY2FsaG9zdCUzQTMwMDAlMkZzZXNzaW9uJTJGc3NvX2xvZ2lu",
-          sig: "b7905c5db612391293249ad5272dac493681efcd255133f6c2aff91ba654a319"
-        )
-        expect(response).to redirect_to('http://discourse.example.com/session/sso_login?sso=YWRtaW49ZmFsc2UmZW1haWw9amltbXklNDBleGFtcGxlLmNvbSZleHRlcm5hbF9pZD0xJm5hbWU9SmltYm8mbm9uY2U9YjQwYWZmYzg0YWQ2NWE1ZTk5MjdlZWU1NWEzMjdhMTQmcmV0dXJuX3Nzb191cmw9aHR0cCUzQSUyRiUyRmxvY2FsaG9zdCUzQTMwMDAlMkZzZXNzaW9uJTJGc3NvX2xvZ2luJnVzZXJuYW1lPWppbW15&sig=d5f8b1d6db66569bef789fda4a3216119c2d42b84725d043c9a57dde1e528842')
-      end
-    end
-  end
-end