Merge pull request 'Only support primary domain for Lightning Address' (#158) from chore/well-known_routes into master

Reviewed-on: #158

app/controllers/lnurlpay_controller.rb

@@ -1,6 +1,6 @@
 class LnurlpayController < ApplicationController
-  before_action :check_feature_enabled
-  before_action :find_user_by_address
+  before_action :check_service_available
+  before_action :find_user
 
   MIN_SATS = 10
   MAX_SATS = 1_000_000
@@ -9,7 +9,7 @@ class LnurlpayController < ApplicationController
   def index
     render json: {
       status: "OK",
-      callback: "https://accounts.kosmos.org/lnurlpay/#{@user.address}/invoice",
+      callback: "https://#{Setting.accounts_domain}/lnurlpay/#{@user.cn}/invoice",
       tag: "payRequest",
       maxSendable: MAX_SATS * 1000, # msat
       minSendable: MIN_SATS * 1000, # msat
@@ -69,9 +69,8 @@ class LnurlpayController < ApplicationController
 
   private
 
-  def find_user_by_address
-    address = params[:address].split("@")
-    @user = User.where(cn: address.first, ou: address.last).first
+  def find_user
+    @user = User.where(cn: params[:username], ou: Setting.primary_domain).first
     http_status :not_found if @user.nil?
   end
 
@@ -89,7 +88,7 @@ class LnurlpayController < ApplicationController
 
   private
 
-  def check_feature_enabled
+  def check_service_available
     http_status :not_found unless Setting.lndhub_enabled?
   end
 end

config/routes.rb

@@ -56,14 +56,12 @@ Rails.application.routes.draw do
     end
   end
 
-  get 'lnurlpay/:address', to: 'lnurlpay#index',
-    as: 'lightning_address', constraints: { address: /[^\/]+/}
-  get 'lnurlpay/:address/invoice', to: 'lnurlpay#invoice',
-    as: 'lnurlpay_invoice', constraints: { address: /[^\/]+/}
-  get 'keysend/:address', to: 'lnurlpay#keysend',
-    as: 'lightning_address_keysend', constraints: { address: /[^\/]+/}
-
+  get '.well-known/webfinger', to: 'webfinger#show'
   get '.well-known/nostr', to: 'well_known#nostr'
+  get '.well-known/lnurlpay/:username', to: 'lnurlpay#index', as: 'lightning_address'
+  get '.well-known/keysend/:username', to: 'lnurlpay#keysend', as: 'lightning_address_keysend'
+
+  get 'lnurlpay/:username/invoice', to: 'lnurlpay#invoice', as: 'lnurlpay_invoice'
 
   post 'webhooks/lndhub', to: 'webhooks#lndhub'
 
@@ -96,8 +94,6 @@ Rails.application.routes.draw do
     }, controller: 'oauth'
   end
 
-  get '.well-known/webfinger', to: 'webfinger#show'
-
   namespace :discourse do
     get "connect", to: 'sso#connect'
   end

spec/requests/lnurlpay_spec.rb

@@ -2,59 +2,59 @@ require 'rails_helper'
 
 RSpec.describe "/lnurlpay", type: :request do
 
-  context "Non-existent user/address" do
-    describe "GET /lnurlpay/:address" do
+  context "Non-existent user" do
+    describe "GET /.well-known/lnurlpay/:username" do
       it "returns a 404" do
-        get lightning_address_path(address: "csw@kosmos.org")
+        get lightning_address_path(username: "csw")
         expect(response).to have_http_status(:not_found)
       end
     end
 
-    describe "GET /lnurlpay/:address/invoice" do
+    describe "GET /lnurlpay/:username/invoice" do
       it "returns a 404" do
-        get lnurlpay_invoice_path(address: "csw@kosmos.org", params: { amount: 5000 })
+        get lnurlpay_invoice_path(username: "csw", params: { amount: 5000 })
         expect(response).to have_http_status(:not_found)
       end
     end
 
-    describe "GET /keysend/:address/" do
+    describe "GET /.well-known/keysend/:username/" do
       it "returns a 404" do
-        get lightning_address_keysend_path(address: "csw@kosmos.org")
+        get lightning_address_keysend_path(username: "csw")
         expect(response).to have_http_status(:not_found)
       end
     end
   end
 
-  context "Valid user/address" do
+  context "Valid user" do
     let(:user) { create :user, cn: 'satoshi', ou: 'kosmos.org', ln_account: 'abcdefg123456' }
 
     before do
       login_as user, :scope => :user
     end
 
-    describe "GET /lnurlpay/:address" do
+    describe "GET /.well-known/lnurlpay/:username" do
       it "returns a formatted Lightning Address response" do
-        get lightning_address_path(address: "satoshi@kosmos.org")
+        get lightning_address_path(username: "satoshi")
 
         expect(response).to have_http_status(:ok)
 
         res = JSON.parse(response.body)
         expect(res["status"]).to eq('OK')
         expect(res["tag"]).to eq('payRequest')
-        expect(res["callback"]).to match(lnurlpay_invoice_path('satoshi@kosmos.org'))
+        expect(res["callback"]).to match(lnurlpay_invoice_path('satoshi'))
         expect(res["minSendable"]).to be_a(Integer)
         expect(res["maxSendable"]).to be_a(Integer)
         expect(res["commentAllowed"]).to be_a(Integer)
       end
     end
 
-    describe "GET /lnurlpay/:address/invoice" do
+    describe "GET /lnurlpay/:username/invoice" do
       before do
         allow_any_instance_of(User).to receive(:ln_create_invoice).and_return("lnbc50u1p3lwgknpp52g78gqya5euvzjc53fc6hkmlm2rfjhcd305tcmc0g9gaestav48sdq4gdhkven9v5sx6mmwv4ujzcqzpgxqyz5vqsp5skkz4jlqr6tkvv2g9739ygrjupc4rkqd94mc7dfpj3pgx3f6w7qs9qyyssq7mf3fzcuxlmkr9nqatcch3u8uf4gjyawe052tejz8e9fqxu4pncqk3qklt8g6ylpshg09xyjquyrgtc72vcw5cp0dzcf406apyua7dgpnfn7an")
       end
 
       it "returns a formatted lnurlpay response" do
-        get lnurlpay_invoice_path(address: "satoshi@kosmos.org", params: {
+        get lnurlpay_invoice_path(username: "satoshi", params: {
           amount: 50000, comment: "Coffee time!"
         })
 
@@ -69,7 +69,7 @@ RSpec.describe "/lnurlpay", type: :request do
 
       context "amount too low" do
         it "returns an error" do
-          get lnurlpay_invoice_path(address: "satoshi@kosmos.org", params: {
+          get lnurlpay_invoice_path(username: "satoshi", params: {
             amount: 5000, comment: "Coffee time!"
           })
           expect(response).to have_http_status(:ok)
@@ -81,7 +81,7 @@ RSpec.describe "/lnurlpay", type: :request do
 
       context "comment too long" do
         it "returns an error" do
-          get lnurlpay_invoice_path(address: "satoshi@kosmos.org", params: {
+          get lnurlpay_invoice_path(username: "satoshi", params: {
             amount: 5000000, comment: "Coffee time is the best time, so here's some money for you to get some. May I suggest to sample some Pacamara beans from El Salvador?"
           })
           expect(response).to have_http_status(:ok)
@@ -92,9 +92,9 @@ RSpec.describe "/lnurlpay", type: :request do
       end
     end
 
-    describe "GET /keysend/:address/" do
+    describe "GET /.well-known/keysend/:username/" do
       it "returns a formatted Lightning Address keysend response" do
-        get lightning_address_keysend_path(address: "satoshi@kosmos.org")
+        get lightning_address_keysend_path(username: "satoshi")
 
         expect(response).to have_http_status(:ok)