diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-25 23:51:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 23:51:32 +0200 |
| commit | ed7dc1704dc3ce82567d9aac366b095f02ce181f (patch) | |
| tree | eb05f60470367fc111c0258e7e3bc06cc779f9d0 /app/controllers/home_controller.rb | |
| parent | 436ce03772c8c87a215cdcd88020edfb8c241d38 (diff) | |
Bind web UI access tokens to sessions (#3940)
* Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test
Diffstat (limited to 'app/controllers/home_controller.rb')
| -rw-r--r-- | app/controllers/home_controller.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1d41892cd..6209a3ae9 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -5,7 +5,7 @@ class HomeController < ApplicationController def index @body_classes = 'app-body' - @token = find_or_create_access_token.token + @token = current_session.token @web_settings = Web::Setting.find_by(user: current_user)&.data || {} @admin = Account.find_local(Setting.site_contact_username) @streaming_api_base_url = Rails.configuration.x.streaming_api_base_url @@ -16,14 +16,4 @@ class HomeController < ApplicationController def authenticate_user! redirect_to(single_user_mode? ? account_path(Account.first) : about_path) unless user_signed_in? end - - def find_or_create_access_token - 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 |