From dccb0212b1329de14494e3e822b89f4eefaa38eb Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Mon, 14 Jul 2025 16:33:54 +0530 Subject: [PATCH] [server][auth] Use Base64 encoding for api key id --- server/internal/auth/api_key.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/internal/auth/api_key.go b/server/internal/auth/api_key.go index 48447eb5..cb06b202 100644 --- a/server/internal/auth/api_key.go +++ b/server/internal/auth/api_key.go @@ -34,12 +34,14 @@ func GenerateAPIKey(db db.TxHandler, userID int32, validity time.Duration, descr if id, key, err := generateAPIKey(db, userID, validity, description, scopes); err != nil { return "", "", err } else { - return id.String(), b32Encoder.EncodeToString(key), nil + return b64Encoder.EncodeToString(id[:]), b32Encoder.EncodeToString(key), nil } } func ReadAPIKey(db db.Handler, keyIDStr, keyStr string) (Auth, error) { - if keyID, err := uuid.Parse(keyIDStr); err != nil { + if b, err := b64Encoder.DecodeString(keyIDStr); err != nil { + return nil, err + } else if keyID, err := uuid.FromBytes(b); err != nil { return nil, err } else if key, err := b32Encoder.DecodeString(keyStr); err != nil { return nil, err