4d6da770de
- Mainly whitespace changes. - Require the migration adding the `scope` column to the `personal_access_tokens` table to have downtime, since API calls will fail if the new code is in place, but the migration hasn't run. - Minor refactoring - load `@scopes` in a `before_action`, since we're doing it in three different places.
58 lines
1.6 KiB
Ruby
58 lines
1.6 KiB
Ruby
class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
|
|
include Gitlab::CurrentSettings
|
|
include Gitlab::GonHelper
|
|
include PageLayoutHelper
|
|
include OauthApplications
|
|
|
|
before_action :verify_user_oauth_applications_enabled
|
|
before_action :authenticate_user!
|
|
before_action :add_gon_variables
|
|
before_action :load_scopes, only: [:index, :create, :edit]
|
|
|
|
layout 'profile'
|
|
|
|
def index
|
|
set_index_vars
|
|
end
|
|
|
|
def create
|
|
@application = Doorkeeper::Application.new(application_params)
|
|
|
|
@application.owner = current_user
|
|
|
|
if @application.save
|
|
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
|
|
redirect_to oauth_application_url(@application)
|
|
else
|
|
set_index_vars
|
|
render :index
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def verify_user_oauth_applications_enabled
|
|
return if current_application_settings.user_oauth_applications?
|
|
|
|
redirect_to profile_path
|
|
end
|
|
|
|
def set_index_vars
|
|
@applications = current_user.oauth_applications
|
|
@authorized_tokens = current_user.oauth_authorized_tokens
|
|
@authorized_anonymous_tokens = @authorized_tokens.reject(&:application)
|
|
@authorized_apps = @authorized_tokens.map(&:application).uniq.reject(&:nil?)
|
|
|
|
# Don't overwrite a value possibly set by `create`
|
|
@application ||= Doorkeeper::Application.new
|
|
end
|
|
|
|
# Override Doorkeeper to scope to the current user
|
|
def set_application
|
|
@application = current_user.oauth_applications.find(params[:id])
|
|
end
|
|
|
|
rescue_from ActiveRecord::RecordNotFound do |exception|
|
|
render "errors/not_found", layout: "errors", status: 404
|
|
end
|
|
end
|