forked from shaba/openuds
fixes
This commit is contained in:
@ -257,7 +257,7 @@ class ActorV2Ready(ActorV2Action):
|
||||
if userService.os_state != State.USABLE:
|
||||
userService.setOsState(State.USABLE)
|
||||
# Notify osManager or readyness if has os manager
|
||||
osManager: typing.Optional['osmanagers.OSManager'] = userService.getOsManager()
|
||||
osManager = userService.getOsManagerInstance()
|
||||
|
||||
if osManager:
|
||||
osManager.toReady(userService)
|
||||
@ -274,7 +274,7 @@ class ActorV2Login(ActorV2Action):
|
||||
def action(self) -> typing.MutableMapping[str, typing.Any]:
|
||||
logger.debug('Args: %s, Params: %s', self._args, self._params)
|
||||
userService = self.getUserService()
|
||||
osManager: typing.Optional['osmanagers.OSManager'] = userService.getOsManager()
|
||||
osManager = userService.getOsManagerInstance()
|
||||
if osManager:
|
||||
osManager.loggedIn(userService, self._params.get('username') or '')
|
||||
|
||||
|
@ -50,6 +50,7 @@ from .util import getSqlDatetime
|
||||
|
||||
# Not imported at runtime, just for type checking
|
||||
if typing.TYPE_CHECKING:
|
||||
from uds.core import osmanagers
|
||||
from uds.core import services
|
||||
from uds.models import OSManager, ServicePool, ServicePoolPublication, UserServiceProperty
|
||||
|
||||
@ -261,6 +262,12 @@ class UserService(UUIDModel): # pylint: disable=too-many-public-methods
|
||||
def getOsManager(self) -> typing.Optional['OSManager']:
|
||||
return self.deployed_service.osmanager
|
||||
|
||||
def getOsManagerInstance(self) -> typing.Optional['osmanagers.OSManager']:
|
||||
osManager = self.getOsManager()
|
||||
if osManager:
|
||||
return osManager.getInstance()
|
||||
return None
|
||||
|
||||
def needsOsManager(self) -> bool:
|
||||
"""
|
||||
Returns True if this User Service needs an os manager (i.e. parent services pools is marked to use an os manager)
|
||||
|
Reference in New Issue
Block a user