Merge tag 'v1.50.13' into dev-tbyte

Author: antt1995

Gemfile

@@ -74,7 +74,7 @@ gem "cssbundling-rails", "~> 1.4"
 gem "terser", "~> 1.2"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem "bootstrap"
-gem "json", "~> 2.9" # Legacy carry-over
+gem "json", "~> 2.10" # Legacy carry-over
 
 # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
 gem "turbo-rails"

Gemfile.lock

@@ -97,16 +97,17 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1046.0)
-    aws-sdk-core (3.217.1)
+    aws-partitions (1.1049.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.97.0)
+    aws-sdk-kms (1.98.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.179.0)
+    aws-sdk-s3 (1.180.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -137,7 +138,7 @@ GEM
     bootstrap (5.3.3)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
-    brakeman (6.2.2)
+    brakeman (7.0.0)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -303,7 +304,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.9.1)
+    json (2.10.1)
     jwt (2.10.1)
       base64
     kaminari (1.2.2)
@@ -368,14 +369,14 @@ GEM
       railties (>= 7.1)
       stimulus-rails
       turbo-rails
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     mysql2 (0.5.6)
     net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -399,7 +400,7 @@ GEM
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -474,7 +475,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.11.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)
@@ -490,7 +491,7 @@ GEM
       railties (>= 5.2)
     retriable (3.1.2)
     rexml (3.4.0)
-    rollbar (3.6.0)
+    rollbar (3.6.1)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -659,7 +660,7 @@ DEPENDENCIES
   i18n-tasks (~> 1.0.14)
   invisible_captcha (~> 2.3)
   jbuilder
-  json (~> 2.9)
+  json (~> 2.10)
   kaminari (~> 1.2)
   kramdown
   listen

VERSION

@@ -1 +1 @@
-1.50.11
+1.50.13

app/assets/stylesheets/application.bootstrap.scss

@@ -1,4 +1,5 @@
 $accordion-color: #fff;
+$color-mode-type: media-query;
 
 @use "@fontsource/roboto";
 @use "@fontsource/roboto-slab";

app/controllers/users/sessions_controller.rb

@@ -20,6 +20,17 @@ class Users::SessionsController < Devise::SessionsController
   #   super
   # end
 
+  # after_sign_out_path_for
+  #
+  # This method is called after the user has signed out.
+  # Ensure the session data is cleared and the session cookie is deleted.
+  #
+  def after_sign_out_path_for(resource_or_scope)
+    reset_session  # Explicitly clear the session data
+    cookies.delete("_PasswordPusher_session") # Delete the session cookie
+    root_path      # Redirect to the root path after logout
+  end
+
   # protected
 
   # If you have extra params to permit, append them to the sanitizer.

app/javascript/controllers/application.js

@@ -11,10 +11,19 @@ console.log(' --> 🏝 May all your pushes be stored securely, read once and exp
 
 const prefersDarkScheme = window.matchMedia("(prefers-color-scheme: dark)");
 
-if (prefersDarkScheme.matches) {
-    document.body.classList.add('dark-mode')
-} else {
-    document.body.classList.remove('dark-mode')
+// Function to handle theme changes
+const handleThemeChange = (e) => {
+    if (e.matches) {
+        document.documentElement.setAttribute('data-bs-theme', 'dark')
+    } else {
+        document.documentElement.setAttribute('data-bs-theme', 'light')
+    }
 }
 
+// Initial check
+handleThemeChange(prefersDarkScheme);
+
+// Listen for changes
+prefersDarkScheme.addEventListener('change', handleThemeChange);
+
 export { application }

app/views/application/_push_expiration.html.erb

@@ -0,0 +1,25 @@
+<% if push.files.attached? && Rails.application.config.active_storage.try(:service).to_s != "local" %>
+  <div class="text-muted fs-6">
+    <%= t('application.push_expiration.will_expire_in') %> <span id="countdown-timer">4:59</span>
+    <div class="mt-2 mb-4">
+      <%= t('application.push_expiration.you_can_refresh') %>
+    </div>
+  </div>
+  <script>
+    var endTime = new Date().getTime() + 5 * 60 * 1000; // 5 minutes in milliseconds
+    var countdown = setInterval(function() {
+      var now = new Date().getTime();
+      var timeRemaining = endTime - now;
+
+      if (timeRemaining < 0) {
+        clearInterval(countdown);
+        document.getElementById("countdown-timer").innerHTML = "<%= t('words.expired') %>";
+      } else {
+        var minutes = Math.floor((timeRemaining % (1000 * 60 * 60)) / (1000 * 60));
+        var seconds = Math.floor((timeRemaining % (1000 * 60)) / 1000);
+        seconds = seconds.toString().padStart(2, '0');
+        document.getElementById("countdown-timer").innerHTML = minutes + ":" + seconds;
+      }
+    }, 1000);
+  </script>
+<% end %>

app/views/file_pushes/show.html.erb

@@ -51,6 +51,7 @@
             <%= _('(whichever occurs first).') %>
         <% end %>
       </p>
+      <%= render partial: 'application/push_expiration', locals: { push: @push } %>
       <% if @push.deletable_by_viewer && @push.views_remaining.positive? %>
         <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
           <em class="bi bi-trash"></em> <%= _('Delete This Secret Link Now') %>

bin/move_up_stable_tag.sh

@@ -46,4 +46,15 @@ for IMAGE in "${IMAGES[@]}"; do
   docker manifest push "${IMAGE}:${ALIAS_TAG}"
 done
 
-echo "All images have been tagged as '${ALIAS_TAG}' successfully."
+echo "Checking out version tag: v${SOURCE_TAG}"
+git checkout "v${SOURCE_TAG}"
+
+echo "Deleting the 'stable' tag from git: local and remote"
+git tag -d "${ALIAS_TAG}"
+git push oss --delete "${ALIAS_TAG}"
+
+echo "Moving stable tag to new version: v${SOURCE_TAG}"
+git tag "${ALIAS_TAG}"
+git push oss "${ALIAS_TAG}"
+
+echo "v${SOURCE_TAG} has been tagged as '${ALIAS_TAG}' successfully."

config/application.rb

@@ -16,6 +16,9 @@ class Application < Rails::Application
     config.load_defaults 7.2
     config.active_support.cache_format_version = 7.0
 
+    config.active_storage.urls_expire_in = 5.minutes
+    config.active_storage.routes_prefix = "/pfb"
+
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
     # Common ones are `templates`, `generators`, or `middleware`, for example.