Merge pull request #586 from calvinmclean/guacamole-conn-id-fix

Guacamole web shell and desktop link generation update

api/v2/views/web_token.py

@@ -77,7 +77,7 @@ def guacamole_token(self, ip_address):
         guac_secret = settings.GUACAMOLE['SECRET_KEY']
         # Create UUID for connection ID
         conn_id = str(uuid.uuid4())
-        base64_conn_id = base64.b64encode(conn_id[2:] + "\0" + 'c' + "\0" + 'hmac')
+        base64_conn_id = base64.b64encode(conn_id + "\0c\0hmac")
 
         # Create timestamp that looks like: 1489181545018
         timestamp = str(int(round(time.time()*1000)))