rename sign server and merge conflicts

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)
-	_, err := s.db.ExecContext(ctx, "INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2)", uid, token)
+	loginToken := token.Generate(16)
+	_, 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() {