Merge remote-tracking branch 'github/org' into org

apps/ops/apps.py

@@ -7,5 +7,9 @@ class OpsConfig(AppConfig):
     name = 'ops'
 
     def ready(self):
+        from orgs.models import Organization
+        from orgs.utils import set_current_org
+        set_current_org(Organization.root())
+
         super().ready()
         from .celery import signal_handler

apps/ops/models/adhoc.py

@@ -263,7 +263,8 @@ class AdHoc(models.Model):
         }
         :return:
         """
-        self._become = signer.sign(json.dumps(item)).decode('utf-8')
+        # self._become = signer.sign(json.dumps(item)).decode('utf-8')
+        self._become = signer.sign(json.dumps(item))
 
     @property
     def options(self):

apps/terminal/urls/api_urls.py

@@ -25,7 +25,7 @@ urlpatterns = [
     path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
     path('terminal/<uuid:terminal>/access-key/', api.TerminalTokenApi.as_view(),
          name='terminal-access-key'),
-    path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'),
+    path('terminal/config/', api.TerminalConfig.as_view(), name='terminal-config'),
     # v2: get session's replay
     # path('v2/sessions/<uuid:pk>/replay/',
     #     api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}),