linked_rails-auth 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdac2ac7b1c19172bd134b16bb0a68b37d0e3554dbe2fa81758a8979ca978b16
-  data.tar.gz: f5a06a7413a6ea914343bb2e30c4777768772ecbde68550f3ac7185cdc346438
+  metadata.gz: 0a53fa6c27c504534477bb37b6b7d5d147e1c98a6c6c87d5370b78b8359b9439
+  data.tar.gz: 8c15e3103885126daf13bb4dc4ed162caaf86e935182ab10110e0e6ab18fc89d
 SHA512:
-  metadata.gz: a74b845b028974e126b38cfc146869118d090337d9fde50558135294e9e9b377484e9a00f27855976fe0e1ebe42ce0e87992706f25f4199cbd1cabb30ae012ac
-  data.tar.gz: 99e7c1594200bcd42df838e537af3071f3664e855500041d781aeda362e7f7c77c620dbbb52bac74f8d4b329ed814994eeb160e37e685783913fca83f0f7f807
+  metadata.gz: d86610473276dc2d3068b74d3b2e28769573e03bccbd5993b728ccb7955bc6a97f86e1077c7384f517fe6c36ee41275cef92a12d34180d962ccc30bdd575f451
+  data.tar.gz: 925ffe6ec29358d29275131576587899951f688d56f0d165f89ead10e86ab14c51218938da1e7a48539acc17dce2df132d6031954aeb29ab0e5efd89d0a82015

data/app/controllers/linked_rails/auth/access_tokens_controller.rb

@@ -3,6 +3,14 @@
 module LinkedRails
   module Auth
     class AccessTokensController < Doorkeeper::TokensController # rubocop:disable Metrics/ClassLength
+      include LinkedRails::Controller
+
+      controller_class LinkedRails.access_token_class
+      has_singular_create_action(
+        type: [Vocab.ontola['Create::Auth::AccessToken'], Vocab.schema.CreateAction],
+        target_url: -> { LinkedRails.iri(path: '/login') }
+      )
+
       def create
         headers.merge!(authorize_response.headers)
 
@@ -49,8 +57,9 @@ module LinkedRails
         error = get_error_response_from_exception(exception)
         headers.merge!(error.headers)
         Bugsnag.notify(exception)
-        Rails.logger.info(error.body.merge(class: exception.class.name).to_json)
-        self.response_body = error.body.merge(class: exception.class.name).to_json
+        klass = exception.class.name.demodulize.underscore.upcase
+        self.response_body = error.body.merge(code: klass).to_json
+        Rails.logger.info(self.response_body)
         self.status = error.status
       end
 
@@ -120,12 +129,6 @@ module LinkedRails
         token_with_errors.errors.add(field, exception.message)
         token_with_errors
       end
-
-      class << self
-        def controller_class
-          LinkedRails.access_token_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/confirmations_controller.rb

@@ -3,7 +3,15 @@
 module LinkedRails
   module Auth
     class ConfirmationsController < Devise::ConfirmationsController
-      active_response :show, :update
+      include LinkedRails::Controller
+
+      controller_class LinkedRails.confirmation_class
+      active_response :show
+      has_singular_create_action(
+        form: -> { resource.class.try(:form_class) },
+        type: [Vocab.ontola['Create::Auth::Confirmation'], Vocab.schema.CreateAction]
+      )
+      has_singular_update_action(form: -> { nil })
 
       private
 
@@ -76,12 +84,6 @@ module LinkedRails
           notice: find_message(:confirmed)
         )
       end
-
-      class << self
-        def controller_class
-          LinkedRails.confirmation_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/otp_attempts_controller.rb

@@ -3,6 +3,11 @@
 module LinkedRails
   module Auth
     class OtpAttemptsController < LinkedRails.controller_parent_class
+      controller_class LinkedRails.otp_attempt_class
+      has_singular_create_action(
+        type: Vocab.schema[:CreateAction]
+      )
+
       private
 
       def create_success
@@ -10,12 +15,6 @@ module LinkedRails
 
         head 200
       end
-
-      class << self
-        def controller_class
-          LinkedRails.otp_attempt_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/otp_secrets_controller.rb

@@ -3,7 +3,17 @@
 module LinkedRails
   module Auth
     class OtpSecretsController < LinkedRails.controller_parent_class
+      controller_class LinkedRails.otp_secret_class
       active_response :show
+      has_singular_create_action(
+        type: Vocab.schema[:CreateAction]
+      )
+      has_resource_destroy_action(
+        description: -> { I18n.t('actions.otp_secrets.destroy.description', name: resource.owner.email) }
+      )
+      has_singular_destroy_action(
+        description: -> { I18n.t('actions.otp_secrets.destroy.description', name: resource.owner.email) }
+      )
 
       private
 
@@ -29,12 +39,6 @@ module LinkedRails
 
         super.merge(active: true)
       end
-
-      class << self
-        def controller_class
-          LinkedRails.otp_secret_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/passwords_controller.rb

@@ -3,8 +3,16 @@
 module LinkedRails
   module Auth
     class PasswordsController < Devise::PasswordsController
+      include LinkedRails::Controller
+
       skip_before_action :require_no_authentication, only: :create
 
+      controller_class LinkedRails.password_class
+      has_singular_create_action(
+        type: [Vocab.ontola['Create::Auth::Password'], Vocab.schema.CreateAction]
+      )
+      has_singular_update_action(label: nil)
+
       private
 
       def after_sending_reset_password_instructions_path_for(_resource_name)
@@ -15,6 +23,8 @@ module LinkedRails
         LinkedRails.iri(path: '/u/session/new').path
       end
 
+      def assert_reset_token_passed; end
+
       def create_execute
         @current_resource = resource_class.send_reset_password_instructions(resource_params)
         successfully_sent?(current_resource)
@@ -52,12 +62,6 @@ module LinkedRails
       def update_success_location
         after_resetting_password_path_for(current_resource)
       end
-
-      class << self
-        def controller_class
-          LinkedRails.password_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/registrations_controller.rb

@@ -3,8 +3,13 @@
 module LinkedRails
   module Auth
     class RegistrationsController < Devise::RegistrationsController
+      include LinkedRails::Controller
+
       skip_before_action :assert_is_devise_resource!, only: :show
+
+      controller_class LinkedRails.registration_class
       active_response :show
+      has_singular_create_action
 
       private
 
@@ -22,12 +27,6 @@ module LinkedRails
       def resource_params
         params.require(permit_param_key)
       end
-
-      class << self
-        def controller_class
-          LinkedRails.registration_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/sessions_controller.rb

@@ -2,8 +2,11 @@
 
 module LinkedRails
   module Auth
-    class SessionsController < ApplicationController
-      active_response :create
+    class SessionsController < LinkedRails.controller_parent_class
+      controller_class LinkedRails.session_class
+      has_singular_create_action(
+        type: [Vocab.ontola['Create::Auth::Session'], Vocab.schema.CreateAction]
+      )
 
       private
 
@@ -40,16 +43,6 @@ module LinkedRails
       def permit_params
         params.require(:session).permit(:redirect_url, :email)
       end
-
-      def r_param
-        new_resource_params[:redirect_url] || (params.key?(:session) ? permit_params[:redirect_url] : nil)
-      end
-
-      class << self
-        def controller_class
-          LinkedRails.session_class
-        end
-      end
     end
   end
 end

data/app/controllers/linked_rails/auth/unlocks_controller.rb

@@ -3,6 +3,12 @@
 module LinkedRails
   module Auth
     class UnlocksController < Devise::UnlocksController
+      controller_class LinkedRails.unlock_class
+      has_singular_create_action(
+        form: -> { resource.class.try(:form_class) }
+      )
+      has_singular_update_action
+
       private
 
       def after_sending_unlock_instructions_path_for(_resource)
@@ -33,12 +39,6 @@ module LinkedRails
         params.fetch(resource_name, nil) ||
           params.fetch(controller_name.singularize, {})
       end
-
-      class << self
-        def controller_class
-          LinkedRails.unlock_class
-        end
-      end
     end
   end
 end

data/app/forms/linked_rails/auth/otp_secret_form.rb

@@ -4,7 +4,6 @@ module LinkedRails
   module Auth
     class OtpSecretForm < LinkedRails.form_parent_class
       resource :provision_image,
-               description: -> { I18n.t('otp_secrets.properties.provision_image.description') },
                path: Vocab.schema.image
       field :otp_attempt, description: '', min_count: 1
     end

data/app/helpers/linked_rails/auth/otp_helper.rb

@@ -4,7 +4,7 @@ module LinkedRails
   module Auth
     module OtpHelper
       def handle_expired_session
-        raise LinkedRails::Auth::Errors::Expired, I18n.t('messages.otp_secrets.expired')
+        raise LinkedRails::Auth::Errors::Expired, I18n.t('actions.otp_secrets.errors.expired')
       end
 
       def session_from_param(session_param)

data/app/models/linked_rails/auth/access_token.rb

@@ -3,10 +3,6 @@
 module LinkedRails
   module Auth
     class AccessToken < LinkedRails::Resource
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Singularable
-
       attr_accessor :email, :redirect_url, :password
       alias root_relative_iri root_relative_singular_iri
 
@@ -15,10 +11,6 @@ module LinkedRails
       end
 
       class << self
-        def action_list
-          LinkedRails.access_token_action_list_class
-        end
-
         def form_class
           LinkedRails.access_token_form_class
         end

data/app/models/linked_rails/auth/confirmation.rb

@@ -3,10 +3,6 @@
 module LinkedRails
   module Auth
     class Confirmation < LinkedRails::Resource
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Updatable
-      enhance LinkedRails::Enhancements::Singularable
       attr_accessor :confirmation_token, :email, :user, :password_token
       alias root_relative_iri root_relative_singular_iri
 
@@ -15,10 +11,10 @@ module LinkedRails
       end
 
       def confirm!
-        owner!.confirm
+        user!.confirm
       end
 
-      delegate :confirmed?, to: :owner!
+      delegate :confirmed?, to: :user!
 
       def singular_iri_opts
         {confirmation_token: confirmation_token}
@@ -28,15 +24,11 @@ module LinkedRails
         LinkedRails.iri
       end
 
-      def owner!
-        owner || raise(ActiveRecord::RecordNotFound)
+      def user!
+        user || raise(ActiveRecord::RecordNotFound)
       end
 
       class << self
-        def action_list
-          LinkedRails.confirmation_action_list_class
-        end
-
         def form_class
           LinkedRails.confirmation_form_class
         end
@@ -45,10 +37,6 @@ module LinkedRails
           Vocab.ontola
         end
 
-        def singular_iri_template
-          @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?confirmation_token}")
-        end
-
         def requested_singular_resource(params, _user_context)
           return new unless params.key?(:confirmation_token)
 
@@ -61,6 +49,10 @@ module LinkedRails
           )
         end
 
+        def singular_iri_template
+          @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?confirmation_token}")
+        end
+
         def singular_route_key
           'u/confirmation'
         end

data/app/models/linked_rails/auth/otp_attempt.rb

@@ -3,13 +3,12 @@
 module LinkedRails
   module Auth
     class OtpAttempt < OtpBase
-      def raise_on_persisting(_opts = {})
+      def raise_on_persisting(**_opts)
         raise "#{self.class.name} should not be persisted"
       end
       ActiveRecord::Persistence.instance_methods.each do |method|
         alias_method method, :raise_on_persisting unless method.to_s.include?('?')
       end
-
       alias root_relative_iri root_relative_singular_iri
 
       def save

data/app/models/linked_rails/auth/otp_base.rb

@@ -6,10 +6,6 @@ module LinkedRails
       self.table_name = 'otp_secrets'
       self.abstract_class = true
 
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Singularable
-
       extend OtpHelper
       include OtpHelper
 
@@ -21,29 +17,29 @@ module LinkedRails
 
       attr_accessor :encoded_session, :otp_attempt
 
+      def singular_iri_opts
+        {session: encoded_session}
+      end
+
       private
 
       def decoded_session
         @decoded_session ||= session_from_param(encoded_session)
       end
 
-      def singular_iri_opts
-        {session: encoded_session}
-      end
-
       def validate_otp_attempt
         return if persisted? && authenticate_otp(otp_attempt, drift: LinkedRails::Auth.otp_drift)
 
-        errors.add(:otp_attempt, I18n.t('messages.otp_secrets.invalid'))
+        errors.add(:otp_attempt, I18n.t('actions.otp_secrets.errors.invalid'))
       end
 
       class << self
         def iri_template
-          @iri_template ||= URITemplate.new("/#{route_key}{/id}{?session}{#fragment}")
+          @iri_template ||= URITemplate.new("/#{route_key}{/id}{#fragment}")
         end
 
         def singular_iri_template
-          @singular_iri_template ||= URITemplate.new("{/parent_iri*}/#{singular_route_key}{?session}{#fragment}")
+          @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?session}{#fragment}")
         end
 
         def owner_for_otp(params, user_context)

data/app/models/linked_rails/auth/otp_secret.rb

@@ -5,8 +5,6 @@ require 'rqrcode'
 module LinkedRails
   module Auth
     class OtpSecret < OtpBase
-      enhance LinkedRails::Enhancements::Destroyable
-
       validate :validate_otp_attempt, on: %i[update]
 
       def image

data/app/models/linked_rails/auth/password.rb

@@ -3,18 +3,14 @@
 module LinkedRails
   module Auth
     class Password < LinkedRails::Resource
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Updatable
-      enhance LinkedRails::Enhancements::Singularable
       attr_accessor :email, :password, :password_confirmation, :user, :reset_password_token
       alias root_relative_iri root_relative_singular_iri
 
-      class << self
-        def action_list
-          LinkedRails.password_action_list_class
-        end
+      def singular_iri_opts
+        {reset_password_token: reset_password_token}
+      end
 
+      class << self
         def decrypt_token(token)
           Devise.token_generator.digest(self, :reset_password_token, token)
         end
@@ -41,6 +37,10 @@ module LinkedRails
         def singular_route_key
           'u/password'
         end
+
+        def singular_iri_template
+          @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?reset_password_token}")
+        end
       end
     end
   end

data/app/models/linked_rails/auth/registration.rb

@@ -3,17 +3,13 @@
 module LinkedRails
   module Auth
     class Registration < LinkedRails.user_class
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Singularable
-
       attr_accessor :redirect_url
 
-      class << self
-        def action_list
-          LinkedRails.registration_action_list_class
-        end
+      def singular_iri_opts
+        {redirect_url: redirect_url}
+      end
 
+      class << self
         def form_class
           LinkedRails.registration_form_class
         end
@@ -22,14 +18,14 @@ module LinkedRails
           Vocab.ontola
         end
 
-        def iri_template
-          LinkedRails.user_class.iri_template
-        end
-
         def requested_singular_resource(_params, user_context)
           build_new(user_context: user_context)
         end
 
+        def singular_iri_template
+          @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?redirect_url}")
+        end
+
         def singular_route_key
           'u/registration'
         end

data/app/models/linked_rails/auth/session.rb

@@ -3,23 +3,14 @@
 module LinkedRails
   module Auth
     class Session < LinkedRails::Resource
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Destroyable
-      enhance LinkedRails::Enhancements::Singularable
-      alias root_relative_iri root_relative_singular_iri
-
       attr_accessor :email, :redirect_url
+      alias root_relative_iri root_relative_singular_iri
 
       def singular_iri_opts
         {redirect_url: redirect_url}
       end
 
       class << self
-        def action_list
-          LinkedRails.session_action_list_class
-        end
-
         def form_class
           LinkedRails.session_form_class
         end
@@ -31,7 +22,6 @@ module LinkedRails
         def singular_iri_template
           @singular_iri_template ||= URITemplate.new("/#{singular_route_key}{?redirect_url}")
         end
-        alias iri_template singular_iri_template
 
         def requested_singular_resource(params, _user_context)
           new(redirect_url: params[:redirect_url])

data/app/models/linked_rails/auth/unlock.rb

@@ -3,10 +3,6 @@
 module LinkedRails
   module Auth
     class Unlock < LinkedRails::Resource
-      enhance LinkedRails::Enhancements::Actionable
-      enhance LinkedRails::Enhancements::Creatable
-      enhance LinkedRails::Enhancements::Updatable, except: %i[Serializer]
-      enhance LinkedRails::Enhancements::Singularable
       attr_accessor :email, :unlock_token, :user
       alias root_relative_iri root_relative_singular_iri
 
@@ -19,10 +15,6 @@ module LinkedRails
       end
 
       class << self
-        def action_list
-          LinkedRails.unlock_action_list_class
-        end
-
         def decrypt_token(token)
           Devise.token_generator.digest(self, :unlock_token, token)
         end

data/app/policies/linked_rails/auth/otp_secret_policy.rb

@@ -10,7 +10,7 @@ module LinkedRails
       end
 
       def create?
-        return forbid_with_message(I18n.t('messages.otp_secrets.already_exists')) if user_context.otp_active?
+        return forbid_with_message(I18n.t('actions.otp_secrets.errors.already_exists')) if user_context.otp_active?
 
         user_context.guest? || current_user?
       end
@@ -18,7 +18,7 @@ module LinkedRails
       def destroy?
         raise(ActiveRecord::RecordNotFound) unless administrate_otp? || current_user?
 
-        return forbid_with_message(I18n.t('messages.otp_secrets.not_activated')) unless record.active?
+        return forbid_with_message(I18n.t('actions.otp_secrets.errors.not_activated')) unless record.active?
 
         current_user? || administrate_otp?
       end

data/app/serializers/linked_rails/auth/otp_attempt_serializer.rb

@@ -3,10 +3,9 @@
 module LinkedRails
   module Auth
     class OtpAttemptSerializer < LinkedRails.serializer_parent_class
-      attribute :otp_attempt,
-                predicate: LinkedRails.app_ns[:otp],
-                datatype: RDF::XSD[:integer],
-                if: method(:never)
+      secret_attribute :otp_attempt,
+                       predicate: Vocab.app[:otp],
+                       datatype: RDF::XSD[:integer]
     end
   end
 end

data/app/serializers/linked_rails/auth/otp_secret_serializer.rb

@@ -3,12 +3,13 @@
 module LinkedRails
   module Auth
     class OtpSecretSerializer < LinkedRails.serializer_parent_class
-      attribute :otp_attempt,
-                predicate: LinkedRails.app_ns[:otp],
-                datatype: RDF::XSD[:integer],
-                if: method(:never)
-      attribute :active, predicate: LinkedRails.app_ns[:otpActive]
-      has_one :image, predicate: Vocab.schema.image
+      secret_attribute :otp_attempt,
+                       predicate: Vocab.app[:otp],
+                       datatype: RDF::XSD[:integer]
+      attribute :active, predicate: Vocab.ontola[:otpActive]
+      has_one :image,
+              predicate: Vocab.schema.image,
+              serializer: LinkedRails::MediaObjectSerializer
     end
   end
 end

data/app/serializers/linked_rails/auth/password_serializer.rb

@@ -4,14 +4,12 @@ module LinkedRails
   module Auth
     class PasswordSerializer < LinkedRails.serializer_parent_class
       attribute :email, predicate: Vocab.schema.email, datatype: RDF::XSD[:string]
-      attribute :password,
-                predicate: Vocab.ontola[:password],
-                datatype: Vocab.ontola['datatype/password'],
-                if: method(:never)
-      attribute :password_confirmation,
-                predicate: Vocab.ontola[:passwordConfirmation],
-                datatype: Vocab.ontola['datatype/password'],
-                if: method(:never)
+      secret_attribute :password,
+                       predicate: Vocab.ontola[:password],
+                       datatype: Vocab.ontola['datatype/password']
+      secret_attribute :password_confirmation,
+                       predicate: Vocab.ontola[:passwordConfirmation],
+                       datatype: Vocab.ontola['datatype/password']
       attribute :reset_password_token, predicate: Vocab.ontola[:resetPasswordToken], datatype: RDF::XSD[:string]
     end
   end

data/lib/generators/linked_rails/auth/install_generator.rb

@@ -23,6 +23,7 @@ module LinkedRails
         update_user_model
         insert_doorkeeper
         create_doorkeeper_app
+        inject_controller_include
 
         readme 'README'
       end
@@ -77,16 +78,16 @@ module LinkedRails
         uncomment_lines file, 'use_refresh_token'
 
         replace_doorkeeper_line(
-          '# default_scopes  :public',
-          'default_scopes  :guest'
+          'default_scopes  :public',
+          '  default_scopes :guest'
         )
         replace_doorkeeper_line(
-          '# optional_scopes :write, :update',
-          'optional_scopes  :user'
+          'optional_scopes :write, :update',
+          '  optional_scopes :user'
         )
         replace_doorkeeper_line(
-          '# grant_flows %w[authorization_code client_credentials]',
-          'grant_flows %w[client_credentials authorization_code password]'
+          'grant_flows %w\[authorization_code client_credentials\]',
+          '  grant_flows %w[client_credentials authorization_code password]'
         )
         replace_doorkeeper_line("resource_owner_authenticator do\n(.*?)end\n", authentication, true)
       end

data/lib/generators/linked_rails/auth/templates/locales.yml

@@ -1,5 +1,9 @@
 en:
   actions:
+    access_tokens:
+      create:
+        label: "Sign in"
+        submit: "Send"
     confirmations:
       create:
         label: "Send confirmation link again"
@@ -9,6 +13,7 @@ en:
         submit: "Confirm"
     otp_attempts:
       create:
+        label: 'Two factor authentication'
         submit: "Continue"
     otp_secrets:
       create:
@@ -19,6 +24,25 @@ en:
         description: "Are you sure you want to disable the two factor authentication of **%{name}**?"
         submit: "Confirm"
         success: "Two factor authentication is disabled"
+      errors:
+        invalid: "The authentication code is incorrect."
+        not_activated: "Two factor authentication is not yet activated."
+        already_exists: "Two factor authentication is already activated."
+        create:
+          success: "Welcome back!"
+        expired: "The request expired. Please try logging in again."
+    passwords:
+      create:
+        label: 'Send password reset link'
+        submit: "Send"
+    registrations:
+      create:
+        label: 'Register'
+        submit: "Continue"
+    sessions:
+      create:
+        label: 'Sign in or register'
+        submit: "Continue"
   devise:
     failure:
       invalid_email: 'We couldn''t find a user with this email.'

data/lib/linked_rails/auth/errors/unknown_email.rb

@@ -4,7 +4,7 @@ module LinkedRails
   module Auth
     module Errors
       class UnknownEmail < Doorkeeper::Errors::InvalidGrantReuse
-        def initialize(_options = {})
+        def initialize(**_options)
           message = I18n.t('devise.failure.invalid_email')
           super(message)
         end

data/lib/linked_rails/auth/errors/wrong_password.rb

@@ -4,7 +4,7 @@ module LinkedRails
   module Auth
     module Errors
       class WrongPassword < Doorkeeper::Errors::InvalidGrantReuse
-        def initialize(_options = {})
+        def initialize(**_options)
           message = I18n.t('devise.failure.invalid_password')
           super(message)
         end

data/lib/linked_rails/auth/routes.rb

@@ -22,43 +22,41 @@ module LinkedRails
         unlocks: 'linked_rails/auth/unlocks'
       }.freeze
 
-      def use_linked_rails_auth(opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        linked_rails_doorkeeper_routes(opts)
-        linked_rails_device_routes(opts)
+      def use_linked_rails_auth(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        linked_rails_doorkeeper_routes(**opts)
+        linked_rails_device_routes(**opts)
 
         scope 'u' do
           get 'sign_in', to: redirect('/u/session/new')
         end
         devise_scope :user do
-          auth_resource(AccessToken, opts)
-          auth_resource(Confirmation, opts)
-          auth_resource(OtpAttempt, opts)
-          auth_resource(OtpSecret, opts)
+          auth_resource(LinkedRails.access_token_class, **opts)
+          auth_resource(LinkedRails.confirmation_class, **opts)
+          auth_resource(LinkedRails.otp_attempt_class, **opts)
+          auth_resource(LinkedRails.otp_secret_class, **opts)
           linked_resource(
-            OtpSecret,
-            controller: opts[:otp_secrets] || LINKED_RAILS_CONTROLLERS[:otp_secrets],
-            nested: false
+            LinkedRails.otp_secret_class,
+            controller: opts[:otp_secrets] || LINKED_RAILS_CONTROLLERS[:otp_secrets]
           )
-          auth_resource(Password, opts)
-          auth_resource(Registration, opts)
-          auth_resource(Session, opts)
-          auth_resource(Unlock, opts)
+          auth_resource(LinkedRails.password_class, **opts)
+          auth_resource(LinkedRails.registration_class, **opts)
+          auth_resource(LinkedRails.session_class, **opts)
+          auth_resource(LinkedRails.unlock_class, **opts)
         end
       end
 
       private
 
-      def auth_resource(klass, opts)
+      def auth_resource(klass, **opts)
         key = klass.name.demodulize.tableize.to_sym
 
         singular_linked_resource(
           klass,
-          controller: opts[key] || LINKED_RAILS_CONTROLLERS[key],
-          nested: false
+          controller: opts[key] || LINKED_RAILS_CONTROLLERS[key]
         )
       end
 
-      def linked_rails_device_routes(opts)
+      def linked_rails_device_routes(**opts)
         devise_for(
           opts[:devise_scope] || :users,
           path: :u,
@@ -69,7 +67,7 @@ module LinkedRails
         )
       end
 
-      def linked_rails_doorkeeper_routes(opts)
+      def linked_rails_doorkeeper_routes(**opts)
         use_doorkeeper do
           DOORKEEPER_CONTROLLERS.each do |linked_rails_key, doorkeeper_key|
             if opts.key?(linked_rails_key)

data/lib/linked_rails/auth/version.rb

@@ -2,6 +2,6 @@
 
 module LinkedRails
   module Auth
-    VERSION = '0.0.2'
+    VERSION = '0.0.4'
   end
 end

data/lib/linked_rails/auth.rb

@@ -20,27 +20,19 @@ end
 LinkedRails.configurable_class(nil, :user, default: 'User')
 LinkedRails.configurable_class(nil, :guest_user, default: 'LinkedRails::Auth::GuestUser')
 LinkedRails.configurable_class(nil, :access_token, default: 'LinkedRails::Auth::AccessToken')
-LinkedRails.configurable_class(nil, :access_token_action_list, default: 'LinkedRails::Auth::AccessTokenActionList')
 LinkedRails.configurable_class(nil, :access_token_form, default: 'LinkedRails::Auth::AccessTokenForm')
 LinkedRails.configurable_class(nil, :confirmation, default: 'LinkedRails::Auth::Confirmation')
-LinkedRails.configurable_class(nil, :confirmation_action_list, default: 'LinkedRails::Auth::ConfirmationActionList')
 LinkedRails.configurable_class(nil, :confirmation_form, default: 'LinkedRails::Auth::ConfirmationForm')
 LinkedRails.configurable_class(nil, :password, default: 'LinkedRails::Auth::Password')
-LinkedRails.configurable_class(nil, :password_action_list, default: 'LinkedRails::Auth::PasswordActionList')
 LinkedRails.configurable_class(nil, :password_form, default: 'LinkedRails::Auth::PasswordForm')
 LinkedRails.configurable_class(nil, :registration, default: 'LinkedRails::Auth::Registration')
-LinkedRails.configurable_class(nil, :registration_action_list, default: 'LinkedRails::Auth::RegistrationActionList')
 LinkedRails.configurable_class(nil, :registration_form, default: 'LinkedRails::Auth::RegistrationForm')
 LinkedRails.configurable_class(nil, :session, default: 'LinkedRails::Auth::Session')
-LinkedRails.configurable_class(nil, :session_action_list, default: 'LinkedRails::Auth::SessionActionList')
 LinkedRails.configurable_class(nil, :session_form, default: 'LinkedRails::Auth::SessionForm')
 LinkedRails.configurable_class(nil, :unlock, default: 'LinkedRails::Auth::Unlock')
-LinkedRails.configurable_class(nil, :unlock_action_list, default: 'LinkedRails::Auth::UnlockActionList')
 LinkedRails.configurable_class(nil, :unlock_form, default: 'LinkedRails::Auth::UnlockForm')
 LinkedRails.configurable_class(nil, :otp_attempt, default: 'LinkedRails::Auth::OtpAttempt')
-LinkedRails.configurable_class(nil, :otp_attempt_action_list, default: 'LinkedRails::Auth::OtpAttemptActionList')
 LinkedRails.configurable_class(nil, :otp_attempt_form, default: 'LinkedRails::Auth::OtpAttemptForm')
 LinkedRails.configurable_class(nil, :otp_owner, default: 'User')
 LinkedRails.configurable_class(nil, :otp_secret, default: 'LinkedRails::Auth::OtpSecret')
-LinkedRails.configurable_class(nil, :otp_secret_action_list, default: 'LinkedRails::Auth::OtpSecretActionList')
 LinkedRails.configurable_class(nil, :otp_secret_form, default: 'LinkedRails::Auth::OtpSecretForm')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_rails-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_otp
@@ -160,14 +160,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/actions/linked_rails/auth/access_token_action_list.rb
-- app/actions/linked_rails/auth/confirmation_action_list.rb
-- app/actions/linked_rails/auth/otp_attempt_action_list.rb
-- app/actions/linked_rails/auth/otp_secret_action_list.rb
-- app/actions/linked_rails/auth/password_action_list.rb
-- app/actions/linked_rails/auth/registration_action_list.rb
-- app/actions/linked_rails/auth/session_action_list.rb
-- app/actions/linked_rails/auth/unlock_action_list.rb
 - app/controllers/linked_rails/auth/access_tokens_controller.rb
 - app/controllers/linked_rails/auth/confirmations_controller.rb
 - app/controllers/linked_rails/auth/otp_attempts_controller.rb
@@ -250,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Easily use devise and doorkeeper in LinkedRails projects

data/app/actions/linked_rails/auth/access_token_action_list.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class AccessTokenActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.access_token_class
-      end
-
-      has_singular_create_action(
-        type: [Vocab.ontola['Create::Auth::AccessToken'], Vocab.schema.CreateAction],
-        url: -> { LinkedRails.iri(path: '/login') }
-      )
-    end
-  end
-end

data/app/actions/linked_rails/auth/confirmation_action_list.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class ConfirmationActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.confirmation_class
-      end
-
-      has_singular_create_action(
-        form: -> { resource.class.try(:form_class) },
-        type: [Vocab.ontola['Create::Auth::Confirmation'], Vocab.schema.CreateAction]
-      )
-      has_singular_update_action(form: -> { nil })
-    end
-  end
-end

data/app/actions/linked_rails/auth/otp_attempt_action_list.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class OtpAttemptActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.otp_attempt_class
-      end
-
-      has_singular_create_action(type: Vocab.schema[:CreateAction])
-    end
-  end
-end

data/app/actions/linked_rails/auth/otp_secret_action_list.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class OtpSecretActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.otp_secret_class
-      end
-
-      has_singular_create_action(
-        type: Vocab.schema[:CreateAction],
-        url: lambda {
-          LinkedRails.iri(
-            path: 'u/otp_secret',
-            query: {session: resource.encoded_session}.compact.to_param.presence
-          )
-        },
-        root_relative_iri: lambda {
-          RDF::URI(
-            path: '/u/otp_secret/new',
-            query: {session: resource.encoded_session}.compact.to_param.presence
-          )
-        }
-      )
-
-      has_singular_destroy_action(
-        description: -> { I18n.t('actions.otp_secrets.destroy.description', name: resource.owner.display_name) }
-      )
-    end
-  end
-end

data/app/actions/linked_rails/auth/password_action_list.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class PasswordActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.password_class
-      end
-
-      has_singular_create_action(
-        type: [Vocab.ontola['Create::Auth::Password'], Vocab.schema.CreateAction]
-      )
-
-      has_singular_update_action(
-        label: nil,
-        root_relative_iri: lambda {
-          RDF::URI(
-            path: '/u/password/edit',
-            query: {reset_password_token: resource.reset_password_token}.compact.to_param.presence
-          )
-        }
-      )
-    end
-  end
-end

data/app/actions/linked_rails/auth/registration_action_list.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class RegistrationActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.registration_class
-      end
-
-      has_singular_create_action(
-        root_relative_iri: '/u/registration/new'
-      )
-    end
-  end
-end

data/app/actions/linked_rails/auth/session_action_list.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class SessionActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.session_class
-      end
-
-      has_singular_create_action(
-        root_relative_iri: lambda {
-          uri = resource.root_relative_iri.dup
-          uri.path ||= ''
-          uri.path += '/new'
-          uri.query = {redirect_url: resource.redirect_url}.compact.to_param.presence
-          uri.to_s
-        },
-        type: [Vocab.ontola['Create::Auth::Session'], Vocab.schema.CreateAction]
-      )
-    end
-  end
-end

data/app/actions/linked_rails/auth/unlock_action_list.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module LinkedRails
-  module Auth
-    class UnlockActionList < LinkedRails.action_list_parent_class
-      def self.actionable_class
-        LinkedRails.unlock_class
-      end
-
-      has_singular_create_action(
-        form: -> { resource.class.try(:form_class) }
-      )
-
-      has_singular_update_action
-    end
-  end
-end