Move QR code into lib.go
This commit is contained in:
parent
00bcde7ea8
commit
798f5b3623
|
@ -4,7 +4,6 @@ import (
|
||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"encoding/base64"
|
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
@ -13,7 +12,6 @@ import (
|
||||||
"github.com/btcsuite/btcd/btcec/v2"
|
"github.com/btcsuite/btcd/btcec/v2"
|
||||||
"github.com/btcsuite/btcutil/bech32"
|
"github.com/btcsuite/btcutil/bech32"
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
"github.com/skip2/go-qrcode"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type LnAuth struct {
|
type LnAuth struct {
|
||||||
|
@ -84,11 +82,10 @@ func login(c echo.Context) error {
|
||||||
}
|
}
|
||||||
expires := time.Now().Add(60 * 60 * 24 * 365 * time.Second)
|
expires := time.Now().Add(60 * 60 * 24 * 365 * time.Second)
|
||||||
c.SetCookie(&http.Cookie{Name: "session", HttpOnly: true, Path: "/", Value: sessionId, Secure: true, Expires: expires})
|
c.SetCookie(&http.Cookie{Name: "session", HttpOnly: true, Path: "/", Value: sessionId, Secure: true, Expires: expires})
|
||||||
png, err := qrcode.Encode(lnauth.lnurl, qrcode.Medium, 256)
|
qr, err := ToQR(lnauth.lnurl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
qr := base64.StdEncoding.EncodeToString([]byte(png))
|
|
||||||
return c.Render(http.StatusOK, "login.html", map[string]any{"session": c.Get("session"), "PUBLIC_URL": PUBLIC_URL, "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})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
15
src/lib.go
15
src/lib.go
|
@ -1,8 +1,23 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
|
||||||
|
"github.com/skip2/go-qrcode"
|
||||||
|
)
|
||||||
|
|
||||||
func Max(x, y int) int {
|
func Max(x, y int) int {
|
||||||
if x < y {
|
if x < y {
|
||||||
return y
|
return y
|
||||||
}
|
}
|
||||||
return x
|
return x
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ToQR(s string) (string, error) {
|
||||||
|
png, err := qrcode.Encode(s, qrcode.Medium, 256)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
qr := base64.StdEncoding.EncodeToString([]byte(png))
|
||||||
|
return qr, nil
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue