]> cat aescling's git repositories - mastodon.git/commitdiff
Fix Doorkeeper error (#2534)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Thu, 27 Apr 2017 16:04:28 +0000 (01:04 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 27 Apr 2017 16:04:28 +0000 (18:04 +0200)
* Fix Doorkeeper error

* use Doorkeeper::OAuth::Scopes.from_string

app/controllers/home_controller.rb

index 0a25b52aa331fecfe3c1e2991b894677cabaa65c..1d41892cddc59f760955bac42d8bb35c2b2d3b88 100644 (file)
@@ -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