Merge branch 'main' of github.com:devcongress/hackathon

Author: bubunyo

.env.local.template

@@ -8,4 +8,6 @@
 GOOGLE_CLIENT_ID=GOOGLE_CLIENT_ID
 GOOGLE_CLIENT_SECRET=GOOGLE_CLIENT_SECRET
 GITHUB_CLIENT_ID=GITHUB_CLIENT_ID
-GITHUB_CLIENT_SECRET=GITHUB_CLIENT_SECRET
+GITHUB_CLIENT_SECRET=GITHUB_CLIENT_SECRET
+
+POSTMARK_API_TOKEN=POSTMARK_API_TOKEN

Gemfile

@@ -98,10 +98,12 @@ gem "rotp", "~> 6.3"
 
 gem "rqrcode", "~> 3.1"
 
-gem "dockerfile-rails", ">= 1.7", :group => :development
+gem "dockerfile-rails", ">= 1.7", group: :development
 
 gem "pg", "~> 1.6"
 
 gem "litestream", "~> 0.14.0"
 
-gem "aws-sdk-s3", "~> 1.199", :require => false
+gem "aws-sdk-s3", "~> 1.199", require: false
+
+gem "postmark-rails", "~> 0.22.1"

Gemfile.lock

@@ -378,7 +378,7 @@ GEM
       phlexi-display
       phlexi-field (~> 0.2.0)
       zeitwerk
-    plutonium (0.26.9)
+    plutonium (0.26.10)
       action_policy (~> 0.7.0)
       listen (~> 3.8)
       pagy (~> 9.0)
@@ -398,6 +398,11 @@ GEM
       tailwind_merge
       tty-prompt (~> 0.23.1)
       zeitwerk
+    postmark (1.25.1)
+      json
+    postmark-rails (0.22.1)
+      actionmailer (>= 3.0.0)
+      postmark (>= 1.21.3, < 2.0)
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
@@ -664,6 +669,7 @@ DEPENDENCIES
   omniauth-google-oauth2 (~> 1.2)
   pg (~> 1.6)
   plutonium
+  postmark-rails (~> 0.22.1)
   propshaft
   puma (>= 5.0)
   rails (~> 8.0.1)

app/definitions/profile_definition.rb

@@ -4,4 +4,16 @@ class ProfileDefinition < ::ResourceDefinition
 
   edit_page_title "Edit Your Profile"
   index_page_title "Team Members"
+
+  class Form < Form
+    private
+
+    def render_actions
+      input name: "return_to", value: request.params[:return_to], type: :hidden, hidden: true
+
+      actions_wrapper {
+        render submit_button
+      }
+    end
+  end
 end

app/rodauth/admin_rodauth_plugin.rb

@@ -150,9 +150,12 @@ class AdminRodauthPlugin < RodauthPlugin
     # Or only remember users that have ticked a "Remember Me" checkbox on login.
     # after_login { remember_login if param_or_nil("remember") }
 
-    # Extend user's remember period when remembered via a cookie
+    # Extend  user's remember period when remembered via a cookie
     extend_remember_deadline? true
 
+    # Use separate session key for admin authentication
+    session_key "_admin_session"
+
     # Store the user's remember cookie under a namespace
     remember_cookie_key "_admin_remember"
 

app/rodauth/hacker_rodauth_plugin.rb

@@ -17,15 +17,6 @@ class HackerRodauthPlugin < RodauthPlugin
       :login,
       :remember,
       :logout,
-      :create_account,
-      :verify_account,
-      :verify_account_grace_period,
-      :reset_password,
-      :reset_password_notify,
-      :change_login,
-      :verify_login_change,
-      :change_password,
-      :change_password_notify,
       :case_insensitive_login,
       :internal_request
     )
@@ -47,9 +38,6 @@ class HackerRodauthPlugin < RodauthPlugin
     # Change prefix of table and foreign key column names from default "account"
     accounts_table :hackers
     remember_table :hacker_remember_keys
-    reset_password_table :hacker_password_reset_keys
-    verify_account_table :hacker_verification_keys
-    verify_login_change_table :hacker_login_change_keys
 
     # The secret key used for hashing public-facing tokens for various features.
     # Defaults to Rails `secret_key_base`, but you can use your own secret key.
@@ -73,7 +61,6 @@ class HackerRodauthPlugin < RodauthPlugin
     # Change some default param keys.
     login_param "email"
     login_label "Email"
-    # password_confirm_param "confirm_password"
 
     # Redirect back to originally requested location after authentication.
     login_return_to_requested_location? true
@@ -92,39 +79,6 @@ class HackerRodauthPlugin < RodauthPlugin
     # Requires the JSON feature
     # only_json? false
 
-    # ==> Emails
-    # Use a custom mailer for delivering authentication emails.
-
-    create_reset_password_email do
-      Rodauth::HackerMailer.reset_password(self.class.configuration_name,
-        account_id, reset_password_key_value)
-    end
-
-    create_verify_account_email do
-      Rodauth::HackerMailer.verify_account(self.class.configuration_name,
-        account_id, verify_account_key_value)
-    end
-
-    create_verify_login_change_email do |_login|
-      Rodauth::HackerMailer.verify_login_change(
-        self.class.configuration_name,
-        account_id,
-        verify_login_change_key_value
-      )
-    end
-
-    create_password_changed_email do
-      Rodauth::HackerMailer.change_password_notify(
-        self.class.configuration_name, account_id
-      )
-    end
-
-    create_reset_password_notify_email do
-      Rodauth::HackerMailer.reset_password_notify(
-        self.class.configuration_name, account_id
-      )
-    end
-
     send_email do |email|
       # queue email delivery on the mailer after the transaction commits
       db.after_commit { email.deliver_later }
@@ -152,7 +106,7 @@ class HackerRodauthPlugin < RodauthPlugin
     # ==> Passwords
 
     # Passwords shorter than 8 characters are considered weak according to OWASP.
-    password_minimum_length 8
+    # password_minimum_length 8
 
     # Custom password complexity requirements (alternative to password_complexity feature).
     # password_meets_requirements? do |password|
@@ -182,6 +136,9 @@ class HackerRodauthPlugin < RodauthPlugin
     # Extend user's remember period when remembered via a cookie
     extend_remember_deadline? true
 
+    # Use separate session key for hacker authentication
+    session_key "_hacker_session"
+
     # Store the user's remember cookie under a namespace
     remember_cookie_key "_hacker_remember"
 
@@ -211,24 +168,24 @@ class HackerRodauthPlugin < RodauthPlugin
     #   Profile.find_by!(account_id: account_id).destroy
     # end
 
-    create_account_route "register"
-
     # ==> Redirects
 
-    # Redirect to home after login.
-    create_account_redirect "/hacker_dashboard"
+    # Ensure auto-login after omniauth account creation
+    omniauth_create_account? true
+
+    # Redirect to dashboard after omniauth login/create (user is auto-logged in)
+    after_omniauth_create_account do
+      # Explicitly login if not already logged in
+      login_session(account_id) unless logged_in?
+      redirect "/hacker_dashboard"
+    end
 
     # Redirect to home after login.
     login_redirect "/hacker_dashboard"
 
     # Redirect to home page after logout.
-    logout_redirect "/"
-
-    # Redirect to wherever login redirects to after account verification.
-    verify_account_redirect { login_redirect }
+    logout_redirect "/hacker_dashboard"
 
-    # Redirect to login page after password reset.
-    reset_password_redirect { login_path }
     # ==> Deadlines
     # Change default deadlines for some actions.
     # verify_account_grace_period 3.days.to_i

app/views/rodauth/hacker/_login_form.html.erb

@@ -2,12 +2,12 @@
 <h1
   class="
     text-md leading-tight tracking-tight text-gray-900 md:text-lg dark:text-white
-    text-center
+    text-center hidden
   "
 >
   Sign in to your account
 </h1>
-<%= form_with url: rodauth(:hacker).login_path, method: :post, data: { turbo: false }, class: "space-y-4" do |form| %>
+<%= form_with url: rodauth(:hacker).login_path, method: :post, data: { turbo: false }, class: "space-y-4 hidden" do |form| %>
   <div>
     <%= form.label "login",
                rodauth(:hacker).login_label,

app/views/rodauth/hacker/_omniauth_links.html.erb

@@ -27,7 +27,7 @@
   <%= @google_text %>
 <% end %>
 
-<div class="flex items-center my-4">
+<div class="flex items-center my-4 hidden">
   <div class="flex-grow border-t border-gray-300"></div>
   <span class="px-4 dark:text-white text-gray-700">or</span>
   <div class="flex-grow border-t border-gray-300"></div>

config/environments/production.rb

@@ -60,14 +60,9 @@
   # Set host to be used by links generated in mailer templates.
   config.action_mailer.default_url_options = {host: "hack25.devcongress.io"}
 
-  # Specify outgoing SMTP server. Remember to add smtp/* credentials via rails credentials:edit.
-  config.action_mailer.smtp_settings = {
-    user_name: "apikey",
-    password: ENV["SENDGRID_API_KEY"],
-    address: "smtp.sendgrid.net",
-    port: 587,
-    authentication: :plain,
-    enable_starttls_auto: true
+  config.action_mailer.delivery_method = :postmark
+  config.action_mailer.postmark_settings = {
+    api_token: ENV["POSTMARK_API_TOKEN"]
   }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to

config/initializers/001_ensure_required_env.rb

@@ -5,8 +5,11 @@
 
 if Rails.env.production?
   required_env_vars += %w[
-    RAILS_MASTER_KEY
+    RAILS_MASTER_KEY DATABASE_URL
+    POSTMARK_API_TOKEN
+    GOOGLE_CLIENT_ID GOOGLE_CLIENT_SECRET
   ]
+  # GITHUB_CLIENT_ID GITHUB_CLIENT_SECRET
 end
 
 # Add additional env vars here