diff --git a/.rubocop.yml b/.rubocop.yml index 0028949ba..c58c913dd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -16,9 +16,18 @@ AllCops: Layout/EndAlignment: EnforcedStyleAlignWith: variable +Layout/LineLength: + Exclude: + - myapp/db/**/*.rb + - myapp/config/initializers/devise.rb + Lint/AmbiguousBlockAssociation: Exclude: - - "spec/**/*" + - spec/**/* + +Lint/EmptyBlock: + Exclude: + - spec/**/* Lint/SuppressedException: Enabled: true @@ -34,10 +43,14 @@ Metrics/CyclomaticComplexity: Metrics/MethodLength: Max: 13 + Exclude: + - myapp/db/**/*.rb + - myapp/config/initializers/devise.rb Metrics/BlockLength: Enabled: true Exclude: + - "myapp/db/**/*.rb" - "**/spec/**/*.rb" - "**/*.rake" - "Rakefile" diff --git a/Rakefile b/Rakefile index e40e47a2c..2e339d5d4 100644 --- a/Rakefile +++ b/Rakefile @@ -72,7 +72,7 @@ namespace :appraisal do end desc "Runs rspec for older appraisals than sidekiq 6" - task :pre_sidekiq_6 do + task :pre_sidekiq6 do sh("bundle exec appraisal sidekiq-4.0 rspec") sh("bundle exec appraisal sidekiq-4.1 rspec") sh("bundle exec appraisal sidekiq-4.2 rspec") @@ -82,7 +82,7 @@ namespace :appraisal do end desc "Runs rspec for appraisals containing sidekiq 6 or greater" - task :post_sidekiq_6 do + task :post_sidekiq6 do sh("bundle exec appraisal sidekiq-6.0 rspec") sh("bundle exec appraisal sidekiq-develop rspec") end diff --git a/lib/sidekiq_unique_jobs/web.rb b/lib/sidekiq_unique_jobs/web.rb index c52f9e24e..8db079068 100644 --- a/lib/sidekiq_unique_jobs/web.rb +++ b/lib/sidekiq_unique_jobs/web.rb @@ -1,11 +1,5 @@ # frozen_string_literal: true -begin - require "sidekiq/web" -rescue LoadError - # client-only usage -end - require_relative "web/helpers" module SidekiqUniqueJobs @@ -59,8 +53,7 @@ def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize end end -if defined?(Sidekiq::Web) - Sidekiq::Web.register SidekiqUniqueJobs::Web - Sidekiq::Web.tabs["Locks"] = "locks" - Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "locales") -end +require "sidekiq/web" unless defined?(Sidekiq::Web) +Sidekiq::Web.register(SidekiqUniqueJobs::Web) +Sidekiq::Web.tabs["Locks"] = "locks" +Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "locales") diff --git a/myapp/.rubocop.yml b/myapp/.rubocop.yml index 709f7ad1c..032e80634 100644 --- a/myapp/.rubocop.yml +++ b/myapp/.rubocop.yml @@ -7,3 +7,8 @@ require: inherit_mode: merge: - Exclude + +AllCops: + Exclude: + - 'bin/*' + - '**/.keep' diff --git a/myapp/Gemfile b/myapp/Gemfile index 7293911f2..3049ee2d1 100644 --- a/myapp/Gemfile +++ b/myapp/Gemfile @@ -2,10 +2,11 @@ source "https://rubygems.org" -ruby "2.6.6" +ruby "2.7.2" gem "bigdecimal" gem "coverband" +gem "devise" gem "hiredis" gem "json" gem "pg" @@ -13,7 +14,7 @@ gem "puma" gem "rack-protection" gem "rails", ">= 6.0" gem "redis" -gem "sidekiq", "~> 6.0.0" +gem "sidekiq", "~> 6.1" gem "sidekiq-cron" gem "sidekiq-global_id" gem "sidekiq-status" @@ -22,7 +23,6 @@ gem "sinatra" gem "slim-rails" group :development, :test do - gem "capybara" gem "dotenv-rails" gem "factory_bot_rails" gem "fuubar" @@ -30,8 +30,16 @@ group :development, :test do gem "pry-byebug" gem "pry-rails" gem "rspec-rails" +end + +group :development do gem "rubocop" + gem "rubocop-mhenrixon" gem "rubocop-performance" gem "rubocop-rails" gem "rubocop-rspec" end + +group :test do + gem "capybara" +end diff --git a/myapp/app/models/user.rb b/myapp/app/models/user.rb new file mode 100644 index 000000000..de731d6d6 --- /dev/null +++ b/myapp/app/models/user.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class User < ApplicationRecord + # Include default devise modules. Others available are: + # + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable, + :confirmable, :lockable, :timeoutable, :trackable # , :omniauthable +end diff --git a/myapp/app/views/layouts/application.html.slim b/myapp/app/views/layouts/application.html.slim index 6e5ebd050..cee09aa97 100644 --- a/myapp/app/views/layouts/application.html.slim +++ b/myapp/app/views/layouts/application.html.slim @@ -2,12 +2,12 @@ doctype html html head title MyApp - / = stylesheet_link_tag 'application', media: 'all' - / = javascript_include_tag 'application' = csrf_meta_tags body ul#top-menu li.menu-item - = link_to 'Issue 384', issue_384_path + = link_to 'Sign in', new_user_session_path + li.menu-item + = link_to 'Sign out', destroy_user_session_path, method: :delete = yield diff --git a/myapp/app/workers/until_executed_job.rb b/myapp/app/workers/until_executed_job.rb index 02215fb56..f3c2fa0db 100644 --- a/myapp/app/workers/until_executed_job.rb +++ b/myapp/app/workers/until_executed_job.rb @@ -4,6 +4,7 @@ class UntilExecutedJob include Sidekiq::Worker sidekiq_options lock: :until_executed, + lock_info: true, lock_timeout: 0, lock_ttl: 0, lock_limit: 5 diff --git a/myapp/config/application.rb b/myapp/config/application.rb index 4aea04e62..60248889a 100644 --- a/myapp/config/application.rb +++ b/myapp/config/application.rb @@ -9,12 +9,10 @@ # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -$stdout.sync = true - module MyApp class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 5.0 + config.load_defaults 6.1 config.time_zone = "CET" # Settings in config/environments/* take precedence over those specified here. diff --git a/myapp/config/environments/development.rb b/myapp/config/environments/development.rb index 54278188e..83842c7d0 100644 --- a/myapp/config/environments/development.rb +++ b/myapp/config/environments/development.rb @@ -6,10 +6,10 @@ # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - config.cache_classes = true + config.cache_classes = false # Do not eager load code on boot. - config.eager_load = true + config.eager_load = false # Show full error reports. config.consider_all_requests_local = true @@ -34,8 +34,8 @@ config.active_storage.service = :local # Don't care if the mailer can't send. + config.action_mailer.default_url_options = { host: "localhost", port: 3000 } config.action_mailer.raise_delivery_errors = false - config.action_mailer.perform_caching = false # Print deprecation notices to the Rails logger. diff --git a/myapp/config/initializers/devise.rb b/myapp/config/initializers/devise.rb new file mode 100644 index 000000000..7f526e2e5 --- /dev/null +++ b/myapp/config/initializers/devise.rb @@ -0,0 +1,311 @@ +# frozen_string_literal: true + +# Assuming you have not yet modified this file, each configuration option below +# is set to its default value. Note that some are commented out while others +# are not: uncommented lines are intended to protect your configuration from +# breaking changes in upgrades (i.e., in the event that future versions of +# Devise change the default values for those options). +# +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '75321f807ac11bd1fc76159f332d9ddaac8f214b37697cf8c4ee1f89a387eeb2a28d10adca37bf38d50f00812ba22627e19b0627e48ad7797f7533beab302635' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = "hello@mhenrixon.com" + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require "devise/orm/active_record" + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. + # For API-only applications to support authentication "out-of-the-box", you will likely want to + # enable this with :database unless you are using a custom strategy. + # The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 12. If + # using other algorithms, it sets how many times you want the password to be hashed. + # The number of stretches used for generating the hashed password are stored + # with the hashed password. This allows you to change the stretches without + # invalidating existing passwords. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 12 + + # Set up a pepper to generate the hashed password. + # config.pepper = '7055767daa7b5a9efd31f02b200d9660cf8fff0f83d1eb12e06055cc488f355dd72ddffe384388dea0a5c349e66b4ea4049a0f9e6bd8ae72aa027311c4a324ba' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. + # You can also set it to nil, which will allow the user to access the website + # without confirming their account. + # Default is 0.days, meaning the user cannot access the website without + # confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end + + # ==> Configuration for :registerable + + # When set to false, does not sign a user in automatically after their password is + # changed. Defaults to true, so a user is signed in automatically after changing a password. + # config.sign_in_after_change_password = true +end diff --git a/myapp/config/locales/devise.en.yml b/myapp/config/locales/devise.en.yml new file mode 100644 index 000000000..ab1f07060 --- /dev/null +++ b/myapp/config/locales/devise.en.yml @@ -0,0 +1,65 @@ +# Additional translations at https://github.com/heartcombo/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address." + updated: "Your account has been updated successfully." + updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again" + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/myapp/config/routes.rb b/myapp/config/routes.rb index bbba672ca..82e67e47b 100644 --- a/myapp/config/routes.rb +++ b/myapp/config/routes.rb @@ -1,9 +1,12 @@ # frozen_string_literal: true Rails.application.routes.draw do - require "sidekiq_unique_jobs/web" - # require 'sidekiq-status/web' - mount Sidekiq::Web, at: "/sidekiq" + devise_for :users + authenticate :user, ->(u) { u.admin? } do + require "sidekiq/web" + require "sidekiq_unique_jobs/web" + mount Sidekiq::Web, at: "/sidekiq" + end mount Coverband::Reporters::Web.new, at: "/coverage" get "issues/:id" => "issues#show" diff --git a/myapp/config/initializers/sidekiq.rb b/myapp/config/sidekiq.rb similarity index 100% rename from myapp/config/initializers/sidekiq.rb rename to myapp/config/sidekiq.rb diff --git a/myapp/db/migrate/20210115105735_devise_create_users.rb b/myapp/db/migrate/20210115105735_devise_create_users.rb new file mode 100644 index 000000000..3da051be3 --- /dev/null +++ b/myapp/db/migrate/20210115105735_devise_create_users.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +class DeviseCreateUsers < ActiveRecord::Migration[6.1] + def change + create_table :users do |t| + t.boolean :admin, default: false + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + t.string :confirmation_token + t.datetime :confirmed_at + t.datetime :confirmation_sent_at + t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + t.string :unlock_token # Only if unlock strategy is :email or :both + t.datetime :locked_at + + t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + add_index :users, :confirmation_token, unique: true + add_index :users, :unlock_token, unique: true + end +end diff --git a/myapp/db/schema.rb b/myapp/db/schema.rb index 19e09a3da..8ed33e2b3 100644 --- a/myapp/db/schema.rb +++ b/myapp/db/schema.rb @@ -4,15 +4,15 @@ # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. # -# This file is the source Rails uses to define your schema when running `rails -# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to # be faster and is potentially less error prone than running all of your # migrations from scratch. Old migrations may fail to apply correctly if those # migrations use external dependencies or application code. # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_191_126_063_911) do +ActiveRecord::Schema.define(version: 20_210_115_105_735) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,4 +24,31 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false end + + create_table "users", force: :cascade do |t| + t.boolean "admin", default: false + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.string "confirmation_token" + t.datetime "confirmed_at" + t.datetime "confirmation_sent_at" + t.string "unconfirmed_email" + t.integer "failed_attempts", default: 0, null: false + t.string "unlock_token" + t.datetime "locked_at" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true + end end diff --git a/myapp/db/seeds.rb b/myapp/db/seeds.rb index c8774b737..4487cf332 100644 --- a/myapp/db/seeds.rb +++ b/myapp/db/seeds.rb @@ -1,8 +1,10 @@ # frozen_string_literal: true + # This file should contain all the record creation needed to seed the database with its default values. # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). # # Examples: # # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) +user = User.create(email: "mikael@mhenrixon.com", password: "Abc123!!", password_confirmation: "Abc123!!", admin: true) +user.confirm diff --git a/myapp/spec/factories/users.rb b/myapp/spec/factories/users.rb new file mode 100644 index 000000000..b3ba5105b --- /dev/null +++ b/myapp/spec/factories/users.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :user do + sequence(:email) { |n| "mikael#{n}@mhenrixon.com" } + password { "Abc123!!" } + password_confirmation { "Abc123!!" } + + trait :confirmed do + after(:create) do |instance, _evaluator| + instance.confirm + end + end + end +end diff --git a/myapp/spec/models/user_spec.rb b/myapp/spec/models/user_spec.rb new file mode 100644 index 000000000..47d6a3650 --- /dev/null +++ b/myapp/spec/models/user_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe User, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/sidekiq_unique_jobs/configuration_spec.rb b/spec/sidekiq_unique_jobs/configuration_spec.rb index 237707dcc..5d5fcd639 100644 --- a/spec/sidekiq_unique_jobs/configuration_spec.rb +++ b/spec/sidekiq_unique_jobs/configuration_spec.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +# rubocop:disable RSpec/FilePath RSpec.describe SidekiqUniqueJobs do describe "define custom lock strategies" do subject(:middleware_call) do @@ -64,3 +65,4 @@ def lock end end end +# rubocop:enable RSpec/FilePath