rename sign server and merge conflicts

config.json

@@ -90,8 +90,8 @@
     "Enabled": true,
     "Port": 53312
   },
-  "NewSign": {
+  "SignV2": {
-    "Enabled": true,
+    "Enabled": false,
     "Port": 8080
   },
   "Channel": {

config/config.go

@@ -30,7 +30,7 @@ type Config struct {
 	Database       Database
 	Launcher       Launcher
 	Sign           Sign
-	NewSign        NewSign
+	SignV2         SignV2
 	Channel        Channel
 	Entrance       Entrance
 }
@@ -101,8 +101,8 @@ type Sign struct {
 	Port    int
 }
 
-// NewSign holds the new sign server config
+// SignV2 holds the new sign server config
-type NewSign struct {
+type SignV2 struct {
 	Enabled bool
 	Port    int
 }

main.go

@@ -13,8 +13,8 @@ import (
 	"erupe-ce/server/discordbot"
 	"erupe-ce/server/entranceserver"
 	"erupe-ce/server/launcherserver"
-	"erupe-ce/server/newsignserver"
 	"erupe-ce/server/signserver"
+	"erupe-ce/server/signv2server"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -168,17 +168,17 @@ func main() {
 	}
 
 	// New Sign server
-	var newSignServer *newsignserver.Server
+	var newSignServer *signv2server.Server
-	if config.ErupeConfig.NewSign.Enabled {
+	if config.ErupeConfig.SignV2.Enabled {
-		newSignServer = newsignserver.NewServer(
+		newSignServer = signv2server.NewServer(
-			&newsignserver.Config{
+			&signv2server.Config{
 				Logger:      logger.Named("sign"),
 				ErupeConfig: config.ErupeConfig,
 				DB:          db,
 			})
 		err = newSignServer.Start()
 		if err != nil {
-			preventClose(fmt.Sprintf("Failed to start new sign server: %s", err.Error()))
+			preventClose(fmt.Sprintf("Failed to start sign-v2 server: %s", err.Error()))
 		}
 		logger.Info("Started new sign server")
 	}
@@ -246,7 +246,7 @@ func main() {
 		signServer.Shutdown()
 	}
 
-	if config.ErupeConfig.NewSign.Enabled {
+	if config.ErupeConfig.SignV2.Enabled {
 		newSignServer.Shutdown()
 	}
 

server/signv2server/dbutils.go

@@ -1,8 +1,9 @@
-package newsignserver
+package signv2server
 
 import (
 	"context"
 	"database/sql"
+	"erupe-ce/common/token"
 	"fmt"
 	"time"
 
@@ -29,12 +30,12 @@ func (s *Server) createNewUser(ctx context.Context, username string, password st
 }
 
 func (s *Server) createLoginToken(ctx context.Context, uid int) (string, error) {
-	token := randSeq(16)
+	loginToken := token.Generate(16)
-	_, err := s.db.ExecContext(ctx, "INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2)", uid, token)
+	_, err := s.db.ExecContext(ctx, "INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2)", uid, loginToken)
 	if err != nil {
 		return "", err
 	}
-	return token, nil
+	return loginToken, nil
 }
 
 func (s *Server) userIDFromToken(ctx context.Context, token string) (int, error) {

server/signv2server/endpoints.go

@@ -1,10 +1,9 @@
-package newsignserver
+package signv2server
 
 import (
 	"database/sql"
 	"encoding/json"
 	"errors"
-	"math/rand"
 	"net/http"
 	"time"
 
@@ -13,15 +12,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-func randSeq(n int) string {
-	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(b)
-}
-
 type LauncherMessage struct {
 	Message string `json:"message"`
 	Date    int64  `json:"date"`

server/signv2server/signv2_server.go

@@ -1,4 +1,4 @@
-package newsignserver
+package signv2server
 
 import (
 	"context"
@@ -53,7 +53,7 @@ func (s *Server) Start() error {
 	r.HandleFunc("/character/delete", s.DeleteCharacter)
 	handler := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"}))(r)
 	s.httpServer.Handler = handlers.LoggingHandler(os.Stdout, handler)
-	s.httpServer.Addr = fmt.Sprintf(":%d", s.erupeConfig.NewSign.Port)
+	s.httpServer.Addr = fmt.Sprintf(":%d", s.erupeConfig.SignV2.Port)
 
 	serveError := make(chan error, 1)
 	go func() {