Refs #253 Updated base implementation with exceptions.

teraserver/python/modules/FlaskModule/API/user/UserLogin2FA.py

@@ -6,7 +6,7 @@
 from modules.FlaskModule.FlaskModule import user_api_ns as api
 from modules.FlaskModule.API.user.UserLoginBase import UserLoginBase
 from modules.FlaskModule.API.user.UserLoginBase import OutdatedClientVersionError, InvalidClientVersionError, \
-    InvalidClientVersionHandlerError, UserAlreadyLoggedInError
+     UserAlreadyLoggedInError
 from werkzeug.exceptions import BadRequest
 from opentera.redis.RedisRPCClient import RedisRPCClient
 from opentera.modules.BaseModule import ModuleNames
@@ -77,12 +77,9 @@ def get(self):
                 'current_version': e.current_version,
                 'version_error': e.version_error,
                 'message': gettext('Client major version too old, not accepting login')}, 426
-        except InvalidClientVersionError as e:
-            # Invalid client version, will not be handled for now
-            pass
-        except InvalidClientVersionHandlerError as e:
-            self._user_logout()
-            return gettext('Invalid client version handler'), 500
+#        except InvalidClientVersionError as e:
+#            # Invalid client version, will not be handled for now
+#            pass
         except UserAlreadyLoggedInError as e:
             self._user_logout()
             return gettext('User already logged in.'), 403

teraserver/python/modules/FlaskModule/API/user/UserLoginBase.py

@@ -27,12 +27,6 @@ def __init__(self, message):
         super().__init__(message)
 
 
-class InvalidClientVersionHandlerError(Exception):
-    # Raised when the client version handler is invalid
-    def __init__(self, message):
-        super().__init__(message)
-
-
 class UserAlreadyLoggedInError(Exception):
     # Raised when the user is already logged in
     def __init__(self, message):