- <%= form_for(resource, as: resource_name, url: session_path(resource_name), class: 'form-body ') do |f| %>
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name), class: 'form-body', html: { data: { turbo: session[:dawarich_client] == 'ios' ? false : true } }) do |f| %>
<%= f.label :email, class: 'label' do %>
Email
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index c00c405f..9778627c 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -76,7 +76,11 @@
<%= link_to "#{MANAGER_URL}/auth/dawarich?token=#{current_user.generate_subscription_token}" do %>
- <%= (current_user.active_until.to_date - Time.current.to_date).to_i %> days remaining
+ <% if current_user.active_until.past? %>
+ Trial expired 🥺
+ <% else %>
+ <%= (current_user.active_until.to_date - Time.current.to_date).to_i %> days remaining
+ <% end %>
Subscribe
diff --git a/config/routes.rb b/config/routes.rb
index 1a592e5a..4424f062 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -85,6 +85,9 @@ Rails.application.routes.draw do
root to: 'home#index'
+ # iOS mobile auth success endpoint
+ get 'auth/ios/success', to: 'auth/ios#success', as: :ios_success
+
if SELF_HOSTED
devise_for :users, skip: [:registrations]
as :user do
diff --git a/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb
index 78e4f3d2..cdb627e9 100644
--- a/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb
+++ b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb
@@ -4,9 +4,11 @@ class AddH3HexIdsToStats < ActiveRecord::Migration[8.0]
disable_ddl_transaction!
def change
- add_column :stats, :h3_hex_ids, :jsonb, default: {}
- add_index :stats, :h3_hex_ids, using: :gin,
- where: "(h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb)",
- algorithm: :concurrently
+ add_column :stats, :h3_hex_ids, :jsonb, default: {}, if_not_exists: true
+ safety_assured do
+ add_index :stats, :h3_hex_ids, using: :gin,
+ where: "(h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb)",
+ algorithm: :concurrently, if_not_exists: true
+ end
end
end
diff --git a/public/.well-known/apple-app-site-association b/public/.well-known/apple-app-site-association
index fbf3900a..b32ab0f3 100644
--- a/public/.well-known/apple-app-site-association
+++ b/public/.well-known/apple-app-site-association
@@ -1,7 +1,8 @@
{
"webcredentials": {
"apps": [
- "2A275P77DQ.app.dawarich.Dawarich"
+ "2A275P77DQ.app.dawarich.Dawarich",
+ "3DJN84WAS8.app.dawarich.Dawarich"
]
}
}
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 50034082..fec9ad1f 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Import, type: :model do
describe 'file size validation' do
context 'when user is a trial user' do
- let(:user) do
+ let(:user) do
user = create(:user)
user.update!(status: :trial)
user
@@ -116,4 +116,28 @@ RSpec.describe Import, type: :model do
end
end
end
+
+ describe '#recalculate_stats' do
+ let(:import) { create(:import, user:) }
+ let!(:point1) { create(:point, import:, user:, timestamp: Time.zone.local(2024, 11, 15).to_i) }
+ let!(:point2) { create(:point, import:, user:, timestamp: Time.zone.local(2024, 12, 5).to_i) }
+
+ it 'enqueues stats calculation jobs for each tracked month' do
+ expect do
+ import.send(:recalculate_stats)
+ end.to have_enqueued_job(Stats::CalculatingJob)
+ .with(user.id, 2024, 11)
+ .and have_enqueued_job(Stats::CalculatingJob).with(user.id, 2024, 12)
+ end
+
+ context 'when import has no points' do
+ let(:empty_import) { create(:import, user:) }
+
+ it 'does not enqueue any jobs' do
+ expect do
+ empty_import.send(:recalculate_stats)
+ end.not_to have_enqueued_job(Stats::CalculatingJob)
+ end
+ end
+ end
end
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
index eab3f9a0..621a86cc 100644
--- a/spec/requests/authentication_spec.rb
+++ b/spec/requests/authentication_spec.rb
@@ -6,9 +6,9 @@ RSpec.describe 'Authentication', type: :request do
let(:user) { create(:user, password: 'password123') }
before do
- stub_request(:get, "https://api.github.com/repos/Freika/dawarich/tags")
- .with(headers: { 'Accept'=>'*/*', 'Accept-Encoding'=>/.*/,
- 'Host'=>'api.github.com', 'User-Agent'=>/.*/})
+ stub_request(:get, 'https://api.github.com/repos/Freika/dawarich/tags')
+ .with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => /.*/,
+ 'Host' => 'api.github.com', 'User-Agent' => /.*/ })
.to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {})
end
@@ -66,4 +66,104 @@ RSpec.describe 'Authentication', type: :request do
expect(response).to redirect_to(new_user_session_path)
end
end
+
+ describe 'Mobile iOS Authentication' do
+ it 'redirects to iOS success path when signing in with iOS client header' do
+ # Make a login request with the iOS client header (user NOT pre-signed in)
+ post user_session_path, params: {
+ user: { email: user.email, password: 'password123' }
+ }, headers: {
+ 'X-Dawarich-Client' => 'ios',
+ 'Accept' => 'text/html'
+ }
+
+ # Should redirect to iOS success endpoint after successful login
+ # The redirect will include a token parameter generated by after_sign_in_path_for
+ expect(response).to redirect_to(%r{auth/ios/success\?token=})
+ expect(response.location).to include('token=')
+ end
+
+ it 'stores iOS client header in session' do
+ # Test that the header gets stored when accessing sign-in page
+ get new_user_session_path, headers: { 'X-Dawarich-Client' => 'ios' }
+
+ expect(session[:dawarich_client]).to eq('ios')
+ end
+
+ it 'redirects to iOS success path using stored session value' do
+ # Simulate iOS app accessing sign-in page first (stores header in session)
+ get new_user_session_path, headers: { 'X-Dawarich-Client' => 'ios' }
+
+ # Then sign-in POST request without header (relies on session)
+ post user_session_path, params: {
+ user: { email: user.email, password: 'password123' }
+ }, headers: {
+ 'Accept' => 'text/html'
+ }
+
+ # Should still redirect to iOS success endpoint using session value
+ expect(response).to redirect_to(%r{auth/ios/success\?token=})
+ expect(response.location).to include('token=')
+ end
+
+ it 'returns plain text response for iOS success endpoint with token' do
+ # Generate a test JWT token using the same service as the controller
+ payload = { api_key: user.api_key, exp: 5.minutes.from_now.to_i }
+ test_token = Subscription::EncodeJwtToken.new(
+ payload, ENV['AUTH_JWT_SECRET_KEY']
+ ).call
+
+ get ios_success_path, params: { token: test_token }
+
+ expect(response).to be_successful
+ expect(response.content_type).to include('text/plain')
+ expect(response.body).to eq('Authentication successful! You can close this window.')
+ end
+
+ it 'returns JSON response when no token is provided to iOS success endpoint' do
+ get ios_success_path
+
+ expect(response).to be_successful
+ expect(response.content_type).to include('application/json')
+
+ json_response = JSON.parse(response.body)
+ expect(json_response['success']).to be true
+ expect(json_response['message']).to eq('iOS authentication successful')
+ expect(json_response['redirect_url']).to eq(root_url)
+ end
+
+ it 'generates JWT token with correct payload for iOS authentication' do
+ # Test JWT token generation directly using the same logic as after_sign_in_path_for
+ payload = { api_key: user.api_key, exp: 5.minutes.from_now.to_i }
+
+ # Create JWT token using the same service
+ token = Subscription::EncodeJwtToken.new(
+ payload, ENV['AUTH_JWT_SECRET_KEY']
+ ).call
+
+ expect(token).to be_present
+
+ # Decode the token to verify the payload
+ decoded_payload = JWT.decode(
+ token,
+ ENV['AUTH_JWT_SECRET_KEY'],
+ true,
+ { algorithm: 'HS256' }
+ ).first
+
+ expect(decoded_payload['api_key']).to eq(user.api_key)
+ expect(decoded_payload['exp']).to be_present
+ end
+
+ it 'uses default path for non-iOS clients' do
+ # Make a login request without iOS client header (user NOT pre-signed in)
+ post user_session_path, params: {
+ user: { email: user.email, password: 'password123' }
+ }
+
+ # Should redirect to default path (not iOS success)
+ expect(response).not_to redirect_to(%r{auth/ios/success})
+ expect(response.location).not_to include('auth/ios/success')
+ end
+ end
end
diff --git a/spec/serializers/api/point_serializer_spec.rb b/spec/serializers/api/point_serializer_spec.rb
index 8e7b51e5..4e4453e2 100644
--- a/spec/serializers/api/point_serializer_spec.rb
+++ b/spec/serializers/api/point_serializer_spec.rb
@@ -7,14 +7,26 @@ RSpec.describe Api::PointSerializer do
subject(:serializer) { described_class.new(point).call }
let(:point) { create(:point) }
- let(:expected_json) { point.attributes.except(*Api::PointSerializer::EXCLUDED_ATTRIBUTES) }
+ let(:all_excluded) { PointSerializer::EXCLUDED_ATTRIBUTES + Api::PointSerializer::ADDITIONAL_EXCLUDED_ATTRIBUTES }
+ let(:expected_json) do
+ point.attributes.except(*all_excluded).tap do |attributes|
+ # API serializer extracts coordinates from PostGIS geometry
+ attributes['latitude'] = point.lat.to_s
+ attributes['longitude'] = point.lon.to_s
+ end
+ end
it 'returns JSON with correct attributes' do
expect(serializer.to_json).to eq(expected_json.to_json)
end
it 'does not include excluded attributes' do
- expect(serializer).not_to include(*Api::PointSerializer::EXCLUDED_ATTRIBUTES)
+ expect(serializer).not_to include(*all_excluded)
+ end
+
+ it 'extracts coordinates from PostGIS geometry' do
+ expect(serializer['latitude']).to eq(point.lat.to_s)
+ expect(serializer['longitude']).to eq(point.lon.to_s)
end
end
end
diff --git a/spec/serializers/api/user_serializer_spec.rb b/spec/serializers/api/user_serializer_spec.rb
index d4612fe9..d215f1e4 100644
--- a/spec/serializers/api/user_serializer_spec.rb
+++ b/spec/serializers/api/user_serializer_spec.rb
@@ -81,5 +81,61 @@ RSpec.describe Api::UserSerializer do
expect(settings[:maps]).to eq({ 'distance_unit' => 'mi' })
end
end
+
+ context 'subscription data' do
+ context 'when not self-hosted (hosted instance)' do
+ before do
+ allow(DawarichSettings).to receive(:self_hosted?).and_return(false)
+ end
+
+ it 'includes subscription data' do
+ expect(serializer).to have_key(:subscription)
+ expect(serializer[:subscription]).to include(:status, :active_until)
+ end
+
+ it 'returns correct subscription values' do
+ subscription = serializer[:subscription]
+ expect(subscription[:status]).to eq(user.status)
+ expect(subscription[:active_until]).to eq(user.active_until)
+ end
+
+ context 'with specific subscription values' do
+ it 'serializes trial user status correctly' do
+ # When not self-hosted, users start with trial status via start_trial callback
+ test_user = create(:user)
+ serializer_result = described_class.new(test_user).call
+ subscription = serializer_result[:subscription]
+
+ expect(subscription[:status]).to eq('trial')
+ expect(subscription[:active_until]).to be_within(1.second).of(7.days.from_now)
+ end
+
+ it 'serializes subscription data with all expected fields' do
+ test_user = create(:user)
+ serializer_result = described_class.new(test_user).call
+ subscription = serializer_result[:subscription]
+
+ expect(subscription).to include(:status, :active_until)
+ expect(subscription[:status]).to be_a(String)
+ expect(subscription[:active_until]).to be_a(ActiveSupport::TimeWithZone)
+ end
+ end
+ end
+
+ context 'when self-hosted' do
+ before do
+ allow(DawarichSettings).to receive(:self_hosted?).and_return(true)
+ end
+
+ it 'does not include subscription data' do
+ expect(serializer).not_to have_key(:subscription)
+ end
+
+ it 'still includes user and settings data' do
+ expect(serializer).to have_key(:user)
+ expect(serializer[:user]).to include(:email, :theme, :settings)
+ end
+ end
+ end
end
end