openidec

commit 49c8b4e83f11613d939e78916f47fb48b87430e9
parent 8ff657ce4b93cdb30b8b9c218508fff7f24a5c44
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Sun, 13 Sep 2020 20:40:34 +0300

fix in standard.

Diffstat:
M
ii-node/web.go
 | 
4
++--
M
ii/msg.go
 | 
2
++

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ii-node/web.go b/ii-node/web.go
@@ -222,9 +222,9 @@ func www_base64(ctx *WebContext, w http.ResponseWriter, r *http.Request) error {
 	if b64 == "" {
 		return nil
 	}
-	b, err := base64.RawStdEncoding.DecodeString(b64)
+	b, err := base64.StdEncoding.DecodeString(b64)
 	if err != nil {
-		if b, err = base64.StdEncoding.DecodeString(b64); err != nil {
+		if b, err = base64.RawStdEncoding.DecodeString(b64); err != nil {
 			if b, err = base64.URLEncoding.DecodeString(b64); err != nil {
 				return err
 			}
diff --git a/ii/msg.go b/ii/msg.go
@@ -121,6 +121,8 @@ func DecodeBundle(msg string) (*Msg, error) {
 			return nil, errors.New("Wrong MsgId format")
 		}
 	}
+	msg = strings.Replace(msg, "-", "+", -1) /* if it is URL base64 */
+	msg = strings.Replace(msg, "_", "/", -1) /* make it base64 */
 	data, err := base64.StdEncoding.DecodeString(msg)
 	if err != nil {
 		return nil, err