From 57745ff4f5c22081e317830105c5b777d00f1a11 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sat, 26 Feb 2022 01:59:21 +0100
Subject: [PATCH] Fixed minor bug with app sdkfor base64 encode/decode

---
 backend/app_sdk/app_base.py | 20 ++++++++++++++------
 backend/go-app/go.mod       |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index e244c27b..ea79ba78 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -89,12 +89,18 @@ def md5_base64(a):
 @shuffle_filters.register
 def base64_encode(a):
     a = str(a)
-    return base64.b64encode(a.encode('utf-8')).decode()
+    try:
+        return base64.b64encode(a.encode('utf-8')).decode()
+    except:
+        return base64.b64encode(a).decode()
 
 @shuffle_filters.register
 def base64_decode(a):
     a = str(a)
-    return base64.b64decode(a).decode()
+    try:
+        return base64.b64decode(a).decode()
+    except:
+        return base64.b64decode(a)
 
 #print(standard_filter_manager.filters)
 #print(shuffle_filters.filters)
@@ -125,9 +131,6 @@ class AppBase:
         ch.setFormatter(formatter)
         logger.addHandler(ch)
 
-
-
-
         self.redis=redis
         self.console_logger = logger if logger is not None else logging.getLogger("AppBaseLogger")
 
@@ -1073,6 +1076,7 @@ class AppBase:
             #return value.json()
             return {"success": False}
 
+    # Wrapper for set_files
     def set_file(self, infiles):
         return self.set_files(infiles)
 
@@ -2136,7 +2140,11 @@ class AppBase:
             except:
                 self.logger.info("Error in initial replacement of escaped dollar!")
 
-            #self.logger.info("POST input value: %s" % parameter["value"])
+            # Basic fix in case variant isn't set
+            try:
+                self.logger.info("[DEBUG] Parameter variant: %s" % parameter["variant"])
+            except:
+                parameter["variant"] = "STATIC_VALUE"
 
             # Regex to find all the things
             if parameter["variant"] == "STATIC_VALUE":
diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index 51fa0778..533ca908 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -2,7 +2,7 @@ module main
 
 go 1.16
 
-//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
+replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
 //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch