Simple Web Preview

src/Eurofurence.App.Server.Services/Abstractions/ConventionSettings.cs

@@ -7,14 +7,21 @@ public class ConventionSettings
     {
         public string ConventionIdentifier { get; set; }
         public bool IsRegSysAuthenticationEnabled { get; set; }
-        public string ApiBaseUrl { get; set; }
+        public string BaseUrl { get; set; }
+        public string AppIdITunes { get; set; } 
+        public string AppIdPlay { get; set; }
+        public string ApiBaseUrl => $"{BaseUrl}/Api";
+        public string ContentBaseUrl => $"{BaseUrl}/Web/Static";
+        public string WebBaseUrl => $"{BaseUrl}/Web";
 
         public static ConventionSettings FromConfiguration(IConfiguration configuration) 
             => new ConventionSettings()
             {
                 ConventionIdentifier = configuration["global:conventionIdentifier"],
                 IsRegSysAuthenticationEnabled = Convert.ToInt32(configuration["global:regSysAuthenticationEnabled"]) == 1,
-                ApiBaseUrl = configuration["global:apiBaseUrl"]
+                BaseUrl = configuration["global:baseUrl"],
+                AppIdITunes = configuration["global:appIdITunes"],
+                AppIdPlay = configuration["global:appIdPlay"]
             };
     }
 }

src/Eurofurence.App.Server.Services/PushNotifications/FirebaseChannelManager.cs

@@ -49,7 +49,8 @@ public Task PushAnnouncementNotificationAsync(AnnouncementRecord announcement)
                         Event = "Announcement",
                         Title = announcement.Title.RemoveMarkdown(),
                         Text = announcement.Content.RemoveMarkdown(),
-                        RelatedId = announcement.Id
+                        RelatedId = announcement.Id,
+                        CID = _conventionSettings.ConventionIdentifier
                     },
                     to = $"/topics/{_conventionSettings.ConventionIdentifier}-android"
                 }), 
@@ -58,7 +59,7 @@ public Task PushAnnouncementNotificationAsync(AnnouncementRecord announcement)
                     data = new
                     {
                         @event = "announcement",
-                        announcement_id = announcement.Id,
+                        announcement_id = announcement.Id
                     },
                     notification = new {
                         title = announcement.Title.RemoveMarkdown(),
@@ -85,6 +86,7 @@ await SendPushNotificationAsync(new
                         data = new
                         {
                             @event = "notification",
+                            message_id = relatedId
                         },
                         notification = new
                         {
@@ -104,7 +106,8 @@ await SendPushNotificationAsync(new
                             Event = "Notification",
                             Title = toastTitle,
                             Message = toastMessage,
-                            RelatedId = relatedId
+                            RelatedId = relatedId,
+                            CID = _conventionSettings.ConventionIdentifier
                         },
                         to = recipient.DeviceId
                     });
@@ -120,6 +123,7 @@ public Task PushSyncRequestAsync()
                     data = new
                     {
                         Event = "Sync",
+                        CID = _conventionSettings.ConventionIdentifier
                     },
                     to = $"/topics/{_conventionSettings.ConventionIdentifier}-android"
                 }),

src/Eurofurence.App.Server.Web/Controllers/WebPreviewController.cs

@@ -14,33 +14,66 @@ public class WebPreviewController : BaseController
         private readonly ConventionSettings _conventionSettings;
         private readonly IEventService _eventService;
         private readonly IEventConferenceDayService _eventConferenceDayService;
+        private readonly IEventConferenceRoomService _eventConferenceRoomService;
+        private readonly IEventConferenceTrackService _eventConferenceTrackService;
         private readonly IDealerService _dealerService;
 
+        public const string VIEWDATA_OPENGRAPH_METADATA = nameof(OpenGraphMetadata);
+        public const string VIEWDATA_APPID_ITUNES = nameof(ConventionSettings.AppIdITunes);
+        public const string VIEWDATA_APPID_PLAY = nameof(ConventionSettings.AppIdPlay);
+        public const string VIEWDATA_BASE_URL = nameof(ConventionSettings.BaseUrl);
+        public const string VIEWDATA_API_BASE_URL = nameof(ConventionSettings.ApiBaseUrl);
+        public const string VIEWDATA_CONTENT_BASE_URL = nameof(ConventionSettings.ContentBaseUrl);
+        public const string VIEWDATA_WEB_BASE_URL = nameof(ConventionSettings.WebBaseUrl);
+
         public WebPreviewController(
             ConventionSettings conventionSettings,
-            IEventService eventService, 
+            IEventService eventService,
             IEventConferenceDayService eventConferenceDayService,
+            IEventConferenceRoomService eventConferenceRoomService,
+            IEventConferenceTrackService eventConferenceTrackService,
             IDealerService dealerService
             )
         {
             _conventionSettings = conventionSettings;
             _eventService = eventService;
             _eventConferenceDayService = eventConferenceDayService;
+            _eventConferenceRoomService = eventConferenceRoomService;
+            _eventConferenceTrackService = eventConferenceTrackService;
             _dealerService = dealerService;
         }
 
+        private void PopulateViewData()
+        {
+            ViewData[VIEWDATA_API_BASE_URL] = _conventionSettings.ApiBaseUrl;
+            ViewData[VIEWDATA_BASE_URL] = _conventionSettings.BaseUrl;
+            ViewData[VIEWDATA_WEB_BASE_URL] = _conventionSettings.WebBaseUrl;
+            ViewData[VIEWDATA_CONTENT_BASE_URL] = _conventionSettings.ContentBaseUrl;
+            ViewData[VIEWDATA_APPID_ITUNES] = _conventionSettings.AppIdITunes;
+            ViewData[VIEWDATA_APPID_PLAY] = _conventionSettings.AppIdPlay;
+        }
+
         [HttpGet("Events/{Id}")]
         public async Task<ActionResult> GetEventById(Guid Id)
         {
             var @event = await _eventService.FindOneAsync(Id);
             if (@event == null) return NotFound();
 
             var eventConferenceDay = await _eventConferenceDayService.FindOneAsync(@event.ConferenceDayId);
+            var eventConferenceRoom = await _eventConferenceRoomService.FindOneAsync(@event.ConferenceRoomId);
+            var eventConferenceTrack = await _eventConferenceTrackService.FindOneAsync(@event.ConferenceTrackId);
+
+            PopulateViewData();
 
-            return new WebPreviewMetadata()
+            ViewData[VIEWDATA_OPENGRAPH_METADATA] = new OpenGraphMetadata()
                 .WithTitle(@event.Title)
-                .WithDescription($"{eventConferenceDay.Name} {@event.StartTime}-{@event.EndTime}\n{@event.Description}")
-                .AsViewResult();
+                .WithDescription($"{eventConferenceDay.Name} {@event.StartTime}-{@event.EndTime}\n{@event.Description}");
+
+            ViewData["eventConferenceDay"] = eventConferenceDay;
+            ViewData["eventConferenceRoom"] = eventConferenceRoom;
+            ViewData["eventConferenceTrack"] = eventConferenceTrack;
+
+            return View("EventPreview", @event);
         }
 
         [HttpGet("Dealers/{Id}")]
@@ -49,12 +82,46 @@ public async Task<ActionResult> GetDealerById(Guid Id)
             var dealer = await _dealerService.FindOneAsync(Id);
             if (dealer == null) return NotFound();
 
-            return new WebPreviewMetadata()
+            PopulateViewData();
+
+            ViewData[VIEWDATA_OPENGRAPH_METADATA] = new OpenGraphMetadata()
                 .WithTitle(string.IsNullOrEmpty(dealer.DisplayName) ? dealer.AttendeeNickname : dealer.DisplayName)
                 .WithDescription(dealer.ShortDescription)
-                .WithImage(dealer.ArtistImageId.HasValue ? $"{_conventionSettings.ApiBaseUrl}Images/{dealer.ArtistImageId}/Content" : string.Empty)
-                .AsViewResult();
+                .WithImage(dealer.ArtistImageId.HasValue ? $"{_conventionSettings.ApiBaseUrl}/Images/{dealer.ArtistImageId}/Content" : string.Empty);
+
+            return View("DealerPreview", dealer);
+        }
+
+        [HttpGet("manifest.json")]
+        public ActionResult GetManifest()
+        {
+            return Json(new
+            {
+                short_name = "Eurofurence",
+                name = "Eurofurence",
+                icons = new[] {
+                    new {
+                        //TODO: provide actual icon for Android app
+                        src = "/images/icon192.png",
+                        type = "image/png",
+                        sizes = "192x192"
+                    },
+                    new {
+                        //TODO: provide actual icon for Android app
+                        src = "/images/icon512.png",
+                        type = "image/png",
+                        sizes = "512x512"
+                    }
+                },
+                prefer_related_applications = true,
+                related_applications = new[] {
+                    new {
+                        platform = "play",
+                        id = _conventionSettings.AppIdPlay
+                    }
+                }
+            });
         }
 
     }
-}
+}

src/Eurofurence.App.Server.Web/Extensions/OpenGraphMetadata.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+
+namespace Eurofurence.App.Server.Web.Extensions
+{
+    public class OpenGraphMetadata
+    {
+        public Dictionary<string, string> Properties { get; private set; }
+        public string Redirect { get; set; }
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string ImageUrl { get; set; }
+
+        public OpenGraphMetadata()
+        {
+            Properties = new Dictionary<string, string>();
+        }
+
+        public OpenGraphMetadata WithProperty(string property, string value)
+        {
+            Properties.Add(property, value);
+            return this;
+        }
+        public OpenGraphMetadata WithTitle(string value)
+        {
+            Title = value;
+            Properties.Add("og:title", value);
+            return this;
+        }
+
+        public OpenGraphMetadata WithDescription(string value)
+        {
+            Description = value;
+            Properties.Add("og:description", value);
+            return this;
+        }
+
+        public OpenGraphMetadata WithRedirect(string targetUrl)
+        {
+            Redirect = targetUrl;
+            return this;
+        }
+
+        public OpenGraphMetadata WithImage(string imageUrl)
+        {
+            if (string.IsNullOrWhiteSpace(imageUrl)) return this;
+
+            ImageUrl = imageUrl;
+            Properties.Add("og:image", imageUrl);
+            return this;
+        }
+    }
+}

src/Eurofurence.App.Server.Web/Startup.cs

@@ -92,6 +92,11 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                     });
                 });
 
+            services.Configure<ForwardedHeadersOptions>(options =>
+            {
+                options.ForwardedHeaders = Microsoft.AspNetCore.HttpOverrides.ForwardedHeaders.All;
+            });
+
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             services.AddSwaggerGen(options =>
@@ -261,6 +266,8 @@ IApplicationLifetime appLifetime
             app.UseCors("CorsPolicy");
             app.UseAuthentication();
 
+            app.UseStaticFiles("/Web/Static");
+
             app.Use(async (context, next) =>
             {
                 using (LogContext.PushProperty("IPAddress",