More user API token creation fixes (#1269)

* More user API token creation fixes

* Don't load dotenv-rails in the test env

Gemfile

@@ -16,9 +16,6 @@ gem 'psych', '< 4'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
-# Get env variables from .env file
-gem 'dotenv-rails'
-
 # Threaded application server
 gem 'puma'
 
@@ -190,6 +187,11 @@ gem 'rack-cors'
 # Data visualization and query
 gem 'blazer'
 
+group :development, :production do
+  # Get env variables from .env file
+  gem 'dotenv-rails'
+end
+
 group :development, :test do
   # Run specs in parallel
   gem 'parallel_tests'

app/controllers/api/v1/users_controller.rb

@@ -263,7 +263,7 @@ def create_external_id
   def get_sso_token(application, user)
     access_token = Doorkeeper::AccessToken.find_or_create_for(
       application: application,
-      resource_owner: user.id,
+      resource_owner: user,
       scopes: Doorkeeper.config.default_scopes,
       expires_in: SSO_TOKEN_INITIAL_DURATION,
       use_refresh_token: false,
@@ -276,8 +276,8 @@ def get_sso_token(application, user)
                                  )
 
     access_token = Doorkeeper::AccessToken.create_for(
-      application: application.id,
-      resource_owner: user.id,
+      application: application,
+      resource_owner: user,
       scopes: Doorkeeper.config.default_scopes,
       expires_in: SSO_TOKEN_INITIAL_DURATION,
       use_refresh_token: false