From 14e192e72c838809b30b5a7920dcd438d7275126 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 5 Oct 2020 22:52:16 +0200
Subject: [PATCH] extracted rolecheck from _preregister to separate method

---
 .../modules/ftrack/lib/ftrack_base_handler.py | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pype/modules/ftrack/lib/ftrack_base_handler.py b/pype/modules/ftrack/lib/ftrack_base_handler.py
index 96a8150399..c711896c19 100644
--- a/pype/modules/ftrack/lib/ftrack_base_handler.py
+++ b/pype/modules/ftrack/lib/ftrack_base_handler.py
@@ -149,20 +149,27 @@ class BaseHandler(object):
     def reset_session(self):
         self.session.reset()
 
+    def _register_role_check(self):
+        if not self.role_list or not isinstance(self.role_list, (list, tuple)):
+            return
+
+        user_entity = self.session.query(
+            "User where username is \"{}\"".format(self.session.api_user)
+        ).one()
+        available = False
+        lowercase_rolelist = [
+            role_name.lower()
+            for role_name in self.role_list
+        ]
+        for role in user_entity["user_security_roles"]:
+            if role["security_role"]["name"].lower() in lowercase_rolelist:
+                available = True
+                break
+        if available is False:
+            raise MissingPermision
+
     def _preregister(self):
-        if hasattr(self, "role_list") and len(self.role_list) > 0:
-            username = self.session.api_user
-            user = self.session.query(
-                'User where username is "{}"'.format(username)
-            ).one()
-            available = False
-            lowercase_rolelist = [x.lower() for x in self.role_list]
-            for role in user['user_security_roles']:
-                if role['security_role']['name'].lower() in lowercase_rolelist:
-                    available = True
-                    break
-            if available is False:
-                raise MissingPermision
+        self._register_role_check()
 
         # Custom validations
         result = self.preregister()