fix: add scoped API permissions to map endpoints

mobile/lib/presentation/widgets/timeline/fixed/row.dart

@@ -1,45 +1,27 @@
-import 'package:collection/collection.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
-class TimelineRow extends MultiChildRenderObjectWidget {
-  final double height;
-  final List<double> widths;
+class FixedTimelineRow extends MultiChildRenderObjectWidget {
+  final double dimension;
   final double spacing;
   final TextDirection textDirection;
 
-  const TimelineRow({
+  const FixedTimelineRow({
     super.key,
-    required this.height,
-    required this.widths,
+    required this.dimension,
     required this.spacing,
     required this.textDirection,
     required super.children,
   });
 
-  factory TimelineRow.fixed({
-    required double dimension,
-    required double spacing,
-    required TextDirection textDirection,
-    required List<Widget> children,
-  }) => TimelineRow(
-    height: dimension,
-    widths: List.filled(children.length, dimension),
-    spacing: spacing,
-    textDirection: textDirection,
-    children: children,
-  );
-
   @override
   RenderObject createRenderObject(BuildContext context) {
-    return RenderFixedRow(height: height, widths: widths, spacing: spacing, textDirection: textDirection);
+    return RenderFixedRow(dimension: dimension, spacing: spacing, textDirection: textDirection);
   }
 
   @override
   void updateRenderObject(BuildContext context, RenderFixedRow renderObject) {
-    renderObject.height = height;
-    renderObject.widths = widths;
+    renderObject.dimension = dimension;
     renderObject.spacing = spacing;
     renderObject.textDirection = textDirection;
   }
@@ -47,8 +29,7 @@ class TimelineRow extends MultiChildRenderObjectWidget {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DoubleProperty('height', height));
-    properties.add(DiagnosticsProperty<List<double>>('widths', widths));
+    properties.add(DoubleProperty('dimension', dimension));
     properties.add(DoubleProperty('spacing', spacing));
     properties.add(EnumProperty<TextDirection>('textDirection', textDirection));
   }
@@ -62,32 +43,21 @@ class RenderFixedRow extends RenderBox
         RenderBoxContainerDefaultsMixin<RenderBox, _RowParentData> {
   RenderFixedRow({
     List<RenderBox>? children,
-    required double height,
-    required List<double> widths,
+    required double dimension,
     required double spacing,
     required TextDirection textDirection,
-  }) : _height = height,
-       _widths = widths,
+  }) : _dimension = dimension,
        _spacing = spacing,
        _textDirection = textDirection {
     addAll(children);
   }
 
-  double get height => _height;
-  double _height;
+  double get dimension => _dimension;
+  double _dimension;
 
-  set height(double value) {
-    if (_height == value) return;
-    _height = value;
-    markNeedsLayout();
-  }
-
-  List<double> get widths => _widths;
-  List<double> _widths;
-
-  set widths(List<double> value) {
-    if (listEquals(_widths, value)) return;
-    _widths = value;
+  set dimension(double value) {
+    if (_dimension == value) return;
+    _dimension = value;
     markNeedsLayout();
   }
 
@@ -116,7 +86,7 @@ class RenderFixedRow extends RenderBox
     }
   }
 
-  double get intrinsicWidth => widths.sum + (spacing * (childCount - 1));
+  double get intrinsicWidth => dimension * childCount + spacing * (childCount - 1);
 
   @override
   double computeMinIntrinsicWidth(double height) => intrinsicWidth;
@@ -125,10 +95,10 @@ class RenderFixedRow extends RenderBox
   double computeMaxIntrinsicWidth(double height) => intrinsicWidth;
 
   @override
-  double computeMinIntrinsicHeight(double width) => height;
+  double computeMinIntrinsicHeight(double width) => dimension;
 
   @override
-  double computeMaxIntrinsicHeight(double width) => height;
+  double computeMaxIntrinsicHeight(double width) => dimension;
 
   @override
   double? computeDistanceToActualBaseline(TextBaseline baseline) {
@@ -148,8 +118,7 @@ class RenderFixedRow extends RenderBox
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DoubleProperty('height', height));
-    properties.add(DiagnosticsProperty<List<double>>('widths', widths));
+    properties.add(DoubleProperty('dimension', dimension));
     properties.add(DoubleProperty('spacing', spacing));
     properties.add(EnumProperty<TextDirection>('textDirection', textDirection));
   }
@@ -162,25 +131,19 @@ class RenderFixedRow extends RenderBox
       return;
     }
     // Use the entire width of the parent for the row.
-    size = Size(constraints.maxWidth, height);
-
+    size = Size(constraints.maxWidth, dimension);
+    // Each tile is forced to be dimension x dimension.
+    final childConstraints = BoxConstraints.tight(Size(dimension, dimension));
     final flipMainAxis = textDirection == TextDirection.rtl;
-    int childIndex = 0;
-    double currentX = flipMainAxis ? size.width - (widths.firstOrNull ?? 0) : 0;
+    Offset offset = Offset(flipMainAxis ? size.width - dimension : 0, 0);
+    final dx = (flipMainAxis ? -1 : 1) * (dimension + spacing);
     // Layout each child horizontally.
-    while (child != null && childIndex < widths.length) {
-      final width = widths[childIndex];
-      final childConstraints = BoxConstraints.tight(Size(width, height));
+    while (child != null) {
       child.layout(childConstraints, parentUsesSize: false);
       final childParentData = child.parentData! as _RowParentData;
-      childParentData.offset = Offset(currentX, 0);
+      childParentData.offset = offset;
+      offset += Offset(dx, 0);
       child = childParentData.nextSibling;
-      childIndex++;
-
-      if (child != null && childIndex < widths.length) {
-        final nextWidth = widths[childIndex];
-        currentX += flipMainAxis ? -(spacing + nextWidth) : width + spacing;
-      }
     }
   }
 }

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -2,12 +2,10 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail_tile.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/fixed/row.dart';
@@ -80,7 +78,6 @@ class FixedSegment extends Segment {
       assetCount: numberOfAssets,
       tileHeight: tileHeight,
       spacing: spacing,
-      columnCount: columnCount,
     );
   }
 }
@@ -90,32 +87,24 @@ class _FixedSegmentRow extends ConsumerWidget {
   final int assetCount;
   final double tileHeight;
   final double spacing;
-  final int columnCount;
 
   const _FixedSegmentRow({
     required this.assetIndex,
     required this.assetCount,
     required this.tileHeight,
     required this.spacing,
-    required this.columnCount,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isScrubbing = ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
     final timelineService = ref.read(timelineServiceProvider);
-    final isDynamicLayout = columnCount <= (context.isMobile ? 2 : 3);
 
     if (isScrubbing) {
       return _buildPlaceholder(context);
     }
     if (timelineService.hasRange(assetIndex, assetCount)) {
-      return _buildAssetRow(
-        context,
-        timelineService.getAssets(assetIndex, assetCount),
-        timelineService,
-        isDynamicLayout,
-      );
+      return _buildAssetRow(context, timelineService.getAssets(assetIndex, assetCount), timelineService);
     }
 
     return FutureBuilder<List<BaseAsset>>(
@@ -124,7 +113,7 @@ class _FixedSegmentRow extends ConsumerWidget {
         if (snapshot.connectionState != ConnectionState.done) {
           return _buildPlaceholder(context);
         }
-        return _buildAssetRow(context, snapshot.requireData, timelineService, isDynamicLayout);
+        return _buildAssetRow(context, snapshot.requireData, timelineService);
       },
     );
   }
@@ -133,58 +122,23 @@ class _FixedSegmentRow extends ConsumerWidget {
     return SegmentBuilder.buildPlaceholder(context, assetCount, size: Size.square(tileHeight), spacing: spacing);
   }
 
-  Widget _buildAssetRow(
-    BuildContext context,
-    List<BaseAsset> assets,
-    TimelineService timelineService,
-    bool isDynamicLayout,
-  ) {
-    final children = [
-      for (int i = 0; i < assets.length; i++)
-        TimelineAssetIndexWrapper(
-          assetIndex: assetIndex + i,
-          segmentIndex: 0, // For simplicity, using 0 for now
-          child: _AssetTileWidget(
-            key: ValueKey(Object.hash(assets[i].heroTag, assetIndex + i, timelineService.hashCode)),
-            asset: assets[i],
+  Widget _buildAssetRow(BuildContext context, List<BaseAsset> assets, TimelineService timelineService) {
+    return FixedTimelineRow(
+      dimension: tileHeight,
+      spacing: spacing,
+      textDirection: Directionality.of(context),
+      children: [
+        for (int i = 0; i < assets.length; i++)
+          TimelineAssetIndexWrapper(
             assetIndex: assetIndex + i,
+            segmentIndex: 0, // For simplicity, using 0 for now
+            child: _AssetTileWidget(
+              key: ValueKey(Object.hash(assets[i].heroTag, assetIndex + i, timelineService.hashCode)),
+              asset: assets[i],
+              assetIndex: assetIndex + i,
+            ),
           ),
-        ),
-    ];
-
-    final widths = List.filled(assets.length, tileHeight);
-
-    if (isDynamicLayout) {
-      final aspectRatios = assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
-      final meanAspectRatio = aspectRatios.sum / assets.length;
-
-      // 1: mean width
-      // 0.5: width < mean - threshold
-      // 1.5: width > mean + threshold
-      final arConfiguration = aspectRatios.map((e) {
-        if (e - meanAspectRatio > 0.3) return 1.5;
-        if (e - meanAspectRatio < -0.3) return 0.5;
-        return 1.0;
-      });
-
-      // Normalize to get width distribution
-      final sum = arConfiguration.sum;
-
-      int index = 0;
-      for (final ratio in arConfiguration) {
-        // Distribute the available width proportionally based on aspect ratio configuration
-        widths[index++] = ((ratio * assets.length) / sum) * tileHeight;
-      }
-    }
-
-    return TimelineDragRegion(
-      child: TimelineRow(
-        height: tileHeight,
-        widths: widths,
-        spacing: spacing,
-        textDirection: Directionality.of(context),
-        children: children,
-      ),
+      ],
     );
   }
 }

mobile/lib/presentation/widgets/timeline/segment_builder.dart

@@ -24,7 +24,7 @@ abstract class SegmentBuilder {
     Size size = kTimelineFixedTileExtent,
     double spacing = kTimelineSpacing,
   }) => RepaintBoundary(
-    child: TimelineRow.fixed(
+    child: FixedTimelineRow(
       dimension: size.height,
       spacing: spacing,
       textDirection: Directionality.of(context),

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -25,12 +24,11 @@ class LayoutSettings extends HookConsumerWidget {
           title: "asset_list_layout_sub_title".t(context: context),
           icon: Icons.view_module_outlined,
         ),
-        if (!Store.isBetaTimelineEnabled)
-          SettingsSwitchListTile(
-            valueNotifier: useDynamicLayout,
-            title: "asset_list_layout_settings_dynamic_layout_title".t(context: context),
-            onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
-          ),
+        SettingsSwitchListTile(
+          valueNotifier: useDynamicLayout,
+          title: "asset_list_layout_settings_dynamic_layout_title".t(context: context),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
+        ),
         SettingsSliderListTile(
           valueNotifier: tilesPerRow,
           text: 'theme_setting_asset_list_tiles_per_row_title'.tr(namedArgs: {'count': "${tilesPerRow.value}"}),

mobile/openapi/lib/model/permission.dart

@@ -82,6 +82,8 @@ class Permission {
   static const timelinePeriodRead = Permission._(r'timeline.read');
   static const timelinePeriodDownload = Permission._(r'timeline.download');
   static const maintenance = Permission._(r'maintenance');
+  static const mapPeriodGeocode = Permission._(r'map.geocode');
+  static const mapPeriodRead = Permission._(r'map.read');
   static const memoryPeriodCreate = Permission._(r'memory.create');
   static const memoryPeriodRead = Permission._(r'memory.read');
   static const memoryPeriodUpdate = Permission._(r'memory.update');
@@ -238,6 +240,8 @@ class Permission {
     timelinePeriodRead,
     timelinePeriodDownload,
     maintenance,
+    mapPeriodGeocode,
+    mapPeriodRead,
     memoryPeriodCreate,
     memoryPeriodRead,
     memoryPeriodUpdate,
@@ -429,6 +433,8 @@ class PermissionTypeTransformer {
         case r'timeline.read': return Permission.timelinePeriodRead;
         case r'timeline.download': return Permission.timelinePeriodDownload;
         case r'maintenance': return Permission.maintenance;
+        case r'map.geocode': return Permission.mapPeriodGeocode;
+        case r'map.read': return Permission.mapPeriodRead;
         case r'memory.create': return Permission.memoryPeriodCreate;
         case r'memory.read': return Permission.memoryPeriodRead;
         case r'memory.update': return Permission.memoryPeriodUpdate;

open-api/immich-openapi-specs.json

@@ -6305,6 +6305,7 @@
             "state": "Stable"
           }
         ],
+        "x-immich-permission": "map.read",
         "x-immich-state": "Stable"
       }
     },
@@ -6376,6 +6377,7 @@
             "state": "Stable"
           }
         ],
+        "x-immich-permission": "map.geocode",
         "x-immich-state": "Stable"
       }
     },
@@ -18966,6 +18968,8 @@
           "timeline.read",
           "timeline.download",
           "maintenance",
+          "map.geocode",
+          "map.read",
           "memory.create",
           "memory.read",
           "memory.update",

open-api/typescript-sdk/src/fetch-client.ts

@@ -5534,6 +5534,8 @@ export enum Permission {
     TimelineRead = "timeline.read",
     TimelineDownload = "timeline.download",
     Maintenance = "maintenance",
+    MapGeocode = "map.geocode",
+    MapRead = "map.read",
     MemoryCreate = "memory.create",
     MemoryRead = "memory.read",
     MemoryUpdate = "memory.update",

server/src/controllers/map.controller.ts

@@ -8,7 +8,7 @@ import {
   MapReverseGeocodeDto,
   MapReverseGeocodeResponseDto,
 } from 'src/dtos/map.dto';
-import { ApiTag } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { MapService } from 'src/services/map.service';
 
@@ -18,7 +18,7 @@ export class MapController {
   constructor(private service: MapService) {}
 
   @Get('markers')
-  @Authenticated()
+  @Authenticated({ permission: Permission.MapRead })
   @Endpoint({
     summary: 'Retrieve map markers',
     description: 'Retrieve a list of latitude and longitude coordinates for every asset with location data.',
@@ -28,8 +28,8 @@ export class MapController {
     return this.service.getMapMarkers(auth, options);
   }
 
-  @Authenticated()
   @Get('reverse-geocode')
+  @Authenticated({ permission: Permission.MapGeocode })
   @HttpCode(HttpStatus.OK)
   @Endpoint({
     summary: 'Reverse geocode coordinates',

server/src/enum.ts

@@ -160,6 +160,9 @@ export enum Permission {
 
   Maintenance = 'maintenance',
 
+  MapGeocode = 'map.geocode',
+  MapRead = 'map.read',
+
   MemoryCreate = 'memory.create',
   MemoryRead = 'memory.read',
   MemoryUpdate = 'memory.update',