Skip to content

Commit 2532577

Browse files
committed
Fix uuid package error
1 parent 5e9ac53 commit 2532577

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

generates/access.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func (ag *AccessGenerate) Token(data *oauth2.GenerateBasic, isGenRefresh bool) (
2525
buf.WriteString(data.UserID)
2626
buf.WriteString(strconv.FormatInt(data.CreateAt.UnixNano(), 10))
2727

28-
access = base64.URLEncoding.EncodeToString(uuid.NewV3(uuid.NewV4(), buf.String()).Bytes())
28+
access = base64.URLEncoding.EncodeToString(uuid.NewV3(uuid.Must(uuid.NewV4()), buf.String()).Bytes())
2929
access = strings.ToUpper(strings.TrimRight(access, "="))
3030
if isGenRefresh {
31-
refresh = base64.URLEncoding.EncodeToString(uuid.NewV5(uuid.NewV4(), buf.String()).Bytes())
31+
refresh = base64.URLEncoding.EncodeToString(uuid.NewV5(uuid.Must(uuid.NewV4()), buf.String()).Bytes())
3232
refresh = strings.ToUpper(strings.TrimRight(refresh, "="))
3333
}
3434

generates/authorize.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type AuthorizeGenerate struct{}
2121
func (ag *AuthorizeGenerate) Token(data *oauth2.GenerateBasic) (code string, err error) {
2222
buf := bytes.NewBufferString(data.Client.GetID())
2323
buf.WriteString(data.UserID)
24-
token := uuid.NewV3(uuid.NewV1(), buf.String())
24+
token := uuid.NewV3(uuid.Must(uuid.NewV1()), buf.String())
2525
code = base64.URLEncoding.EncodeToString(token.Bytes())
2626
code = strings.ToUpper(strings.TrimRight(code, "="))
2727

store/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (ts *TokenStore) Create(info oauth2.TokenInfo) (err error) {
4343
_, _, err = tx.Set(code, string(jv), &buntdb.SetOptions{Expires: true, TTL: info.GetCodeExpiresIn()})
4444
return
4545
}
46-
basicID := uuid.NewV4().String()
46+
basicID := uuid.Must(uuid.NewV4()).String()
4747
aexp := info.GetAccessExpiresIn()
4848
rexp := aexp
4949
if refresh := info.GetRefresh(); refresh != "" {

0 commit comments

Comments
 (0)