Merge remote-tracking branch 'origin/main' into FYST-2219-change-linter-to-standard-rb-with-github-action

Author: anisharamnani

.env.development

@@ -4,3 +4,7 @@
 #    a. "secrets" module: initialize the key-value pair with empty value, then fill out the value for the key via AWS Secrets Manager
 #    b. "web" and "workers" module: in environment_secrets or environment_variables and
 SSN_HASHING_KEY="development-hash-key"
+
+TWILIO_AUTH_TOKEN="fake_auth_token"
+TWILIO_ACCOUNT_SID="fake_account_sid"
+TWILIO_MESSAGING_SERVICE="fake_service_sid"

.github/workflows/deploy-to-production.yml

@@ -6,7 +6,7 @@ on:
       release_type:
         description: 'Part of version to increment (major, minor, patch)'
         required: true
-        default: 'patch'
+        default: 'minor'
         type: choice
         options: [patch, minor, major]
       release_title:
@@ -120,7 +120,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Notify Slack
-        uses: slackapi/slack-github-action@v1.24.0
+        uses: slackapi/slack-github-action@v2.1.1
         if: success()
         with:
           payload: ${{ steps.slack_payload.outputs.payload }}
@@ -203,7 +203,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
       - name: Notify deploy success on Slack
-        uses: slackapi/slack-github-action@v1.24.0
+        uses: slackapi/slack-github-action@v2.1.1
         if: success()
         with:
           payload: |

Gemfile

@@ -6,7 +6,7 @@ gem "rails", "~> 8.0.2"
 gem "propshaft"
 gem "pg"
 gem "rails-i18n"
-gem "valid_email2", "~> 4.0.6"
+gem "valid_email2", "~> 7.0.13"
 gem "phony"
 gem "auto_strip_attributes"
 gem "devise"
@@ -24,16 +24,16 @@ gem "stimulus-rails"
 # Build JSON APIs with ease [https://github.com/rails/jbuilder]
 gem "jbuilder"
 gem "cfa-styleguide", "0.17.1", git: "https://github.com/codeforamerica/honeycrisp-gem", branch: "main", ref: "40a4356dd217dacfba82a7b92010111999954c91"
-
+gem "delayed_job_active_record"
+gem "delayed_job_web"
 # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
 # gem "bcrypt", "~> 3.1.7"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[windows jruby]
+gem "tzinfo-data", platforms: %i[ windows jruby ]
 
 # Use the database-backed adapters for Rails.cache, Active Job, and Action Cable
 gem "solid_cache"
-gem "solid_queue"
 gem "solid_cable"
 
 gem "aws-sdk-s3", require: false
@@ -49,7 +49,7 @@ gem "thruster", require: false
 
 group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
-  gem "debug", platforms: %i[mri windows], require: "debug/prelude"
+  gem "debug", platforms: %i[ mri windows ], require: "debug/prelude"
 
   # Static analysis for security vulnerabilities [https://brakemanscanner.org/]
   gem "brakeman", require: false
@@ -77,3 +77,4 @@ end
 
 gem "dartsass-rails", "~> 0.5.1"
 gem "http_accept_language"
+gem "twilio-ruby"

Gemfile.lock

@@ -145,6 +145,16 @@ GEM
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
+    delayed_job (4.1.13)
+      activesupport (>= 3.0, < 9.0)
+    delayed_job_active_record (4.1.11)
+      activerecord (>= 3.0, < 9.0)
+      delayed_job (>= 3.0, < 5)
+    delayed_job_web (1.4.4)
+      activerecord (> 3.0.0)
+      delayed_job (> 2.0.3)
+      rack-protection (>= 1.5.5)
+      sinatra (>= 1.4.4)
     devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -156,8 +166,6 @@ GEM
     drb (2.2.3)
     erb (5.0.2)
     erubi (1.13.1)
-    et-orbi (1.2.11)
-      tzinfo
     execjs (2.10.0)
     factory_bot (6.5.4)
       activesupport (>= 6.1.0)
@@ -180,9 +188,6 @@ GEM
     ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
-    fugit (1.11.1)
-      et-orbi (~> 1, >= 1.2.11)
-      raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (4.31.1)
@@ -227,6 +232,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.13.0)
+    jwt (2.10.2)
+      base64
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -253,6 +260,8 @@ GEM
     minitest (5.25.5)
     msgpack (1.8.0)
     multipart-post (2.4.1)
+    mustermann (3.0.4)
+      ruby2_keywords (~> 0.0.1)
     net-http (0.6.0)
       uri
     net-imap (0.5.9)
@@ -308,9 +317,12 @@ GEM
     public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
-    raabro (1.4.0)
     racc (1.8.1)
     rack (3.1.16)
+    rack-protection (4.1.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -415,6 +427,7 @@ GEM
       rubocop-performance (>= 1.24)
       rubocop-rails (>= 2.30)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -444,6 +457,13 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
+      tilt (~> 2.0)
     solid_cable (3.0.11)
       actioncable (>= 7.2)
       activejob (>= 7.2)
@@ -453,13 +473,6 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.2.0)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      concurrent-ruby (>= 1.3.1)
-      fugit (~> 1.11.0)
-      railties (>= 7.1)
-      thor (~> 1.3.1)
     standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
@@ -481,19 +494,24 @@ GEM
     thruster (0.1.14-arm64-darwin)
     thruster (0.1.14-x86_64-darwin)
     thruster (0.1.14-x86_64-linux)
+    tilt (2.6.1)
     timeout (0.4.3)
     turbo-rails (2.0.16)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
+    twilio-ruby (7.7.0)
+      faraday (>= 0.9, < 3.0)
+      jwt (>= 1.5, < 3.0)
+      nokogiri (>= 1.6, < 2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
     useragent (0.16.11)
-    valid_email2 (4.0.6)
-      activemodel (>= 3.2)
+    valid_email2 (7.0.13)
+      activemodel (>= 6.0)
       mail (~> 2.5)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -535,6 +553,8 @@ DEPENDENCIES
   cfa-styleguide (= 0.17.1)!
   dartsass-rails (~> 0.5.1)
   debug
+  delayed_job_active_record
+  delayed_job_web
   devise
   dotenv
   factory_bot_rails
@@ -555,13 +575,13 @@ DEPENDENCIES
   selenium-webdriver
   solid_cable
   solid_cache
-  solid_queue
   standard (>= 1.35.1)
   stimulus-rails
   thruster
   turbo-rails
+  twilio-ruby
   tzinfo-data
-  valid_email2 (~> 4.0.6)
+  valid_email2 (~> 7.0.13)
   web-console
 
 BUNDLED WITH

app/assets/images/FYST_email_logo.png

@@ -8,28 +8,27 @@ def setup_contact
   end
 
   def edit
-    @form = VerificationCodeForm.new(contact_info: @contact_info)
+    @form = VerificationCodeForm.new(contact_info: @contact_info, contact_preference: current_archived_intake.contact_preference)
     case current_archived_intake.contact_preference
     when "text"
-      # @phone_number = current_archived_intake.phone_number
-      # ArchivedIntakeTextVerificationCodeJob.perform_later(
-      #   phone_number: @phone_number,
-      #   locale: I18n.locale
-      # )
+      @phone_number = current_archived_intake.phone_number
+      TextMessageVerificationCodeJob.perform_later(
+        phone_number: @phone_number,
+        locale: I18n.locale
+      )
     when "email"
-      # @email_address = current_archived_intake.email_address
-      # ArchivedIntakeEmailVerificationCodeJob.perform_later(
-      #   email_address: @email_address,
-      #   locale: I18n.locale
-      # )
+      @email_address = current_archived_intake.email_address
+      EmailVerificationCodeJob.perform_later(
+        email_address: @email_address,
+        locale: I18n.locale
+      )
     else
       redirect_to root_path
     end
   end
 
   def update
-    @form = VerificationCodeForm.new(verification_code_form_params, contact_info: current_archived_intake.contact)
-
+    @form = VerificationCodeForm.new(verification_code_form_params, contact_info: current_archived_intake.contact, contact_preference: current_archived_intake.contact_preference)
     if @form.valid?
       # standard:disable Style/IdenticalConditionalBranches
       case current_archived_intake.contact_preference

app/controllers/verification_code_controller.rb

@@ -1,23 +1,27 @@
 class VerificationCodeForm < Form
-  attr_accessor :verification_code, :contact_info
+  attr_accessor :verification_code, :contact_info, :contact_preference
 
   validates :verification_code, presence: true
-  def initialize(attributes = {}, contact_info: nil)
+  def initialize(attributes = {}, contact_info: nil, contact_preference: nil)
     super(attributes)
     @contact_info = contact_info
+    @contact_preference = contact_preference
   end
 
   def valid?
     return true if Rails.configuration.allow_magic_verification_code && verification_code == "000000"
 
-    # hashed_verification_code = VerificationCodeService.hash_verification_code_with_contact_info(@email_address, verification_code)
-    #
-    # valid_code = EmailAccessToken.lookup(hashed_verification_code).exists?
-
-    valid_code = nil
+    hashed_verification_code = VerificationCodeService.hash_verification_code_with_contact_info(@contact_info, verification_code)
+    valid_code = case contact_preference
+    when "text"
+                   TextMessageAccessToken.lookup(hashed_verification_code).exists?
+    when "email"
+                   EmailAccessToken.lookup(hashed_verification_code).exists?
+    else
+                   false
+    end
 
     errors.add(:verification_code, I18n.t("errors.attributes.verification_code.invalid")) unless valid_code
-
     valid_code.present?
   end
 end

app/forms/verification_code_form.rb

@@ -1,4 +1,7 @@
 class ApplicationJob < ActiveJob::Base
+  PRIORITY_HIGH = 10
+  PRIORITY_MEDIUM = 50
+  PRIORITY_LOW = 100
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked
 

app/jobs/application_job.rb

@@ -0,0 +1,19 @@
+class EmailVerificationCodeJob < ApplicationJob
+  retry_on Mailgun::CommunicationError
+
+  def perform(email_address:, locale:)
+    EmailVerificationCodeService.request_code(
+      email_address: email_address,
+      locale: locale
+    )
+
+    Rails.logger.info "[EmailVerificationCodeJob] Successfully completed for: #{email_address}"
+  rescue => e
+    Rails.logger.error "[EmailVerificationCodeJob] Failed for: #{email_address} — Error: #{e.class} - #{e.message}"
+    raise
+  end
+
+  def priority
+    PRIORITY_HIGH - 1 # Subtracting one to push to the top of the queue
+  end
+end

app/jobs/email_verification_code_job.rb

@@ -0,0 +1,17 @@
+class TextMessageVerificationCodeJob < ApplicationJob
+  def perform(phone_number:, locale:)
+    TextMessageVerificationCodeService.request_code(
+      phone_number: phone_number,
+      locale: locale
+    )
+
+    Rails.logger.info "[TextMessageVerificationCodeJob] Successfully completed for: #{phone_number}"
+  rescue => e
+    Rails.logger.error "[TextMessageVerificationCodeJob] Failed for: #{phone_number} — Error: #{e.class} - #{e.message}"
+    raise
+  end
+
+  def priority
+    PRIORITY_HIGH - 1 # Subtracting one to push to the top of the queue
+  end
+end