diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 10:55:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-02 10:55:29 +0000 |
| commit | 7c42aaa5763e6028e6c004fa7f90a3c9b2d27ccc (patch) | |
| tree | a60fa4d6b3b37d4beae65db02b4db0435e809c35 /app/controllers | |
| parent | 7a94a46c3006385d2b9215dd2fb0197a8c21a304 (diff) | |
| parent | cd5e79e98b7f08a6fa6999d25e158073fee03048 (diff) | |
| download | gitlab-ce-7c42aaa5763e6028e6c004fa7f90a3c9b2d27ccc.tar.gz | |
Merge branch 'anonymous-applications' into 'master'
Correctly show anonymous authorized applications under Profile > Applications.
Fixes #1907.
Access tokens that were created using the ["Resource Owner Password Credentials" flow](http://doc.gitlab.com/ce/api/oauth2.html#resource-owner-password-credentials) by the user entering their username and password don't have a connected application, so the Profile > Applications page used to crash. These tokens are now rendered as "Anonymous" and can be revoked.
See merge request !924
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/oauth/authorized_applications_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/profiles_controller.rb | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb index 3ab6def511c..4193ac11399 100644 --- a/app/controllers/oauth/authorized_applications_controller.rb +++ b/app/controllers/oauth/authorized_applications_controller.rb @@ -4,7 +4,12 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio layout 'profile' def destroy - Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner) + if params[:token_id].present? + current_resource_owner.oauth_authorized_tokens.find(params[:token_id]).revoke + else + Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner) + end + redirect_to applications_profile_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy]) end end diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index b4af9e490ed..5382a6cf6ac 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -11,7 +11,8 @@ class ProfilesController < Profiles::ApplicationController def applications @applications = current_user.oauth_applications @authorized_tokens = current_user.oauth_authorized_tokens - @authorized_apps = @authorized_tokens.map(&:application).uniq + @authorized_anonymous_tokens = @authorized_tokens.reject(&:application) + @authorized_apps = @authorized_tokens.map(&:application).uniq - [nil] end def update |