Skip to content

Commit

Permalink
generateRandomnumber moved into GenerateRandomString
Browse files Browse the repository at this point in the history
No error would occur if max >0
  • Loading branch information
akshaybabloo committed Mar 6, 2021
1 parent f4c9f9f commit 333d50c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
19 changes: 4 additions & 15 deletions generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,13 @@ import (
const LETTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~"

// GenerateRandomString returns a random string of a given length
func GenerateRandomString(l int) (string, error) {
func GenerateRandomString(l int) string {
builder := strings.Builder{}
builder.Grow(l)

for i := 0; i < l; i++ {
number, err := generateRandomNumber()
if err != nil {
return "", err
}
builder.WriteString(string(LETTERS[number]))
n, _ := rand.Int(rand.Reader, big.NewInt(56))
builder.WriteString(string(LETTERS[n.Int64()]))
}
return builder.String(), nil
}

func generateRandomNumber() (int64, error) {
n, err := rand.Int(rand.Reader, big.NewInt(56))
if err != nil {
return 0, err
}
return n.Int64(), nil
return builder.String()
}
6 changes: 2 additions & 4 deletions generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
)

func TestGenerateRandomString(t *testing.T) {
randomString, err := GenerateRandomString(128)
if assert.Nil(t, err) {
assert.Equal(t, 128, len(randomString))
}
randomString := GenerateRandomString(128)
assert.Equal(t, 128, len(randomString))
}
5 changes: 1 addition & 4 deletions pkce.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ func (p *Pkce) VerifyCode() (string, error) {
return "", errors.New("length should be >=43 and <=128")
}

randomString, err := GenerateRandomString(p.Length)
if err != nil {
return "", err
}
randomString := GenerateRandomString(p.Length)
p.RandomString = randomString
return randomString, nil
} else {
Expand Down

0 comments on commit 333d50c

Please sign in to comment.