fix

Signed-off-by: Jess Frazelle <[email protected]>

Author: jessfraz

VERSION.txt

@@ -1 +1 @@
-v0.2.23
+v0.2.24

cmd/json_base64.go

@@ -17,15 +17,15 @@ func (u Base64) MarshalJSON() ([]byte, error) {
 		return []byte("null"), nil
 	}
 
-	return []byte(`"` + base64.RawStdEncoding.EncodeToString(u.Inner) + `"`), nil
+	return []byte(`"` + base64.RawURLEncoding.EncodeToString(u.Inner) + `"`), nil
 }
 
 func (u Base64) String() string {
 	if u.Inner == nil {
 		return ""
 	}
 
-	return base64.RawStdEncoding.EncodeToString(u.Inner)
+	return base64.RawURLEncoding.EncodeToString(u.Inner)
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
@@ -44,8 +44,10 @@ func (u *Base64) UnmarshalJSON(data []byte) (err error) {
 		return nil
 	}
 
+	sdata := string(data)
+
 	// Fractional seconds are handled implicitly by Parse.
-	uu, err := base64.RawStdEncoding.DecodeString(strings.Trim(string(data), `"`))
+	uu, err := base64.RawURLEncoding.DecodeString(strings.TrimRight(strings.Trim(sdata, `"`), "="))
 	if err != nil {
 		return err
 	}

json_base64.go

@@ -17,15 +17,15 @@ func (u Base64) MarshalJSON() ([]byte, error) {
 		return []byte("null"), nil
 	}
 
-	return []byte(`"` + base64.RawStdEncoding.EncodeToString(u.Inner) + `"`), nil
+	return []byte(`"` + base64.RawURLEncoding.EncodeToString(u.Inner) + `"`), nil
 }
 
 func (u Base64) String() string {
 	if u.Inner == nil {
 		return ""
 	}
 
-	return base64.RawStdEncoding.EncodeToString(u.Inner)
+	return base64.RawURLEncoding.EncodeToString(u.Inner)
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
@@ -44,8 +44,10 @@ func (u *Base64) UnmarshalJSON(data []byte) (err error) {
 		return nil
 	}
 
+	sdata := string(data)
+
 	// Fractional seconds are handled implicitly by Parse.
-	uu, err := base64.RawStdEncoding.DecodeString(strings.Trim(string(data), `"`))
+	uu, err := base64.RawURLEncoding.DecodeString(strings.TrimRight(strings.Trim(sdata, `"`), "="))
 	if err != nil {
 		return err
 	}