- # Test token creation
- post "/arvados/v1/api_client_authorizations",
- params: {
- :format => :json,
- :api_client_authorization => {
- :owner_uuid => users(:admin).uuid,
- :expires_at => desired_expiration,
- }
- },
- headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
- assert_response 200
- if desired_expiration.nil?
- assert json_response['expires_at'].nil?
- else
- assert_equal json_response['expires_at'].to_time.to_i, desired_expiration.to_i
- end
-
- # Test token update (reverse the above behavior)
- previous_expiration = json_response['expires_at']
- token_uuid = json_response['uuid']
- if previous_expiration.nil?
- desired_updated_expiration = db_current_time + Rails.configuration.API.MaxTokenLifetime + 1.hour
- else
- desired_updated_expiration = nil
- end
- put "/arvados/v1/api_client_authorizations/#{token_uuid}",
- params: {
- :api_client_authorization => {
- :expires_at => desired_updated_expiration,
- }
- },
- headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
- assert_response 200
- if desired_updated_expiration.nil?
- assert json_response['expires_at'].nil?
- else
- assert_equal json_response['expires_at'].to_time.to_i, desired_updated_expiration.to_i
+ start_t = db_current_time
+ patch "/arvados/v1/api_client_authorizations/#{token_uuid}",
+ params: {
+ :api_client_authorization => {
+ :expires_at => desired_expiration
+ }
+ },
+ headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{token}"}
+ assert_response 200
+ expiration_t = json_response['expires_at'].to_time
+ if admin && desired_expiration
+ assert_in_delta desired_expiration.to_f, expiration_t.to_f, 1
+ else
+ assert_in_delta (start_t + Rails.configuration.API.MaxTokenLifetime).to_f, expiration_t.to_f, 2
+ end