Merge branch 'main' into 1839

Author: Devwill2

.env.test

@@ -31,6 +31,13 @@ HELPER_TOOLS_TOKEN=test-helper-tools-token
 GRMC_WEBHOOK_SECRET=test-grmc-webhook-secret
 STRIPE_PUBLIC_KEY_TEST=pk_test_51SNEgsIBOqvOFDrfzBydwy0Ca4j1Xgs7pQsbp2zsyWqHezN7yu3TRignvBqDEc6gn8y98bX8HRv8gKJ8Q45w2t6N00ofXBsMBF
 STRIPE_API_KEY=sk_test_51SNEgsIBOqvOFDrffrs0bKw6Qy174HAkRi4aj9UfzMhPymwCYj6A55u9JahmBn4WJeL8FbawjBmUqUUW6mA1NodU008jShUz2J
+SECURE_ENCRYPT_KEY=1aa983f09f099c052970bc251c1cd5a3
+SECURE_EXTERNAL_ID__PRIMARY_KEY_VERSION=1
+SECURE_EXTERNAL_ID__KEYS__1=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
+MOBILE_TOKEN=test-mobile-token
+CLOUDFRONT_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nMIIBPAIBAAJBAJ1ooRTziOuIODeLg+aGiLGXP1Qb31LMgzxHmzfgUEVq5RmV8/NY\nYPjfIZ+yDjsZTfP/2H5sgYm4u1PUAiyOqSkCAwEAAQJBAJK+nRU0KNwzRP17Yj8C\nAuNU9mQKC/tbz6jdtLW1t//NvjRRpxZNm9iBIq2CfiWxYTF9anZEjD3Xwv6JIbb4\n8XUCIQDQbE9SP3OY0Y4zjZ0YOEIfKFMc3qtGc9j/3IGbgkGG1wIhAMFXLMxZbFeZ\niYY5yC8MsYCIGEzfraTzJ7W1LMxkG0//AiA4u3Kv8aOWklwBvmdng1DESGavMhEv\nATOtGamR2dfaSwIhAJ+PGDOVYSpyVeLmcOUTbrIKnzNiLeZBnfYCDXSo8Tl1AiEA\nqXZXTJtNlK4SQgnwHXEd+ZmYSGoLb0080MKuh99IOlY=\n-----END RSA PRIVATE KEY-----\n"
+CLOUDFRONT_KEYPAIR_ID=APKAISH5PKOS7WQUJ6SA
+MOBILE_API_OAUTH_APPLICATION_UID=test-mobile-api-oauth-app-uid
 
 # MinIO
 AWS_S3_ENDPOINT=http://localhost:9000

app/controllers/admin/affiliates/base_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Admin::Affiliates::BaseController < Admin::BaseController
+  before_action :set_affiliate_user
+
+  private
+    def set_affiliate_user
+      @affiliate_user = User.find(params[:affiliate_id])
+    end
+end

app/controllers/admin/affiliates/products/base_controller.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-class Admin::Affiliates::Products::BaseController < Admin::Users::BaseController
-  before_action :set_affiliate_user
+class Admin::Affiliates::Products::BaseController < Admin::Affiliates::BaseController
   before_action :set_product
 
   private
-    def set_affiliate_user
-      @affiliate_user = User.find(params[:affiliate_id])
-    end
-
     def set_product
       @product = Link.find(params[:product_id])
     end

app/controllers/admin/affiliates/products_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Admin::Affiliates::ProductsController < Admin::Affiliates::BaseController
+  include Admin::Users::ListPaginatedProducts
+
+  def index
+    @title = "#{@affiliate_user.display_name} products on Gumroad"
+
+    list_paginated_products user: @affiliate_user,
+                            products: @affiliate_user.directly_affiliated_products.unscope(where: :purchase_disabled_at).order(Admin::Users::ListPaginatedProducts::PRODUCTS_ORDER),
+                            inertia_template: "Admin/Affiliates/Products/Index"
+  end
+end

app/controllers/admin/affiliates_controller.rb

@@ -20,11 +20,14 @@ def index
 
   def show
     @title = "#{@affiliate_user.display_name} affiliate on Gumroad"
-    products_scope = @affiliate_user.directly_affiliated_products.unscope(where: :purchase_disabled_at).order(Arel.sql(Admin::UsersController::PRODUCTS_ORDER))
-    @pagy, @products = pagy(products_scope, limit: Admin::UsersController::PRODUCTS_PER_PAGE)
     respond_to do |format|
-      format.html
-      format.json { render json: @affiliate }
+      format.html do
+        render inertia: "Admin/Affiliates/Show",
+               props: {
+                 user: Admin::UserPresenter::Card.new(user: @affiliate_user, pundit_user:).props,
+               }
+      end
+      format.json { render json: @affiliate_user }
     end
   end
 

app/controllers/admin/links_controller.rb

@@ -23,15 +23,8 @@ def show
     @title = @product.name
     render inertia: "Admin/Products/Show", legacy_template: "admin/links/show", props: {
       title: @product.name,
-      product: Admin::ProductPresenter::Card.new(
-        product: @product,
-        admins_can_mark_as_staff_picked: ->(product) { policy([:admin, :products, :staff_picked, product]).create? },
-        admins_can_unmark_as_staff_picked: ->(product) { policy([:admin, :products, :staff_picked, product]).destroy? }
-      ).props,
-      user: Admin::UserPresenter::Card.new(
-        user: @product.user,
-        impersonatable: policy([:admin, :impersonators, @product.user]).create?
-      ).props
+      product: Admin::ProductPresenter::Card.new(product: @product, pundit_user:).props,
+      user: Admin::UserPresenter::Card.new(user: @product.user, pundit_user:).props
     }
   end
 

app/controllers/admin/merchant_accounts_controller.rb

@@ -4,28 +4,6 @@ class Admin::MerchantAccountsController < Admin::BaseController
   def show
     @merchant_account = MerchantAccount.find_by(id: params[:id]) || MerchantAccount.find_by(charge_processor_merchant_id: params[:id]) || e404
     @title = "Merchant Account #{@merchant_account.id}"
-    load_live_attributes
+    render inertia: "Admin/MerchantAccounts/Show", props: { merchant_account: Admin::MerchantAccountPresenter.new(merchant_account: @merchant_account).props }
   end
-
-  private
-    def load_live_attributes
-      return unless @merchant_account.charge_processor_merchant_id.present?
-
-      if @merchant_account.stripe_charge_processor?
-        stripe_account = Stripe::Account.retrieve(@merchant_account.charge_processor_merchant_id)
-        @live_attributes = {
-          "Charges enabled" => stripe_account.charges_enabled,
-          "Payout enabled" => stripe_account.payouts_enabled,
-          "Disabled reason" => stripe_account.requirements.disabled_reason,
-          "Fields needed" => stripe_account.requirements.as_json
-        }
-      elsif @merchant_account.paypal_charge_processor?
-        paypal_account_details = @merchant_account.paypal_account_details
-        if paypal_account_details.present?
-          @live_attributes = {
-            "Email" => paypal_account_details["primary_email"]
-          }
-        end
-      end
-    end
 end

app/controllers/admin/purchases/comments_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Admin::Purchases::CommentsController < Admin::BaseController
+  include Admin::Commentable
+
+  private
+    def commentable
+      Purchase.find(params[:purchase_id])
+    end
+end

app/controllers/admin/purchases_controller.rb

@@ -60,6 +60,15 @@ def show
     e404 if @purchase.nil?
     @product = @purchase.link
     @title = "Purchase #{@purchase.id}"
+    purchase = Admin::PurchasePresenter.new(@purchase).props
+    render(
+      inertia: "Admin/Purchases/Show",
+      props: {
+        purchase:,
+        product: Admin::ProductPresenter::Card.new(product: @product, pundit_user:).props,
+        user: Admin::UserPresenter::Card.new(user: @product.user, pundit_user:).props
+      },
+    )
   end
 
   def sync_status_with_charge_processor

app/controllers/admin/users_controller.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
 class Admin::UsersController < Admin::BaseController
-  include Pagy::Backend
+  include Admin::FetchUser
   include MassTransferPurchases
 
   skip_before_action :require_admin!, if: :request_from_iffy?, only: %i[suspend_for_fraud_from_iffy mark_compliant_from_iffy flag_for_explicit_nsfw_tos_violation_from_iffy]
 
-  before_action :fetch_user, except: %i[refund_queue block_ip_address]
-
-  helper Pagy::UrlHelpers
-
-  PRODUCTS_ORDER = Arel.sql("ISNULL(COALESCE(purchase_disabled_at, banned_at, links.deleted_at)) DESC, created_at DESC")
-  PRODUCTS_PER_PAGE = 10
+  before_action :fetch_user, except: %i[block_ip_address]
 
   def show
     @title = "#{@user.display_name} on Gumroad"
-    @pagy, @products = pagy(@user.links.order(PRODUCTS_ORDER), limit: PRODUCTS_PER_PAGE)
+
     respond_to do |format|
-      format.html
+      format.html do
+        render inertia: "Admin/Users/Show",
+               props: {
+                 user: Admin::UserPresenter::Card.new(user: @user, pundit_user:).props,
+               }
+      end
       format.json { render json: @user }
     end
   end
@@ -193,10 +193,9 @@ def add_credit
   def set_custom_fee
     custom_fee_per_thousand = params[:custom_fee_percent].present? ? (params[:custom_fee_percent].to_f * 10).round : nil
     @user.update!(custom_fee_per_thousand:)
-
     render json: { success: true }
-  rescue => e
-    render json: { success: false, message: e.message }
+  rescue ActiveRecord::RecordInvalid => e
+    render json: { success: false, message: e.message }, status: :unprocessable_content
   end
 
   def toggle_adult_products
@@ -208,17 +207,6 @@ def toggle_adult_products
   end
 
   private
-    def fetch_user
-      if params[:id].include?("@")
-        @user = User.find_by(email: params[:id])
-      else
-        @user = User.find_by(username: params[:id]) ||
-                User.find_by(id: params[:id])
-      end
-
-      e404 unless @user
-    end
-
     def mass_transfer_purchases_params
       params.require(:mass_transfer_purchases).permit(:new_email)
     end