ekzyis
/
delphi.market
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PUBLIC_URL env var

This commit is contained in:
ekzyis 2023-09-09 22:52:50 +02:00
parent eb977576db
commit fbab0b4975
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.go
View File

@ -32,7 +32,7 @@ func lnAuth() (*LnAuth, error) {
return nil, fmt.Errorf("rand.Read error: %w", err) return nil, fmt.Errorf("rand.Read error: %w", err)
} }
k1hex := hex.EncodeToString(k1) k1hex := hex.EncodeToString(k1)
url := []byte(fmt.Sprintf("https://delphi.market/api/login?tag=login&k1=%s&action=login", k1hex)) url := []byte(fmt.Sprintf("https://%s/api/login?tag=login&k1=%s&action=login", PUBLIC_URL, k1hex))
conv, err := bech32.ConvertBits(url, 8, 5, true) conv, err := bech32.ConvertBits(url, 8, 5, true)
if err != nil { if err != nil {
return nil, fmt.Errorf("bech32.ConvertBits error: %w", err) return nil, fmt.Errorf("bech32.ConvertBits error: %w", err)

2
src/router.go
View File

@ -43,7 +43,7 @@ func login(c echo.Context) error {
return err return err
} }
qr := base64.StdEncoding.EncodeToString([]byte(png)) qr := base64.StdEncoding.EncodeToString([]byte(png))
return c.Render(http.StatusOK, "login.html", map[string]any{"session": c.Get("session"), "lnurl": lnauth.lnurl, "qr": qr}) return c.Render(http.StatusOK, "login.html", map[string]any{"session": c.Get("session"), "PUBLIC_URL": PUBLIC_URL, "lnurl": lnauth.lnurl, "qr": qr})
} }
func verifyLogin(c echo.Context) error { func verifyLogin(c echo.Context) error {

3
src/server.go
View File

@ -21,6 +21,7 @@ var (
COMMIT_SHORT_SHA string COMMIT_SHORT_SHA string
VERSION string VERSION string
PORT int PORT int
PUBLIC_URL string
) )
func execCmd(name string, args ...string) string { func execCmd(name string, args ...string) string {
@ -37,6 +38,7 @@ func init() {
if err != nil { if err != nil {
log.Fatal("Error loading .env file") log.Fatal("Error loading .env file")
} }
flag.StringVar(&PUBLIC_URL, "PUBLIC_URL", "delphi.market", "Public URL of website")
flag.IntVar(&PORT, "PORT", 4321, "Server port") flag.IntVar(&PORT, "PORT", 4321, "Server port")
flag.Parse() flag.Parse()
e = echo.New() e = echo.New()
@ -47,6 +49,7 @@ func init() {
COMMIT_SHORT_SHA = execCmd("git", "rev-parse", "--short", "HEAD") COMMIT_SHORT_SHA = execCmd("git", "rev-parse", "--short", "HEAD")
VERSION = fmt.Sprintf("v0.0.0+%s", COMMIT_SHORT_SHA) VERSION = fmt.Sprintf("v0.0.0+%s", COMMIT_SHORT_SHA)
log.Printf("Running commit %s", COMMIT_SHORT_SHA) log.Printf("Running commit %s", COMMIT_SHORT_SHA)
log.Printf("Public URL: %s", PUBLIC_URL)
} }
func main() { func main() {

2
template/login.html
View File

@ -64,7 +64,7 @@
const redirect = setInterval(() => { const redirect = setInterval(() => {
countdown.textContent = `Redirecting in ${timer--} ...` countdown.textContent = `Redirecting in ${timer--} ...`
if (timer === -1) { if (timer === -1) {
window.location.href = "https://delphi.market/"; window.location.href = "https://{{.PUBLIC_URL}}/";
} }
}, 1000) }, 1000)
} }