@@ -52,13 +52,15 @@ def is_auth_valid(self):
5252 self .auth_method = auth_string [:2 ]
5353 new_signature = OpenPAYGOMetricsShared .generate_request_signature_from_data (self .request_dict , self .auth_method , self .secret_key )
5454 if auth_string == new_signature :
55- request_count = self .request_dict . get ( 'request_count' )
56- if request_count and self .last_request_count and request_count <= self .last_request_count :
55+ request_count = self .get_request_count ( )
56+ if request_count and self .last_request_count and request_count > self .last_request_count :
5757 return False
58- timestamp = self .request_dict . get ( 'timestamp' )
59- if timestamp and self .last_request_timestamp and timestamp <= self .last_request_timestamp :
58+ timestamp = self .get_request_timestamp ( )
59+ if timestamp and self .last_request_timestamp and timestamp > self .last_request_timestamp :
6060 return False
61- return True
61+ # Either the request count or timestamp is required
62+ if request_count or timestamp :
63+ return True
6264 return False
6365
6466 def get_simple_metrics (self ):
@@ -76,7 +78,7 @@ def get_simple_metrics(self):
7678 def get_data_timestamp (self ):
7779 return self .request_dict .get ('data_collection_timestamp' , self .timestamp )
7880
79- def get_request_timestmap (self ):
81+ def get_request_timestamp (self ):
8082 return self .request_timestamp
8183
8284 def get_request_count (self ):
0 commit comments