Application prefs section (#2758)
* Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user
This commit is contained in:
parent
11a7507318
commit
871c0d251a
15 changed files with 362 additions and 4 deletions
65
app/controllers/settings/applications_controller.rb
Normal file
65
app/controllers/settings/applications_controller.rb
Normal file
|
@ -0,0 +1,65 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Settings::ApplicationsController < ApplicationController
|
||||
layout 'admin'
|
||||
|
||||
before_action :authenticate_user!
|
||||
|
||||
def index
|
||||
@applications = current_user.applications.page(params[:page])
|
||||
end
|
||||
|
||||
def new
|
||||
@application = Doorkeeper::Application.new(
|
||||
redirect_uri: Doorkeeper.configuration.native_redirect_uri,
|
||||
scopes: 'read write follow'
|
||||
)
|
||||
end
|
||||
|
||||
def show
|
||||
@application = current_user.applications.find(params[:id])
|
||||
end
|
||||
|
||||
def create
|
||||
@application = current_user.applications.build(application_params)
|
||||
if @application.save
|
||||
redirect_to settings_applications_path, notice: I18n.t('application.created')
|
||||
else
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
@application = current_user.applications.find(params[:id])
|
||||
if @application.update_attributes(application_params)
|
||||
redirect_to settings_applications_path, notice: I18n.t('generic.changes_saved_msg')
|
||||
else
|
||||
render :show
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@application = current_user.applications.find(params[:id])
|
||||
@application.destroy
|
||||
redirect_to settings_applications_path, notice: t('application.destroyed')
|
||||
end
|
||||
|
||||
def regenerate
|
||||
@application = current_user.applications.find(params[:application_id])
|
||||
@access_token = current_user.token_for_app(@application)
|
||||
@access_token.destroy
|
||||
|
||||
redirect_to settings_application_path(@application), notice: t('access_token.regenerated')
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def application_params
|
||||
params.require(:doorkeeper_application).permit(
|
||||
:name,
|
||||
:redirect_uri,
|
||||
:scopes,
|
||||
:website
|
||||
)
|
||||
end
|
||||
end
|
|
@ -46,6 +46,8 @@ class User < ApplicationRecord
|
|||
belongs_to :account, inverse_of: :user, required: true
|
||||
accepts_nested_attributes_for :account
|
||||
|
||||
has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
|
||||
|
||||
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
|
||||
validates_with BlacklistedEmailValidator, if: :email_changed?
|
||||
|
||||
|
@ -108,6 +110,17 @@ class User < ApplicationRecord
|
|||
settings.noindex
|
||||
end
|
||||
|
||||
def token_for_app(a)
|
||||
return nil if a.nil? || a.owner != self
|
||||
Doorkeeper::AccessToken
|
||||
.find_or_create_by(application_id: a.id, resource_owner_id: id) do |t|
|
||||
|
||||
t.scopes = a.scopes
|
||||
t.expires_in = Doorkeeper.configuration.access_token_expires_in
|
||||
t.use_refresh_token = Doorkeeper.configuration.refresh_token_enabled?
|
||||
end
|
||||
end
|
||||
|
||||
def activate_session(request)
|
||||
session_activations.activate(session_id: SecureRandom.hex,
|
||||
user_agent: request.user_agent,
|
||||
|
|
4
app/views/settings/applications/_fields.html.haml
Normal file
4
app/views/settings/applications/_fields.html.haml
Normal file
|
@ -0,0 +1,4 @@
|
|||
= f.input :name, hint: t('activerecord.attributes.doorkeeper/application.name')
|
||||
= f.input :website, hint: t('activerecord.attributes.doorkeeper/application.website')
|
||||
= f.input :redirect_uri, hint: t('activerecord.attributes.doorkeeper/application.redirect_uri')
|
||||
= f.input :scopes, hint: t('activerecord.attributes.doorkeeper/application.scopes')
|
20
app/views/settings/applications/index.html.haml
Normal file
20
app/views/settings/applications/index.html.haml
Normal file
|
@ -0,0 +1,20 @@
|
|||
- content_for :page_title do
|
||||
= t('doorkeeper.applications.index.title')
|
||||
|
||||
%table.table
|
||||
%thead
|
||||
%tr
|
||||
%th= t('doorkeeper.applications.index.application')
|
||||
%th= t('doorkeeper.applications.index.scopes')
|
||||
%th= t('doorkeeper.applications.index.created_at')
|
||||
%th
|
||||
%tbody
|
||||
- @applications.each do |application|
|
||||
%tr
|
||||
%td= link_to application.name, settings_application_path(application)
|
||||
%th= application.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.join('<br />').html_safe
|
||||
%td= l application.created_at
|
||||
%td= table_link_to 'show', t('doorkeeper.applications.index.show'), settings_application_path(application)
|
||||
%td= table_link_to 'times', t('doorkeeper.applications.index.delete'), settings_application_path(application), method: :delete, data: { confirm: t('doorkeeper.applications.confirmations.destroy') }
|
||||
= paginate @applications
|
||||
= link_to t('add_new'), new_settings_application_path, class: 'button'
|
9
app/views/settings/applications/new.html.haml
Normal file
9
app/views/settings/applications/new.html.haml
Normal file
|
@ -0,0 +1,9 @@
|
|||
- content_for :page_title do
|
||||
= t('doorkeeper.applications.new.title')
|
||||
|
||||
.form-container
|
||||
= simple_form_for @application, url: settings_applications_path do |f|
|
||||
= render 'fields', f:f
|
||||
|
||||
.actions
|
||||
= f.button :button, t('.create'), type: :submit
|
28
app/views/settings/applications/show.html.haml
Normal file
28
app/views/settings/applications/show.html.haml
Normal file
|
@ -0,0 +1,28 @@
|
|||
- content_for :page_title do
|
||||
= t('doorkeeper.applications.show.title', name: @application.name)
|
||||
|
||||
|
||||
%p.hint= t('application.warning')
|
||||
|
||||
%div
|
||||
%h3= t('application.uid')
|
||||
%code= @application.uid
|
||||
|
||||
%div
|
||||
%h3= t('application.secret')
|
||||
%code= @application.secret
|
||||
|
||||
%div
|
||||
%h3= t('access_token.your_token')
|
||||
%code= current_user.token_for_app(@application).token
|
||||
|
||||
= link_to t('access_token.regenerate'), settings_application_regenerate_path(@application), method: :put, class: 'button'
|
||||
|
||||
%hr
|
||||
|
||||
= simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
|
||||
= render 'fields', f:f
|
||||
|
||||
.actions
|
||||
= f.button :button, t('generic.save_changes'), type: :submit
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue