Merge branch 'master' into feature/ln_address_keysend

app/controllers/admin/base_controller.rb

@@ -1,4 +1,5 @@
 class Admin::BaseController < ApplicationController
+  include Pagy::Backend
 
   before_action :authenticate_user!
   before_action :authorize_admin
@@ -7,5 +8,4 @@ class Admin::BaseController < ApplicationController
   def set_context
     @context = :admin
   end
-
 end

app/controllers/admin/donations_controller.rb

@@ -5,7 +5,8 @@ class Admin::DonationsController < Admin::BaseController
   # GET /donations
   # GET /donations.json
   def index
-    @donations = Donation.all.order('created_at desc')
+    @pagy, @donations = pagy(Donation.all.order('created_at desc'))
+
     @stats = {
       overall_sats: @donations.all.sum("amount_sats"),
       donor_count: Donation.distinct.count(:user_id)

app/controllers/admin/invitations_controller.rb

@@ -1,7 +1,8 @@
 class Admin::InvitationsController < Admin::BaseController
   def index
     @current_section = :invitations
-    @invitations_used = Invitation.used.order('used_at desc')
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
+
     @stats = {
       available: Invitation.unused.count,
       accepted: @invitations_used.length,

app/controllers/admin/ldap_users_controller.rb

@@ -1,20 +0,0 @@
-class Admin::LdapUsersController < Admin::BaseController
-  before_action :set_current_section
-
-  def index
-    ldap = LdapService.new
-    @ou = params[:ou] || "kosmos.org"
-    @orgs = ldap.fetch_organizations
-    @entries = ldap.fetch_users(ou: @ou)
-    @stats = {
-      users_confirmed: User.where(ou: @ou).confirmed.count,
-      users_pending: User.where(ou: @ou).pending.count
-    }
-  end
-
-  private
-
-  def set_current_section
-    @current_section = :ldap_users
-  end
-end

app/controllers/admin/users_controller.rb

@@ -0,0 +1,35 @@
+class Admin::UsersController < Admin::BaseController
+  before_action :set_user, only: [:show]
+  before_action :set_current_section
+
+  def index
+    ldap   = LdapService.new
+    @ou    = params[:ou] || "kosmos.org"
+    @orgs  = ldap.fetch_organizations
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))
+
+    @stats = {
+      users_confirmed: User.where(ou: @ou).confirmed.count,
+      users_pending: User.where(ou: @ou).pending.count
+    }
+  end
+
+  def show
+    if Setting.lndhub_admin_enabled?
+      @lndhub_user = @user.lndhub_user
+    end
+
+    @services_enabled = @user.services_enabled
+  end
+
+  private
+
+  def set_user
+    address = params[:address].split("@")
+    @user = User.where(cn: address.first, ou: address.last).first
+  end
+
+  def set_current_section
+    @current_section = :users
+  end
+end

app/controllers/users/confirmations_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Users::ConfirmationsController < Devise::ConfirmationsController
+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+    yield resource if block_given?
+
+    if resource.errors.empty?
+      set_flash_message!(:success, :confirmed)
+      resource.devise_after_confirmation
+      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
+    else
+      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+    end
+  end
+end

app/controllers/wallet_controller.rb

@@ -7,7 +7,7 @@ class WalletController < ApplicationController
   before_action :fetch_balance
 
   def index
-    @wallet_url = "lndhub://#{current_user.ln_login}:#{current_user.ln_password}@#{ENV['LNDHUB_PUBLIC_URL']}"
+    @wallet_url = "lndhub://#{current_user.ln_account}:#{current_user.ln_password}@#{ENV['LNDHUB_PUBLIC_URL']}"
 
     qrcode = RQRCode::QRCode.new(@wallet_url)
     @svg = qrcode.as_svg(