Skip to content

Commit 79fa3df

Browse files
committed
For #28109, added server version checks.
1 parent e5387f3 commit 79fa3df

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

shotgun_api3/shotgun.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,11 +1638,16 @@ def _auth_params(self):
16381638

16391639
# Authenticate using session_id
16401640
elif self.config.session_token:
1641-
auth_params = {
1642-
"session_token" : str(self.config.session_token),
1643-
# Request server side to raise exception for expired sessions
1644-
"reject_if_expired": True
1645-
}
1641+
if self.server_caps.version and self.server_caps.version < (5, 3, 0):
1642+
raise ShotgunError("Session token based authentication requires server version 5.3.0 or "\
1643+
"higher, server is %s" % (self.server_caps.version,))
1644+
1645+
auth_params = {"session_token" : str(self.config.session_token)}
1646+
1647+
# Request server side to raise exception for expired sessions.
1648+
# This was added in as part of Shotgun 5.4.4
1649+
if self.server_caps.version and self.server_caps.version > (5, 4, 3):
1650+
auth_params["reject_if_expired"] = True
16461651

16471652
else:
16481653
raise ValueError("invalid auth params")

0 commit comments

Comments
 (0)