burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed logout notification

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-08-05 13:19:47 +02:00
parent 73a3c89e04
commit 653bff420f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actor/src/udsactor/types.py
View File

@ -60,7 +60,7 @@ class LoginResultInfoType(typing.NamedTuple):
@property
def logged_in(self) -> bool:
return self.dead_line is not None or self.max_idle is not None or self.hostname != '' or self.ip != ''
return self.hostname != '' or self.ip != ''
class CertificateInfoType(typing.NamedTuple):
private_key: str

10
server/src/uds/models/user_service.py
View File

@ -71,10 +71,10 @@ class UserService(UUIDModel): # pylint: disable=too-many-public-methods
# The reference to deployed service is used to accelerate the queries for different methods, in fact its redundant cause we can access to the deployed service
# through publication, but queries are much more simple
deployed_service: 'models.ForeignKey[UserService, ServicePool]' = models.ForeignKey(
deployed_service: models.ForeignKey['UserService', 'ServicePool'] = models.ForeignKey(
ServicePool, on_delete=models.CASCADE, related_name='userServices'
)
publication: 'models.ForeignKey[UserService, ServicePoolPublication]' = (
publication: models.ForeignKey['UserService', 'ServicePoolPublication'] = (
models.ForeignKey(
ServicePoolPublication,
on_delete=models.CASCADE,
@ -98,7 +98,7 @@ class UserService(UUIDModel): # pylint: disable=too-many-public-methods
state_date = models.DateTimeField(db_index=True)
creation_date = models.DateTimeField(db_index=True)
data = models.TextField(default='')
user: 'models.ForeignKey[UserService, User]' = models.ForeignKey(
user: models.ForeignKey['UserService', 'User'] = models.ForeignKey(
User,
on_delete=models.CASCADE,
related_name='userServices',
@ -120,7 +120,7 @@ class UserService(UUIDModel): # pylint: disable=too-many-public-methods
)
# "fake" declarations for type checking
objects: 'models.BaseManager[UserService]'
objects: models.BaseManager['UserService']
properties: 'models.QuerySet[UserServiceProperty]'
accounting: 'AccountUsage'
@ -311,7 +311,7 @@ class UserService(UUIDModel): # pylint: disable=too-many-public-methods
:note: If the transport did not notified this data, this may be "empty"
"""
return (self.src_ip, self.src_hostname)
return (self.src_ip or '0.0.0.0', self.src_hostname or 'unknown')
def getOsManager(self) -> typing.Optional['OSManager']:
return self.deployed_service.osmanager