aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/home_controller.rb
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-04-28 01:04:28 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-04-27 18:04:28 +0200
commitc25426ca47a05700cd2b78cb823afc713c18ead7 (patch)
treef69ab1954563f494639370d7d54447dc0700e632 /app/controllers/home_controller.rb
parent09b93aaf856371afcbcb32048ac047c4c2a1ac05 (diff)
downloadmastodon-c25426ca47a05700cd2b78cb823afc713c18ead7.tar
mastodon-c25426ca47a05700cd2b78cb823afc713c18ead7.tar.gz
mastodon-c25426ca47a05700cd2b78cb823afc713c18ead7.tar.bz2
mastodon-c25426ca47a05700cd2b78cb823afc713c18ead7.zip
Fix Doorkeeper error (#2534)
* Fix Doorkeeper error * use Doorkeeper::OAuth::Scopes.from_string
Diffstat (limited to 'app/controllers/home_controller.rb')
-rw-r--r--app/controllers/home_controller.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 0a25b52aa..1d41892cd 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -18,6 +18,12 @@ class HomeController < ApplicationController
end
def find_or_create_access_token
- Doorkeeper::AccessToken.find_or_create_for(Doorkeeper::Application.where(superapp: true).first, current_user.id, 'read write follow', Doorkeeper.configuration.access_token_expires_in, Doorkeeper.configuration.refresh_token_enabled?)
+ Doorkeeper::AccessToken.find_or_create_for(
+ Doorkeeper::Application.where(superapp: true).first,
+ current_user.id,
+ Doorkeeper::OAuth::Scopes.from_string('read write follow'),
+ Doorkeeper.configuration.access_token_expires_in,
+ Doorkeeper.configuration.refresh_token_enabled?
+ )
end
end