Skip to content

Commit 0008a88

Browse files
committed
[sc80908] return None if no logged attempt
1 parent 5ea455c commit 0008a88

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

dataikuapi/dss/admin.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,15 @@ def get_last_successful_login_attempt(self, as_date=False):
402402
"""
403403
Get the last successful login attempt of the user as a timestamp or as a :class:`datetime.datetime`
404404
405-
Returns `0` or `1970-01-01 01:00:00` if there is no logged attempt.
405+
Returns None if there is no logged attempt.
406406
407407
:return: the last successful login attempt
408-
:rtype: int or :class:`datetime.datetime`
408+
:rtype: int or :class:`datetime.datetime` or None
409409
"""
410410
timestamp = self.activity["lastSuccessfulLogin"]
411-
if as_date:
411+
if timestamp == 0:
412+
return None
413+
elif as_date:
412414
return datetime.datetime.fromtimestamp(timestamp / 1000)
413415
else:
414416
return timestamp
@@ -417,13 +419,15 @@ def get_last_failed_login_attempt(self, as_date=False):
417419
"""
418420
Get the last failed login attempt of the user as a timestamp or as a :class:`datetime.datetime`
419421
420-
Returns `0` or `1970-01-01 01:00:00` if there is no logged attempt.
422+
Returns None if there is no logged attempt.
421423
422424
:return: the last failed login attempt
423-
:rtype: int or :class:`datetime.datetime`
425+
:rtype: int or :class:`datetime.datetime` or None
424426
"""
425427
timestamp = self.activity["lastFailedLogin"]
426-
if as_date:
428+
if timestamp == 0:
429+
return None
430+
elif as_date:
427431
return datetime.datetime.fromtimestamp(timestamp / 1000)
428432
else:
429433
return timestamp
@@ -433,13 +437,15 @@ def get_last_session_loading(self, as_date=False):
433437
Get the last session loading of the user as a timestamp or as a :class:`datetime.datetime`, i.e. the last time
434438
he opened a new DSS tab or refreshed his session.
435439
436-
Returns `0` or `1970-01-01 01:00:00` if there is no logged attempt.
440+
Returns None if there is no logged attempt.
437441
438442
:return: the last session loading
439-
:rtype: int or :class:`datetime.datetime`
443+
:rtype: int or :class:`datetime.datetime` or None
440444
"""
441445
timestamp = self.activity["lastLoaded"]
442-
if as_date:
446+
if timestamp == 0:
447+
return None
448+
elif as_date:
443449
return datetime.datetime.fromtimestamp(timestamp / 1000)
444450
else:
445451
return timestamp

0 commit comments

Comments
 (0)