dkforest

commit 91701b7e9107640b7de15dee9be484c64c181ece
parent 0f28720d39dbc79636a7c7e566990d316af1d2f3
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 12 Jun 2023 20:18:59 -0700

move code

Diffstat:
M
pkg/web/handlers/handlers.go
 | 
29
-----------------------------
M
pkg/web/handlers/settings.go
 | 
29
+++++++++++++++++++++++++++++

2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -10,7 +10,6 @@ import (
 	"dkforest/pkg/web/handlers/streamModals"
 	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	_ "golang.org/x/image/bmp"
 	_ "golang.org/x/image/webp"
@@ -32,14 +31,11 @@ import (
 
 	"dkforest/pkg/cache"
 	"dkforest/pkg/captcha"
-	armor1 "filippo.io/age/armor"
-
 	"dkforest/pkg/config"
 	"dkforest/pkg/database"
 	"dkforest/pkg/managers"
 	"dkforest/pkg/utils"
 	hutils "dkforest/pkg/web/handlers/utils"
-	"filippo.io/age"
 	"github.com/alecthomas/chroma/formatters/html"
 	"github.com/alecthomas/chroma/lexers"
 	"github.com/alecthomas/chroma/styles"
@@ -1371,31 +1367,6 @@ func generateTokenMsg(token string) string {
 	return msg
 }
 
-func generateAgeEncryptedTokenMessage(userID database.UserID, pkey string) (string, error) {
-	token := utils.GenerateToken10()
-	ageTokenCache.SetD(userID, ValueTokenCache{Value: token, PKey: pkey})
-
-	recipient, err := age.ParseX25519Recipient(pkey)
-	if err != nil {
-		logrus.Error(err)
-		return "", errors.New("invalid public key")
-	}
-	out := &bytes.Buffer{}
-	aw := armor1.NewWriter(out)
-	w, err := age.Encrypt(aw, recipient)
-	msg := generateTokenMsg(token)
-	if _, err := io.WriteString(w, msg); err != nil {
-		logrus.Error(err)
-		w.Close()
-		aw.Close()
-		return "", err
-	}
-	w.Close()
-	aw.Close()
-
-	return out.String(), nil
-}
-
 func generatePgpEncryptedTokenMessage(userID database.UserID, pkey string) (string, error) {
 	token := utils.GenerateToken10()
 	pgpTokenCache.SetD(userID, ValueTokenCache{Value: token, PKey: pkey})
diff --git a/pkg/web/handlers/settings.go b/pkg/web/handlers/settings.go
@@ -9,12 +9,16 @@ import (
 	"dkforest/pkg/managers"
 	"dkforest/pkg/utils"
 	hutils "dkforest/pkg/web/handlers/utils"
+	"errors"
+	"filippo.io/age"
+	armor1 "filippo.io/age/armor"
 	"fmt"
 	"github.com/asaskevich/govalidator"
 	"github.com/dustin/go-humanize"
 	"github.com/labstack/echo"
 	"github.com/sirupsen/logrus"
 	"image"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"regexp"
@@ -894,6 +898,31 @@ func AddAgeHandler(c echo.Context) error {
 	return c.Render(http.StatusOK, "age", data)
 }
 
+func generateAgeEncryptedTokenMessage(userID database.UserID, pkey string) (string, error) {
+	token := utils.GenerateToken10()
+	ageTokenCache.SetD(userID, ValueTokenCache{Value: token, PKey: pkey})
+
+	recipient, err := age.ParseX25519Recipient(pkey)
+	if err != nil {
+		logrus.Error(err)
+		return "", errors.New("invalid public key")
+	}
+	out := &bytes.Buffer{}
+	aw := armor1.NewWriter(out)
+	w, err := age.Encrypt(aw, recipient)
+	msg := generateTokenMsg(token)
+	if _, err := io.WriteString(w, msg); err != nil {
+		logrus.Error(err)
+		w.Close()
+		aw.Close()
+		return "", err
+	}
+	w.Close()
+	aw.Close()
+
+	return out.String(), nil
+}
+
 // SettingsWebsiteHandler ...
 func SettingsWebsiteHandler(c echo.Context) error {
 	authUser := c.Get("authUser").(*database.User)