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:
Colin Mitchell
2017-08-22 12:33:57 -04:00
committed by Eugen Rochko
parent 11a7507318
commit 871c0d251a
15 changed files with 362 additions and 4 deletions

View File

@ -50,7 +50,7 @@ Doorkeeper.configure do
# Optional parameter :confirmation => true (default false) if you want to enforce ownership of
# a registered application
# Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
# enable_application_owner :confirmation => true
enable_application_owner
# Define access token scopes for your provider
# For more information go to

View File

@ -3,8 +3,10 @@ en:
activerecord:
attributes:
doorkeeper/application:
name: Name
name: Application Name
website: Application Website
redirect_uri: Redirect URI
scopes: Scopes
errors:
models:
doorkeeper/application:
@ -37,9 +39,12 @@ en:
name: Name
new: New Application
title: Your applications
show: Show
delete: Delete
new:
title: New Application
show:
title: 'Application: %{name}'
actions: Actions
application_id: Application Id
callback_urls: Callback urls

View File

@ -33,6 +33,10 @@ en:
user_count_after: users
user_count_before: Home to
what_is_mastodon: What is Mastodon?
access_token:
your_token: Your Access Token
regenerate: Regenerate Access Token
regenerated: Access Token Regenerated
accounts:
follow: Follow
followers: Followers
@ -226,6 +230,12 @@ en:
settings: 'Change e-mail preferences: %{link}'
signature: Mastodon notifications from %{instance}
view: 'View:'
application:
created: Application Created
destroyed: Application Destroyed
uid: Client ID
secret: Client Secret
warning: Be very careful with this data. Never share it with anyone other than authorized applications!
applications:
invalid_url: The provided URL is invalid
auth:
@ -423,6 +433,7 @@ en:
preferences: Preferences
settings: Settings
two_factor_authentication: Two-factor Authentication
your_apps: Your applications
statuses:
open_in_web: Open in web
over_character_limit: character limit of %{max} exceeded

View File

@ -12,6 +12,7 @@ SimpleNavigation::Configuration.run do |navigation|
settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
settings.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
settings.item :your_apps, safe_join([fa_icon('list fw'), t('settings.your_apps')]), settings_applications_url
settings.item :follower_domains, safe_join([fa_icon('users fw'), t('settings.followers')]), settings_follower_domains_url
end

View File

@ -79,6 +79,11 @@ Rails.application.routes.draw do
end
resource :follower_domains, only: [:show, :update]
resources :applications do
put :regenerate
end
resource :delete, only: [:show, :destroy]
resources :sessions, only: [:destroy]