fix microtoken helper

tmpim · Apr 17, 2023 · 4367278 · 4367278
1 parent 0979295
commit 4367278
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/microtoken/codec_test.go b/microtoken/codec_test.go
@@ -21,7 +21,7 @@ func TestToken(t *testing.T) {
 		t.Fatalf("%+v", err)
 	}
 
-	log.Println(base64.RawStdEncoding.EncodeToString(result))
+	log.Println(base64.RawURLEncoding.EncodeToString(result))
 
 	jwt, err := codec.DecodeToken(HS256Header, result)
 	if err != nil {

diff --git a/token.go b/token.go
@@ -2,6 +2,7 @@ package tmpauth
 
 import (
 	"crypto/sha256"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
@@ -57,7 +58,12 @@ func (t *Tmpauth) ParseWrappedMicrotoken(tokenStr string) (*CachedToken, error)
 		ClientID:   t.Config.ClientID,
 	}
 
-	wrappedJWT, err := codec.DecodeToken(microtoken.HS256Header, []byte(tokenStr))
+	tokenData, err := base64.RawURLEncoding.DecodeString(tokenStr)
+	if err != nil {
+		return nil, fmt.Errorf("tmpauth: failed to base64 decode wrapped microtoken: %w", err)
+	}
+
+	wrappedJWT, err := codec.DecodeToken(microtoken.HS256Header, tokenData)
 	if err != nil {
 		return nil, fmt.Errorf("tmpauth: failed to decode wrapped microtoken: %w", err)
 	}