Merge branch '12533-token-n-ip-logging'

[arvados.git] / services / api / script / get_anonymous_user_token.rb

diff --git a/services/api/script/get_anonymous_user_token.rb b/services/api/script/get_anonymous_user_token.rb
index 141f74651c69a0d43750c06d06af3a7da3943ae0..7b146fc8e35f55be8bad6cb012d4fbd93678f10a 100755 (executable)
--- a/services/api/script/get_anonymous_user_token.rb
+++ b/services/api/script/get_anonymous_user_token.rb
@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 # Get or Create an anonymous user token.
 # If get option is used, an existing anonymous user token is returned. If none exist, one is created.
@@ -21,15 +24,13 @@ get_existing = opts[:get]
 require File.dirname(__FILE__) + '/../config/environment'
 
 include ApplicationHelper
-include DbCurrentTime
-
 act_as_system_user
 
 def create_api_client_auth
   api_client_auth = ApiClientAuthorization.
     new(user: anonymous_user,
         api_client_id: 0,
-        expires_at: db_current_time + 100.years,
+        expires_at: Time.now + 100.years,
         scopes: ['GET /'])
   api_client_auth.save!
   api_client_auth.reload
@@ -38,7 +39,7 @@ end
 if get_existing
   api_client_auth = ApiClientAuthorization.
     where('user_id=?', anonymous_user.id.to_i).
-    where('expires_at>?', db_current_time).
+    where('expires_at>?', Time.now).
     select { |auth| auth.scopes == ['GET /'] }.
     first
 end