Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
		
			
				
	
	
		
			44 lines
		
	
	
	
		
			971 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
	
		
			971 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
 | 
						|
  skip_before_action :authenticate_resource_owner!
 | 
						|
 | 
						|
  before_action :store_current_location
 | 
						|
  before_action :authenticate_resource_owner!
 | 
						|
  before_action :set_pack
 | 
						|
  before_action :set_cache_headers
 | 
						|
 | 
						|
  content_security_policy do |p|
 | 
						|
    p.form_action(false)
 | 
						|
  end
 | 
						|
 | 
						|
  include Localized
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def store_current_location
 | 
						|
    store_location_for(:user, request.url)
 | 
						|
  end
 | 
						|
 | 
						|
  def set_pack
 | 
						|
    use_pack 'auth'
 | 
						|
  end
 | 
						|
 | 
						|
  def render_success
 | 
						|
    if skip_authorization? || (matching_token? && !truthy_param?('force_login'))
 | 
						|
      redirect_or_render authorize_response
 | 
						|
    elsif Doorkeeper.configuration.api_only
 | 
						|
      render json: pre_auth
 | 
						|
    else
 | 
						|
      render :new
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  def truthy_param?(key)
 | 
						|
    ActiveModel::Type::Boolean.new.cast(params[key])
 | 
						|
  end
 | 
						|
 | 
						|
  def set_cache_headers
 | 
						|
    response.cache_control.replace(private: true, no_store: true)
 | 
						|
  end
 | 
						|
end
 |