-
-
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 8997d61d8..62845fe4b 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -98,10 +98,7 @@ ignore_missing:
- date.*
# TODO: add translations for these
- - 'activerecord.attributes.doorkeeper/*'
- - 'activerecord.errors.models.doorkeeper/*'
- devise.*
- - doorkeeper.*
# these are loaded from kaminari default gem
- views.*
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
deleted file mode 100644
index 4086467c0..000000000
--- a/config/initializers/doorkeeper.rb
+++ /dev/null
@@ -1,502 +0,0 @@
-# Doorkeeper uses ActiveSupport::LazyLoadHooks to lazily load its models.
-# See: https://apirubyonrails.org/classes/ActiveSupport/LazyLoadHooks.html.
-# For this to work ActiveRecord::Base needs to be required. Previously this
-# happened as a side-effect of the rails-setting-cached gem but we removed this
-# so need to explicitly require it.
-require "active_record/base"
-
-Doorkeeper.configure do
- # Change the ORM that doorkeeper will use (requires ORM extensions installed).
- # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
- orm :active_record
-
- # This block will be called to check whether the resource owner is authenticated or not.
- resource_owner_authenticator do
- # raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
- # Put your resource owner authentication logic here.
- # Example implementation:
- # User.find_by(id: session[:user_id]) || redirect_to(new_user_session_url)
-
- current_user || warden.authenticate!(scope: :user)
- end
-
- # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb
- # file then you need to declare this block in order to restrict access to the web interface for
- # adding oauth authorized applications. In other case it will return 403 Forbidden response
- # every time somebody will try to access the admin web interface.
- #
- admin_authenticator do
- # Put your admin authentication logic here.
- # Example implementation:
-
- if current_user
- head :forbidden unless current_user.super_admin?
- else
- warden.authenticate!(scope: :user)
- end
- end
-
- # You can use your own model classes if you need to extend (or even override) default
- # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant.
- #
- # Be default Doorkeeper ActiveRecord ORM uses it's own classes:
- #
- # access_token_class "Doorkeeper::AccessToken"
- # access_grant_class "Doorkeeper::AccessGrant"
- # application_class "Doorkeeper::Application"
- #
- # Don't forget to include Doorkeeper ORM mixins into your custom models:
- #
- # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token
- # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant
- # * ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients)
- #
- # For example:
- #
- # access_token_class "MyAccessToken"
- #
- # class MyAccessToken < ApplicationRecord
- # include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
- #
- # self.table_name = "hey_i_wanna_my_name"
- #
- # def destroy_me!
- # destroy
- # end
- # end
-
- # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
- # By default this option is disabled.
- #
- # Make sure you properly setup you database and have all the required columns (run
- # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails
- # migrations).
- #
- # If this option enabled, Doorkeeper will store not only Resource Owner primary key
- # value, but also it's type (class name). See "Polymorphic Associations" section of
- # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations
- #
- # [NOTE] If you apply this option on already existing project don't forget to manually
- # update `resource_owner_type` column in the database and fix migration template as it will
- # set NOT NULL constraint for Access Grants table.
- #
- # use_polymorphic_resource_owner
-
- # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might
- # want to use API mode that will skip all the views management and change the way how
- # Doorkeeper responds to a requests.
- #
- # api_only
-
- # Enforce token request content type to application/x-www-form-urlencoded.
- # It is not enabled by default to not break prior versions of the gem.
- #
- # enforce_content_type
-
- # Authorization Code expiration time (default: 10 minutes).
- #
- # authorization_code_expires_in 10.minutes
-
- # Access token expiration time (default: 2 hours).
- # If you want to disable expiration, set this to `nil`.
- #
- # access_token_expires_in 2.hours
-
- # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
- # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to
- # +access_token_expires_in+ configuration option value. If you really need to issue a
- # non-expiring access token (which is not recommended) then you need to return
- # Float::INFINITY from this block.
- #
- # `context` has the following properties available:
- #
- # * `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
- # * `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
- # * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
- # * `resource_owner` - authorized resource owner instance (if present)
- #
- # custom_access_token_expires_in do |context|
- # context.client.additional_settings.implicit_oauth_expiration
- # end
-
- # Use a custom class for generating the access token.
- # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator
- #
- # access_token_generator '::Doorkeeper::JWT'
-
- # The controller +Doorkeeper::ApplicationController+ inherits from.
- # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to
- # +ActionController::API+. The return value of this option must be a stringified class name.
- # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-base-controller
- #
- base_controller "ApplicationController"
-
- # Reuse access token for the same resource owner within an application (disabled by default).
- #
- # This option protects your application from creating new tokens before old valid one becomes
- # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper
- # doesn't updates existing token expiration time, it will create a new token instead.
- # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
- #
- # You can not enable this option together with +hash_token_secrets+.
- #
- # reuse_access_token
-
- # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
- # token using `matching_token_for` Access Token API that searches for valid records
- # in batches in order not to pollute the memory with all the database records. By default
- # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
- # depending on your needs and server capabilities.
- #
- # token_lookup_batch_size 10_000
-
- # Set a limit for token_reuse if using reuse_access_token option
- #
- # This option limits token_reusability to some extent.
- # If not set then access_token will be reused unless it expires.
- # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189
- #
- # This option should be a percentage(i.e. (0,100])
- #
- # token_reuse_limit 100
-
- # Only allow one valid access token obtained via client credentials
- # per client. If a new access token is obtained before the old one
- # expired, the old one gets revoked (disabled by default)
- #
- # When enabling this option, make sure that you do not expect multiple processes
- # using the same credentials at the same time (e.g. web servers spanning
- # multiple machines and/or processes).
- #
- # revoke_previous_client_credentials_token
-
- # Hash access and refresh tokens before persisting them.
- # This will disable the possibility to use +reuse_access_token+
- # since plain values can no longer be retrieved.
- #
- # Note: If you are already a user of doorkeeper and have existing tokens
- # in your installation, they will be invalid without adding 'fallback: :plain'.
- #
- hash_token_secrets
- # By default, token secrets will be hashed using the
- # +Doorkeeper::Hashing::SHA256+ strategy.
- #
- # If you wish to use another hashing implementation, you can override
- # this strategy as follows:
- #
- # hash_token_secrets using: '::Doorkeeper::Hashing::MyCustomHashImpl'
- #
- # Keep in mind that changing the hashing function will invalidate all existing
- # secrets, if there are any.
-
- # Hash application secrets before persisting them.
- #
- # hash_application_secrets
- #
- # By default, applications will be hashed
- # with the +Doorkeeper::SecretStoring::SHA256+ strategy.
- #
- # If you wish to use bcrypt for application secret hashing, uncomment
- # this line instead:
- #
- # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt'
-
- # When the above option is enabled, and a hashed token or secret is not found,
- # you can allow to fall back to another strategy. For users upgrading
- # doorkeeper and wishing to enable hashing, you will probably want to enable
- # the fallback to plain tokens.
- #
- # This will ensure that old access tokens and secrets
- # will remain valid even if the hashing above is enabled.
- #
- # This can be done by adding 'fallback: plain', e.g. :
- #
- # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain
-
- # Issue access tokens with refresh token (disabled by default), you may also
- # pass a block which accepts `context` to customize when to give a refresh
- # token or not. Similar to +custom_access_token_expires_in+, `context` has
- # the following properties:
- #
- # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
- # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
- # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
- #
- use_refresh_token
-
- # Provide support for an owner to be assigned to each registered application (disabled by default)
- # 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: false
-
- # Define access token scopes for your provider
- # For more information go to
- # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
- #
- default_scopes :public, :read_articles
- optional_scopes :write_articles
-
- # Allows to restrict only certain scopes for grant_type.
- # By default, all the scopes will be available for all the grant types.
- #
- # Keys to this hash should be the name of grant_type and
- # values should be the array of scopes for that grant type.
- # Note: scopes should be from configured_scopes (i.e. default or optional)
- #
- # scopes_by_grant_type password: [:write], client_credentials: [:update]
-
- # Forbids creating/updating applications with arbitrary scopes that are
- # not in configuration, i.e. +default_scopes+ or +optional_scopes+.
- # (disabled by default)
- #
- enforce_configured_scopes
-
- # Change the way client credentials are retrieved from the request object.
- # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
- # falls back to the `:client_id` and `:client_secret` params from the `params` object.
- # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
- # for more information on customization
- #
- # client_credentials :from_basic, :from_params
-
- # Change the way access token is authenticated from the request object.
- # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
- # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
- # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
- # for more information on customization
- #
- # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
-
- # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
- # by default in non-development environments). OAuth2 delegates security in
- # communication to the HTTPS protocol so it is wise to keep this enabled.
- #
- # Callable objects such as proc, lambda, block or any object that responds to
- # #call can be used in order to allow conditional checks (to allow non-SSL
- # redirects to localhost for example).
- #
- # force_ssl_in_redirect_uri !Rails.env.development?
- #
- # force_ssl_in_redirect_uri { |uri| uri.host != 'localhost' }
-
- # Specify what redirect URI's you want to block during Application creation.
- # Any redirect URI is whitelisted by default.
- #
- # You can use this option in order to forbid URI's with 'javascript' scheme
- # for example.
- #
- # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' }
-
- # Allows to set blank redirect URIs for Applications in case Doorkeeper configured
- # to use URI-less OAuth grant flows like Client Credentials or Resource Owner
- # Password Credentials. The option is on by default and checks configured grant
- # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri`
- # column for `oauth_applications` database table.
- #
- # You can completely disable this feature with:
- #
- # allow_blank_redirect_uri false
- #
- # Or you can define your custom check:
- #
- # allow_blank_redirect_uri do |grant_flows, client|
- # client.superapp?
- # end
-
- # Specify how authorization errors should be handled.
- # By default, doorkeeper renders json errors when access token
- # is invalid, expired, revoked or has invalid scopes.
- #
- # If you want to render error response yourself (i.e. rescue exceptions),
- # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken
- # or following specific errors:
- #
- # Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired,
- # Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown
- #
- # handle_auth_errors :raise
-
- # Customize token introspection response.
- # Allows to add your own fields to default one that are required by the OAuth spec
- # for the introspection response. It could be `sub`, `aud` and so on.
- # This configuration option can be a proc, lambda or any Ruby object responds
- # to `.call` method and result of it's invocation must be a Hash.
- #
- # custom_introspection_response do |token, context|
- # {
- # "sub": "Z5O3upPC88QrAjx00dis",
- # "aud": "https://protected.example.net/resource",
- # "username": User.find(token.resource_owner_id).username
- # }
- # end
- #
- # or
- #
- # custom_introspection_response CustomIntrospectionResponder
-
- # Specify what grant flows are enabled in array of Strings. The valid
- # strings and the flows they enable are:
- #
- # "authorization_code" => Authorization Code Grant Flow
- # "implicit" => Implicit Grant Flow
- # "password" => Resource Owner Password Credentials Grant Flow
- # "client_credentials" => Client Credentials Grant Flow
- #
- # If not specified, Doorkeeper enables authorization_code and
- # client_credentials.
- #
- # implicit and password grant flows have risks that you should understand
- # before enabling:
- # http://tools.ietf.org/html/rfc6819#section-4.4.2
- # http://tools.ietf.org/html/rfc6819#section-4.4.3
- #
- # grant_flows %w[authorization_code client_credentials]
-
- # Allows to customize OAuth grant flows that +each+ application support.
- # You can configure a custom block (or use a class respond to `#call`) that must
- # return `true` in case Application instance supports requested OAuth grant flow
- # during the authorization request to the server. This configuration +doesn't+
- # set flows per application, it only allows to check if application supports
- # specific grant flow.
- #
- # For example you can add an additional database column to `oauth_applications` table,
- # say `t.array :grant_flows, default: []`, and store allowed grant flows that can
- # be used with this application there. Then when authorization requested Doorkeeper
- # will call this block to check if specific Application (passed with client_id and/or
- # client_secret) is allowed to perform the request for the specific grant type
- # (authorization, password, client_credentials, etc).
- #
- # Example of the block:
- #
- # ->(flow, client) { client.grant_flows.include?(flow) }
- #
- # In case this option invocation result is `false`, Doorkeeper server returns
- # :unauthorized_client error and stops the request.
- #
- # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call
- # @return [Boolean] `true` if allow or `false` if forbid the request
- #
- # allow_grant_flow_for_client do |grant_flow, client|
- # # `grant_flows` is an Array column with grant
- # # flows that application supports
- #
- # client.grant_flows.include?(grant_flow)
- # end
-
- # If you need arbitrary Resource Owner-Client authorization you can enable this option
- # and implement the check your need. Config option must respond to #call and return
- # true in case resource owner authorized for the specific application or false in other
- # cases.
- #
- # Be default all Resource Owners are authorized to any Client (application).
- #
- # authorize_resource_owner_for_client do |client, resource_owner|
- # resource_owner.admin? || client.owners_whitelist.include?(resource_owner)
- # end
-
- # Hook into the strategies' request & response life-cycle in case your
- # application needs advanced customization or logging:
- #
- # before_successful_strategy_response do |request|
- # puts "BEFORE HOOK FIRED! #{request}"
- # end
- #
- # after_successful_strategy_response do |request, response|
- # puts "AFTER HOOK FIRED! #{request}, #{response}"
- # end
-
- # Hook into Authorization flow in order to implement Single Sign Out
- # or add any other functionality. Inside the block you have an access
- # to `controller` (authorizations controller instance) and `context`
- # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth
- # or auth objects with issued token based on hook type (before or after).
- #
- # before_successful_authorization do |controller, context|
- # Rails.logger.info(controller.request.params.inspect)
- #
- # Rails.logger.info(context.pre_auth.inspect)
- # end
- #
- # after_successful_authorization do |controller, context|
- # controller.session[:logout_urls] <<
- # Doorkeeper::Application
- # .find_by(controller.request.params.slice(:redirect_uri))
- # .logout_uri
- #
- # Rails.logger.info(context.auth.inspect)
- # Rails.logger.info(context.issued_token)
- # end
-
- # Under some circumstances you might want to have applications auto-approved,
- # so that the user skips the authorization step.
- # For example if dealing with a trusted application.
- #
- # skip_authorization do |resource_owner, client|
- # client.superapp? or resource_owner.admin?
- # end
-
- # Configure custom constraints for the Token Introspection request.
- # By default this configuration option allows to introspect a token by another
- # token of the same application, OR to introspect the token that belongs to
- # authorized client (from authenticated client) OR when token doesn't
- # belong to any client (public token). Otherwise requester has no access to the
- # introspection and it will return response as stated in the RFC.
- #
- # Block arguments:
- #
- # @param token [Doorkeeper::AccessToken]
- # token to be introspected
- #
- # @param authorized_client [Doorkeeper::Application]
- # authorized client (if request is authorized using Basic auth with
- # Client Credentials for example)
- #
- # @param authorized_token [Doorkeeper::AccessToken]
- # Bearer token used to authorize the request
- #
- # In case the block returns `nil` or `false` introspection responses with 401 status code
- # when using authorized token to introspect, or you'll get 200 with { "active": false } body
- # when using authorized client to introspect as stated in the
- # RFC 7662 section 2.2. Introspection Response.
- #
- # Using with caution:
- # Keep in mind that these three parameters pass to block can be nil as following case:
- # `authorized_client` is nil if and only if `authorized_token` is present, and vice versa.
- # `token` will be nil if and only if `authorized_token` is present.
- # So remember to use `&` or check if it is present before calling method on
- # them to make sure you doesn't get NoMethodError exception.
- #
- # You can define your custom check:
- #
- # allow_token_introspection do |token, authorized_client, authorized_token|
- # if authorized_token
- # # customize: require `introspection` scope
- # authorized_token.application == token&.application ||
- # authorized_token.scopes.include?("introspection")
- # elsif token.application
- # # `protected_resource` is a new database boolean column, for example
- # authorized_client == token.application || authorized_client.protected_resource?
- # else
- # # public token (when token.application is nil, token doesn't belong to any application)
- # true
- # end
- # end
- #
- # Or you can completely disable any token introspection:
- #
- # allow_token_introspection false
- #
- # If you need to block the request at all, then configure your routes.rb or web-server
- # like nginx to forbid the request.
-
- # WWW-Authenticate Realm (default: "Doorkeeper").
- #
- # realm "Doorkeeper"
-end
-
-Doorkeeper::AccessGrant.belongs_to :resource_owner, class_name: "User"
-Doorkeeper::AccessToken.belongs_to :resource_owner, class_name: "User"
-Doorkeeper::Application.has_many :webhook_endpoints, class_name: "Webhook::Endpoint", inverse_of: :oauth_application
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
deleted file mode 100644
index e45f7381b..000000000
--- a/config/locales/doorkeeper.en.yml
+++ /dev/null
@@ -1,140 +0,0 @@
----
-en:
- activerecord:
- attributes:
- doorkeeper/application:
- name: Name
- redirect_uri: Redirect URI
- errors:
- models:
- doorkeeper/application:
- attributes:
- redirect_uri:
- forbidden_uri: is forbidden by the server.
- fragment_present: cannot contain a fragment.
- invalid_uri: must be a valid URI.
- relative_uri: must be an absolute URI.
- secured_uri: must be an HTTPS/SSL URI.
- unspecified_scheme: must specify a scheme.
- scopes:
- not_match_configured: doesn't match configured on the server.
- doorkeeper:
- applications:
- buttons:
- authorize: Authorize
- cancel: Cancel
- destroy: Destroy
- edit: Edit
- submit: Submit
- confirmations:
- destroy: Are you sure?
- edit:
- title: Edit application
- form:
- error: Whoops! Check your form for possible errors
- help:
- blank_redirect_uri: Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI.
- confidential: Application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.
- redirect_uri: Use one line per URI
- scopes: Separate scopes with spaces. Leave blank to use the default scopes.
- index:
- actions: Actions
- callback_url: Callback URL
- confidential: Confidential?
- confidentiality:
- 'no': 'No'
- 'yes': 'Yes'
- name: Name
- new: New Application
- title: Your applications
- new:
- title: New Application
- show:
- actions: Actions
- application_id: UID
- callback_urls: Callback urls
- confidential: Confidential
- not_defined: Not defined
- scopes: Scopes
- secret: Secret
- secret_hashed: Secret hashed
- title: 'Application: %{name}'
- authorizations:
- buttons:
- authorize: Authorize
- deny: Deny
- error:
- title: An error has occurred
- form_post:
- title: Submit this form
- new:
- able_to: This application will be able to
- prompt: Authorize %{client_name} to use your account?
- title: Authorization required
- show:
- title: Authorization code
- authorized_applications:
- buttons:
- revoke: Revoke
- confirmations:
- revoke: Are you sure?
- index:
- application: Application
- created_at: Created At
- date_format: "%Y-%m-%d %H:%M:%S"
- title: Your authorized applications
- errors:
- messages:
- access_denied: The resource owner or authorization server denied the request.
- admin_authenticator_not_configured: Access to admin panel is forbidden due to Doorkeeper.configure.admin_authenticator being unconfigured.
- credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
- forbidden_token:
- missing_scope: Access to this resource requires scope "%{oauth_scopes}".
- invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
- invalid_code_challenge_method: The code challenge method must be plain or S256.
- invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
- invalid_redirect_uri: The requested redirect uri is malformed or doesn't match client redirect URI.
- invalid_request:
- missing_param: 'Missing required parameter: %{value}.'
- request_not_authorized: Request need to be authorized. Required parameter for authorizing request is missing or invalid.
- unknown: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
- invalid_scope: The requested scope is invalid, unknown, or malformed.
- invalid_token:
- expired: The access token expired
- revoked: The access token was revoked
- unknown: The access token is invalid
- resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.
- revoke:
- unauthorized: You are not authorized to revoke this token
- server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request.
- temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
- unauthorized_client: The client is not authorized to perform this request using this method.
- unsupported_grant_type: The authorization grant type is not supported by the authorization server.
- unsupported_response_mode: The authorization server does not support this response mode.
- unsupported_response_type: The authorization server does not support this response type.
- flash:
- applications:
- create:
- notice: Application created.
- destroy:
- notice: Application deleted.
- update:
- notice: Application updated.
- authorized_applications:
- destroy:
- notice: Application revoked.
- layouts:
- admin:
- nav:
- applications: Applications
- home: Home
- oauth2_provider: OAuth2 Provider
- title: Doorkeeper
- application:
- title: OAuth authorization required
- pre_authorization:
- status: Pre-authorization
- scopes:
- public: Access public profile data and published articles
- read_articles: Access all articles including drafts
- write_articles: Access to creating and updating articles
diff --git a/config/routes.rb b/config/routes.rb
index a329ae326..46cccd218 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,10 +1,6 @@
# rubocop:disable Metrics/BlockLength
Rails.application.routes.draw do
- use_doorkeeper do
- controllers tokens: "oauth/tokens"
- end
-
# Devise does not support scoping omniauth callbacks under a dynamic segment
# so this lives outside our i18n scope.
devise_for :users, controllers: {
diff --git a/spec/factories/doorkeeper_access_grants.rb b/spec/factories/doorkeeper_access_grants.rb
deleted file mode 100644
index 02139d9cd..000000000
--- a/spec/factories/doorkeeper_access_grants.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-FactoryBot.define do
- factory :doorkeeper_access_grant, class: "Doorkeeper::AccessGrant" do
- application
- expires_in { 600 }
- redirect_uri { "urn:ietf:wg:oauth:2.0:oob" }
- end
-end
diff --git a/spec/factories/doorkeeper_access_tokens.rb b/spec/factories/doorkeeper_access_tokens.rb
deleted file mode 100644
index 747e51ffd..000000000
--- a/spec/factories/doorkeeper_access_tokens.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-FactoryBot.define do
- factory :doorkeeper_access_token, class: "Doorkeeper::AccessToken" do
- application
- end
-end
diff --git a/spec/factories/doorkeeper_applications.rb b/spec/factories/doorkeeper_applications.rb
deleted file mode 100644
index ccd7e5c6e..000000000
--- a/spec/factories/doorkeeper_applications.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-FactoryBot.define do
- factory :application, class: "Doorkeeper::Application" do
- sequence(:name) { |n| "Project #{n}" }
- sequence(:redirect_uri) { |n| "https://example#{n}.com" }
- secret { SecureRandom.hex(8) }
- uid { SecureRandom.hex(8) }
- end
-end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c1e7253ce..a896719d1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -44,8 +44,6 @@ RSpec.describe User, type: :model do
it { is_expected.to have_one(:notification_setting).dependent(:delete) }
it { is_expected.to have_one(:setting).dependent(:delete) }
- it { is_expected.to have_many(:access_grants).class_name("Doorkeeper::AccessGrant").dependent(:delete_all) }
- it { is_expected.to have_many(:access_tokens).class_name("Doorkeeper::AccessToken").dependent(:delete_all) }
it { is_expected.to have_many(:ahoy_events).class_name("Ahoy::Event").dependent(:delete_all) }
it { is_expected.to have_many(:ahoy_visits).class_name("Ahoy::Visit").dependent(:delete_all) }
it { is_expected.to have_many(:api_secrets).dependent(:delete_all) }
@@ -90,20 +88,6 @@ RSpec.describe User, type: :model do
it { is_expected.to have_many(:webhook_endpoints).class_name("Webhook::Endpoint").dependent(:delete_all) }
# rubocop:disable RSpec/NamedSubject
- it do
- expect(subject).to have_many(:access_grants)
- .class_name("Doorkeeper::AccessGrant")
- .with_foreign_key("resource_owner_id")
- .dependent(:delete_all)
- end
-
- it do
- expect(subject).to have_many(:access_tokens)
- .class_name("Doorkeeper::AccessToken")
- .with_foreign_key("resource_owner_id")
- .dependent(:delete_all)
- end
-
it do
expect(subject).to have_many(:affected_feedback_messages)
.class_name("FeedbackMessage")
diff --git a/spec/models/webhook/endpoint_spec.rb b/spec/models/webhook/endpoint_spec.rb
index 5f7946071..5570e662e 100644
--- a/spec/models/webhook/endpoint_spec.rb
+++ b/spec/models/webhook/endpoint_spec.rb
@@ -10,7 +10,6 @@ RSpec.describe Webhook::Endpoint, type: :model do
describe "validations" do
it { is_expected.to belong_to(:user).inverse_of(:webhook_endpoints) }
- it { is_expected.to belong_to(:oauth_application).inverse_of(:webhook_endpoints).optional }
it { is_expected.to validate_presence_of(:events) }
it { is_expected.to validate_presence_of(:source) }
diff --git a/spec/requests/oauth/tokens_spec.rb b/spec/requests/oauth/tokens_spec.rb
deleted file mode 100644
index 539512b17..000000000
--- a/spec/requests/oauth/tokens_spec.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "Oauth::Tokens", type: :request do
- let(:oauth_app) { create(:application) }
- let(:user) { create(:user) }
- let(:oauth_client) { Doorkeeper::OAuth::Client.new(oauth_app) }
- let(:access_token) { create(:doorkeeper_access_token, application: oauth_app, resource_owner: user) }
- let!(:user_webhook) { create(:webhook_endpoint, user: user, oauth_application: oauth_app) }
- let!(:user_webhook2) { create(:webhook_endpoint, user: user, oauth_application: oauth_app) }
-
- context "when authorization succeeds" do
- # rubocop:disable RSpec/AnyInstance
- before do
- allow_any_instance_of(Doorkeeper::Server).to receive(:client) { oauth_client }
- end
- # rubocop:enable RSpec/AnyInstance
-
- it "destroys webhooks" do
- user2_webhook = create(:webhook_endpoint, oauth_application: oauth_app)
- another_app_webhook = create(:webhook_endpoint)
-
- sidekiq_perform_enqueued_jobs do
- post oauth_revoke_path, params: { token: access_token.token }
- end
- expect(Webhook::Endpoint.find_by(id: user_webhook.id)).to be_nil
- expect(Webhook::Endpoint.find_by(id: user_webhook2.id)).to be_nil
- expect(user2_webhook.reload).to be_persisted
- expect(another_app_webhook.reload).to be_persisted
- end
-
- it "returns 200" do
- post oauth_revoke_path, params: { token: access_token.token }
-
- expect(response.status).to eq 200
- end
-
- it "revokes the access token" do
- post oauth_revoke_path, params: { token: access_token.token }
-
- expect(access_token.reload).to have_attributes(revoked?: true)
- end
- end
-
- context "when authorization fails" do
- let(:some_other_client) { create(:application, confidential: true) }
- let(:oauth_client) { Doorkeeper::OAuth::Client.new(some_other_client) }
-
- it "returns 403" do
- post oauth_revoke_path, params: { token: access_token.token }
-
- expect(response.status).to eq 403
- end
-
- it "does not revoke the access token" do
- post oauth_revoke_path, params: { token: access_token.token }
-
- expect(access_token.reload).to have_attributes(revoked?: false)
- end
-
- it "doesn't destroy webhooks" do
- sidekiq_perform_enqueued_jobs do
- post oauth_revoke_path, params: { token: access_token.token }
- end
- expect(user_webhook.reload).to be_persisted
- expect(user_webhook2.reload).to be_persisted
- end
- end
-end
diff --git a/spec/support/initializers/doorkeeper.rb b/spec/support/initializers/doorkeeper.rb
deleted file mode 100644
index 34f31f2fe..000000000
--- a/spec/support/initializers/doorkeeper.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Doorkeeper.configure do
- # hash_token_secrets on its own won't work in test
- hash_token_secrets fallback: :plain
-end
diff --git a/spec/workers/webhook/destroy_worker_spec.rb b/spec/workers/webhook/destroy_worker_spec.rb
index 4cc824f67..42f1d3027 100644
--- a/spec/workers/webhook/destroy_worker_spec.rb
+++ b/spec/workers/webhook/destroy_worker_spec.rb
@@ -2,14 +2,13 @@ require "rails_helper"
RSpec.describe Webhook::DestroyWorker, type: :worker do
let(:user) { create(:user) }
- let(:oauth_app) { create(:application) }
- let!(:webhook_endpoint) { create(:webhook_endpoint, user: user, oauth_application: oauth_app) }
- let!(:other_webhook_endpoint) { create(:webhook_endpoint, oauth_application: oauth_app) }
+ let!(:webhook_endpoint) { create(:webhook_endpoint, user: user) }
+ let!(:other_webhook_endpoint) { create(:webhook_endpoint) }
let(:worker) { subject }
describe "#perform_now" do
- it "destroys webhook by user_id and app_id" do
- worker.perform(user.id, oauth_app.id)
+ xit "destroys webhook by user_id and app_id" do
+ worker.perform(user.id)
expect(Webhook::Endpoint.find_by(id: webhook_endpoint.id)).to be_nil
expect(other_webhook_endpoint.reload).to be_present
end
diff --git a/vendor/cache/doorkeeper-5.5.4.gem b/vendor/cache/doorkeeper-5.5.4.gem
deleted file mode 100644
index fd1c2214c..000000000
Binary files a/vendor/cache/doorkeeper-5.5.4.gem and /dev/null differ