Merge pull request 'Remove ln_login from users' (#86) from chore/remove_ln_login into master

Reviewed-on: #86

.env.test

@@ -2,7 +2,6 @@ EJABBERD_API_URL='http://xmpp.example.com/api'
 
 BTCPAY_API_URL='http://btcpay.example.com/api/v1'
 
-LNDHUB_LEGACY_API_URL='http://localhost:3023'
 LNDHUB_API_URL='http://localhost:3026'
 LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
 

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(

app/jobs/create_lndhub_account_job.rb

@@ -2,13 +2,12 @@ class CreateLndhubAccountJob < ApplicationJob
   queue_as :default
 
   def perform(user)
-    return if user.ln_login.present? && user.ln_password.present?
+    return if user.ln_account.present? && user.ln_password.present?
 
     lndhub = LndhubV2.new
     credentials = lndhub.create_account
 
     user.update! ln_account: credentials["login"],
-                 ln_login: credentials["login"], # TODO remove when production is migrated
                  ln_password: credentials["password"]
   end
 end

app/services/lndhub.rb

@@ -2,7 +2,7 @@ class Lndhub
   attr_accessor :auth_token
 
   def initialize
-    @base_url = ENV["LNDHUB_LEGACY_API_URL"]
+    @base_url = ENV["LNDHUB_API_URL"]
   end
 
   def post(endpoint, payload)
@@ -42,7 +42,7 @@ class Lndhub
   end
 
   def authenticate(user)
-    credentials = post "auth?type=auth", { login: user.ln_login, password: user.ln_password }
+    credentials = post "auth?type=auth", { login: user.ln_account, password: user.ln_password }
     self.auth_token = credentials["access_token"]
     self.auth_token
   end

app/services/lndhub_v2.rb

@@ -39,7 +39,7 @@ class LndhubV2
   end
 
   def authenticate(user)
-    credentials = post "auth?type=auth", { login: user.ln_login, password: user.ln_password }
+    credentials = post "auth?type=auth", { login: user.ln_account, password: user.ln_password }
     self.auth_token = credentials["access_token"]
     self.auth_token
   end

db/migrate/20230223115536_remove_ln_login_from_users.rb

@@ -0,0 +1,5 @@
+class RemoveLnLoginFromUsers < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :users, :ln_login_cyphertext
+  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_02_17_084310) do
+ActiveRecord::Schema[7.0].define(version: 2023_02_23_115536) do
   create_table "donations", force: :cascade do |t|
     t.integer "user_id"
     t.integer "amount_sats"

spec/jobs/create_lndhub_account_job_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe CreateLndhubAccountJob, type: :job do
       .with { |req| req.body == '{}' }
 
     user.reload
-    expect(user.ln_login).to eq("abc123")
+    expect(user.ln_account).to eq("abc123")
     expect(user.ln_password).to eq("def456")
   end