Merge branch 'master' into feature/rs-oauth

# Conflicts:
#	app/models/user.rb
#	config/routes.rb
#	db/schema.rb

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,12 +18,22 @@ Rails.application.routes.draw do
 
   resources :invitations, only: ['index', 'show', 'create', 'destroy']
 
-  get 'wallet', to: 'wallet#index'
-  get 'wallet/transactions', to: 'wallet#transactions'
+  namespace :services do
+    get 'storage', to: 'remotestorage#dashboard'
+
+    resources :lightning, only: [:index] do
+      collection do
+        get 'transactions'
+      end
+    end
+  end
 
   resources :settings, param: 'section', only: ['index', 'show', 'update'] do
     collection do
+      post 'update_email'
       post 'reset_password'
+      post 'set_nostr_pubkey'
+      delete 'nostr_pubkey', to: 'settings#remove_nostr_pubkey'
     end
   end
 
@@ -34,6 +44,8 @@ Rails.application.routes.draw do
   get 'keysend/:address', to: 'lnurlpay#keysend',
     as: 'lightning_address_keysend', constraints: { address: /[^\/]+/}
 
+  get '.well-known/nostr', to: 'well_known#nostr'
+
   post 'webhooks/lndhub', to: 'webhooks#lndhub'
 
   namespace :api do
@@ -59,16 +71,20 @@ Rails.application.routes.draw do
     get 'oauth/token/:id/launch_app' => 'oauth#launch_app', as: :launch_app
   end
 
-  get ".well-known/webfinger" => "webfinger#show"
+  get '.well-known/webfinger', to: 'webfinger#show'
 
+  namespace :discourse do
+    get "connect", to: 'sso#connect'
+  end
 
   authenticate :user, ->(user) { user.is_admin? } do
-    mount Sidekiq::Web => '/sidekiq'
+    mount Sidekiq::Web, at: '/sidekiq'
+    mount Flipper::UI.app(Flipper), at: '/flipper'
   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'