TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server] Move generateAlphaNumString to util

Browse Source
This commit is contained in:
Neeraj Gupta
2024-05-03 12:11:35 +05:30
parent c04a30a37c
commit 48f24d48b5
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/pkg/controller/storagebonus/referral.go
View File

@@ -3,7 +3,7 @@ package storagebonus
import (
"database/sql"
"errors"
"fmt"
"github.com/ente-io/museum/pkg/utils/random"
"github.com/ente-io/museum/ente"
entity "github.com/ente-io/museum/ente/storagebonus"
@@ -119,7 +119,7 @@ func (c *Controller) GetOrCreateReferralCode(ctx *gin.Context, userID int64) (*s
if !errors.Is(err, sql.ErrNoRows) {
return nil, stacktrace.Propagate(err, "failed to get storagebonus code")
}
code, err := generateAlphaNumString(codeLength)
code, err := random.GenerateAlphaNumString(codeLength)
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
@@ -131,30 +131,3 @@ func (c *Controller) GetOrCreateReferralCode(ctx *gin.Context, userID int64) (*s
}
return referralCode, nil
}
// generateAlphaNumString returns AlphaNumeric code of given length
// which exclude number 0 and letter O. The code always starts with an
// alphabet
func generateAlphaNumString(length int) (string, error) {
// Define the alphabet and numbers to be used in the string.
alphabet := "ABCDEFGHIJKLMNPQRSTUVWXYZ"
// Define the alphabet and numbers to be used in the string.
alphaNum := fmt.Sprintf("%s123456789", alphabet)
// Allocate a byte slice with the desired length.
result := make([]byte, length)
// Generate the first letter as an alphabet.
r0, err := auth.GenerateRandomInt(int64(len(alphabet)))
if err != nil {
return "", stacktrace.Propagate(err, "")
}
result[0] = alphabet[r0]
// Generate the remaining characters as alphanumeric.
for i := 1; i < length; i++ {
ri, err := auth.GenerateRandomInt(int64(len(alphaNum)))
if err != nil {
return "", stacktrace.Propagate(err, "")
}
result[i] = alphaNum[ri]
}
return string(result), nil
}

27
server/pkg/utils/random/generate.go
View File

@@ -13,3 +13,30 @@ func GenerateSixDigitOtp() (string, error) {
}
return fmt.Sprintf("%06d", n), nil
}
// GenerateAlphaNumString returns AlphaNumeric code of given length
// which exclude number 0 and letter O. The code always starts with an
// alphabet
func GenerateAlphaNumString(length int) (string, error) {
// Define the alphabet and numbers to be used in the string.
alphabet := "ABCDEFGHIJKLMNPQRSTUVWXYZ"
// Define the alphabet and numbers to be used in the string.
alphaNum := fmt.Sprintf("%s123456789", alphabet)
// Allocate a byte slice with the desired length.
result := make([]byte, length)
// Generate the first letter as an alphabet.
r0, err := auth.GenerateRandomInt(int64(len(alphabet)))
if err != nil {
return "", stacktrace.Propagate(err, "")
}
result[0] = alphabet[r0]
// Generate the remaining characters as alphanumeric.
for i := 1; i < length; i++ {
ri, err := auth.GenerateRandomInt(int64(len(alphaNum)))
if err != nil {
return "", stacktrace.Propagate(err, "")
}
result[i] = alphaNum[ri]
}
return string(result), nil
}