Merge branch 'master' into 1.5.x-sync

Author: MetRonnie

cylc/uiserver/__init__.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "1.5.1.dev"
+__version__ = "1.6.0.dev"
 
 import os
 from typing import Dict

cylc/uiserver/app.py

@@ -53,14 +53,16 @@
    the environment variable ``CYLC_SITE_CONF_PATH``.
 """
 
-from concurrent.futures import ProcessPoolExecutor
 import getpass
 import os
-from pathlib import Path, PurePath
 import sys
+from concurrent.futures import ProcessPoolExecutor
+from pathlib import Path, PurePath
 from textwrap import dedent
-from typing import List, Optional
+from types import SimpleNamespace
+from typing import List, Optional, Union
 
+from jupyter_server.extension.application import ExtensionApp
 from pkg_resources import parse_version
 from tornado import ioloop
 from tornado.web import RedirectHandler
@@ -76,9 +78,7 @@
     default,
     validate,
 )
-from types import SimpleNamespace
-
-from jupyter_server.extension.application import ExtensionApp
+from traitlets.config.loader import LazyConfigValue
 
 from cylc.flow.network.graphql import (
     CylcGraphQLBackend, IgnoreFieldMiddleware
@@ -109,6 +109,7 @@
 from cylc.uiserver.websockets.tornado import TornadoSubscriptionServer
 from cylc.uiserver.workflows_mgr import WorkflowsManager
 
+
 INFO_FILES_DIR = Path(USER_CONF_ROOT / "info_files")
 
 
@@ -549,15 +550,26 @@ def set_sub_server(self):
             auth=self.authobj,
         )
 
-    def set_auth(self):
+    def set_auth(self) -> Authorization:
         """Create authorization object.
         One for the lifetime of the UIServer.
         """
+        user_auth: Union[LazyConfigValue, dict] = (
+            self.config.CylcUIServer.user_authorization
+        )
+        site_auth: Union[LazyConfigValue, dict] = (
+            self.config.CylcUIServer.site_authorization
+        )
+        if isinstance(user_auth, LazyConfigValue):
+            user_auth = user_auth.to_dict()
+        if isinstance(site_auth, LazyConfigValue):
+            site_auth = site_auth.to_dict()
+
         return Authorization(
             getpass.getuser(),
-            self.config.CylcUIServer.user_authorization,
-            self.config.CylcUIServer.site_authorization,
-            self.log
+            user_auth,
+            site_auth,
+            self.log,
         )
 
     def initialize_templates(self):