add option to have external port

internalapi/createboltcard.go

@@ -1,12 +1,13 @@
 package internalapi
 
 import (
-	"github.com/boltcard/boltcard/db"
-	"github.com/boltcard/boltcard/resp_err"
-	log "github.com/sirupsen/logrus"
 	"net/http"
 	"strconv"
 	"strings"
+
+	"github.com/boltcard/boltcard/db"
+	"github.com/boltcard/boltcard/resp_err"
+	log "github.com/sirupsen/logrus"
 )
 
 // random_hex() from Createboltcardwithpin used here
@@ -100,11 +101,16 @@ func Createboltcard(w http.ResponseWriter, r *http.Request) {
 	// return the URI + one_time_code
 
 	hostdomain := db.Get_setting("HOST_DOMAIN")
+	hostdomainPort := db.Get_setting("HOST_DOMAIN_PORT")
+	hostdomainsuffix := ""
+	if hostdomainPort != "" {
+		hostdomainsuffix = ":" + hostdomainPort
+	}
 	url := ""
 	if strings.HasSuffix(hostdomain, ".onion") {
-		url = "http://" + hostdomain + "/new?a=" + one_time_code
+		url = "http://" + hostdomain + hostdomainsuffix + "/new?a=" + one_time_code
 	} else {
-		url = "https://" + hostdomain + "/new?a=" + one_time_code
+		url = "https://" + hostdomain + hostdomainsuffix + "/new?a=" + one_time_code
 	}
 
 	// log the response

internalapi/createboltcardwithpin.go

@@ -3,12 +3,13 @@ package internalapi
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"github.com/boltcard/boltcard/db"
-	"github.com/boltcard/boltcard/resp_err"
-	log "github.com/sirupsen/logrus"
 	"net/http"
 	"strconv"
 	"strings"
+
+	"github.com/boltcard/boltcard/db"
+	"github.com/boltcard/boltcard/resp_err"
+	log "github.com/sirupsen/logrus"
 )
 
 func random_hex() string {
@@ -132,11 +133,16 @@ func Createboltcardwithpin(w http.ResponseWriter, r *http.Request) {
 	// return the URI + one_time_code
 
 	hostdomain := db.Get_setting("HOST_DOMAIN")
+	hostdomainPort := db.Get_setting("HOST_DOMAIN_PORT")
+	hostdomainsuffix := ""
+	if hostdomainPort != "" {
+		hostdomainsuffix = ":" + hostdomainPort
+	}
 	url := ""
 	if strings.HasSuffix(hostdomain, ".onion") {
-		url = "http://" + hostdomain + "/new?a=" + one_time_code
+		url = "http://" + hostdomain + hostdomainsuffix + "/new?a=" + one_time_code
 	} else {
-		url = "https://" + hostdomain + "/new?a=" + one_time_code
+		url = "https://" + hostdomain + hostdomainsuffix + "/new?a=" + one_time_code
 	}
 
 	// log the response

new_card_request.go

@@ -3,10 +3,11 @@ package main
 import (
 	"database/sql"
 	"encoding/json"
+	"net/http"
+
 	"github.com/boltcard/boltcard/db"
 	"github.com/boltcard/boltcard/resp_err"
 	log "github.com/sirupsen/logrus"
-	"net/http"
 )
 
 /**
@@ -55,7 +56,12 @@ func new_card_request(w http.ResponseWriter, req *http.Request) {
 
 	a := params_a[0]
 
-	lnurlw_base := "lnurlw://" + db.Get_setting("HOST_DOMAIN") + "/ln"
+	hostdomainPort := db.Get_setting("HOST_DOMAIN_PORT")
+	hostdomainsuffix := ""
+	if hostdomainPort != "" {
+		hostdomainsuffix = ":" + hostdomainPort
+	}
+	lnurlw_base := "lnurlw://" + db.Get_setting("HOST_DOMAIN") + hostdomainsuffix + "/ln"
 
 	c, err := db.Get_new_card(a)