call methods with clientidentifier

immichFrame · Dec 11, 2024 · fc5e87b · fc5e87b
1 parent f7b11cc
commit fc5e87b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 22 deletions.
diff --git a/ImmichFrame.WebApi/Controllers/AssetController.cs b/ImmichFrame.WebApi/Controllers/AssetController.cs
@@ -21,7 +21,7 @@ public AssetController(ILogger<AssetController> logger, ImmichFrameLogic logic)
         }
 
         [HttpGet(Name = "GetAsset")]
-        public async Task<List<AssetResponseDto>> GetAsset()
+        public async Task<List<AssetResponseDto>> GetAsset(string clientIdentifier = "")
         {
             return await _logic.GetAssets() ?? throw new AssetNotFoundException("No asset was found");
         }

diff --git a/ImmichFrame.WebApi/Controllers/CalendarController.cs b/ImmichFrame.WebApi/Controllers/CalendarController.cs
@@ -18,7 +18,7 @@ public CalendarController(ILogger<AssetController> logger, ImmichFrameLogic logi
         }
 
         [HttpGet(Name = "GetAppointments")]
-        public async Task<List<IAppointment>> GetAppointments()
+        public async Task<List<IAppointment>> GetAppointments(string clientIdentifier = "")
         {
             return await _logic.GetAppointments();
         }

diff --git a/ImmichFrame.WebApi/Controllers/ConfigController.cs b/ImmichFrame.WebApi/Controllers/ConfigController.cs
@@ -18,7 +18,7 @@ public ConfigController(ILogger<AssetController> logger, IWebClientSettings sett
         }
 
         [HttpGet(Name = "GetConfig")]
-        public WebClientSettings GetConfig()
+        public WebClientSettings GetConfig(string clientIdentifier = "")
         {
             return (WebClientSettings)_settings;
         }

diff --git a/ImmichFrame.WebApi/Controllers/WeatherController.cs b/ImmichFrame.WebApi/Controllers/WeatherController.cs
@@ -19,7 +19,7 @@ public WeatherController(ILogger<AssetController> logger, ImmichFrameLogic logic
         }
 
         [HttpGet(Name = "GetWeather")]
-        public async Task<IWeather?> GetWeather()
+        public async Task<IWeather?> GetWeather(string clientIdentifier = "")
         {
             return await _logic.GetWeather();
         }

diff --git a/ImmichFrame.WebApi/Program.cs b/ImmichFrame.WebApi/Program.cs
@@ -10,11 +10,8 @@
 
 // Add services to the container.
 
-
 var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config", "Settings.json");
 
-Console.WriteLine(settingsPath);
-
 ServerSettings? serverSettings = null;
 WebClientSettings? clientSettings = null;
 

diff --git a/immichFrame.Web/src/lib/components/elements/appointments.svelte b/immichFrame.Web/src/lib/components/elements/appointments.svelte
@@ -3,6 +3,7 @@
 	import { onMount } from 'svelte';
 	import { format, formatDate } from 'date-fns';
 	import { configStore } from '$lib/stores/config.store';
+	import { clientIdentifierStore } from '$lib/stores/identifier.store';
 
 	function formattedDate(time: string) {
 		let date = new Date(time);
@@ -21,7 +22,9 @@
 	});
 
 	async function GetAppointments() {
-		let appointmentRequest = await api.getAppointments();
+		let appointmentRequest = await api.getAppointments({
+			clientIdentifier: $clientIdentifierStore
+		});
 		if (appointmentRequest.status == 200) {
 			appointments = appointmentRequest.data;
 

diff --git a/immichFrame.Web/src/lib/components/elements/clock.svelte b/immichFrame.Web/src/lib/components/elements/clock.svelte
@@ -4,6 +4,7 @@
 	import { format } from 'date-fns';
 	import * as locale from 'date-fns/locale';
 	import { configStore } from '$lib/stores/config.store';
+	import { clientIdentifierStore } from '$lib/stores/identifier.store';
 
 	let time = $state(new Date());
 	let weather: api.IWeather = $state() as api.IWeather;
@@ -35,7 +36,7 @@
 	});
 
 	async function GetWeather() {
-		let weatherRequest = await api.getWeather();
+		let weatherRequest = await api.getWeather({ clientIdentifier: $clientIdentifierStore });
 		if (weatherRequest.status == 200) {
 			weather = weatherRequest.data;
 		}

diff --git a/immichFrame.Web/src/lib/components/elements/image-component.svelte b/immichFrame.Web/src/lib/components/elements/image-component.svelte
@@ -9,6 +9,7 @@
 	import { fade } from 'svelte/transition';
 	import { configStore } from '$lib/stores/config.store';
 	import { Confetti } from 'svelte-confetti';
+	import { clientIdentifierStore } from '$lib/stores/identifier.store';
 
 	interface Props {
 		sourceAssets: AssetResponseDto[];
@@ -75,7 +76,7 @@
 
 	async function loadImage(a: AssetResponseDto) {
 		try {
-			let req = await api.getImage(a.id);
+			let req = await api.getImage(a.id, { clientIdentifier: $clientIdentifierStore });
 
 			if (req.status != 200) {
 				error = true;

diff --git a/immichFrame.Web/src/lib/immichFrameApi.ts b/immichFrame.Web/src/lib/immichFrameApi.ts
@@ -6,6 +6,7 @@
  * See https://www.npmjs.com/package/oazapfts
  */
 import * as Oazapfts from "@oazapfts/runtime";
+import * as QS from "@oazapfts/runtime/query";
 export const defaults: Oazapfts.Defaults<Oazapfts.CustomHeaders> = {
     headers: {},
     baseUrl: "/",
@@ -182,43 +183,63 @@ export type IWeather = {
     description?: string | null;
     iconId?: string | null;
 };
-export function getAsset(opts?: Oazapfts.RequestOpts) {
+export function getAsset({ clientIdentifier }: {
+    clientIdentifier?: string;
+} = {}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.fetchJson<{
         status: 200;
         data: AssetResponseDto[];
-    }>("/api/Asset", {
+    }>(`/api/Asset${QS.query(QS.explode({
+        clientIdentifier
+    }))}`, {
         ...opts
     });
 }
-export function getImage(id: string, opts?: Oazapfts.RequestOpts) {
+export function getImage(id: string, { clientIdentifier }: {
+    clientIdentifier?: string;
+} = {}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.fetchBlob<{
         status: 200;
         data: Blob;
-    }>(`/api/Asset/${encodeURIComponent(id)}`, {
+    }>(`/api/Asset/${encodeURIComponent(id)}${QS.query(QS.explode({
+        clientIdentifier
+    }))}`, {
         ...opts
     });
 }
-export function getAppointments(opts?: Oazapfts.RequestOpts) {
+export function getAppointments({ clientIdentifier }: {
+    clientIdentifier?: string;
+} = {}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.fetchJson<{
         status: 200;
         data: IAppointment[];
-    }>("/api/Calendar", {
+    }>(`/api/Calendar${QS.query(QS.explode({
+        clientIdentifier
+    }))}`, {
         ...opts
     });
 }
-export function getConfig(opts?: Oazapfts.RequestOpts) {
+export function getConfig({ clientIdentifier }: {
+    clientIdentifier?: string;
+} = {}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.fetchJson<{
         status: 200;
         data: WebClientSettings;
-    }>("/api/Config", {
+    }>(`/api/Config${QS.query(QS.explode({
+        clientIdentifier
+    }))}`, {
         ...opts
     });
 }
-export function getWeather(opts?: Oazapfts.RequestOpts) {
+export function getWeather({ clientIdentifier }: {
+    clientIdentifier?: string;
+} = {}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.fetchJson<{
         status: 200;
         data: IWeather;
-    }>("/api/Weather", {
+    }>(`/api/Weather${QS.query(QS.explode({
+        clientIdentifier
+    }))}`, {
         ...opts
     });
 }
diff --git a/immichFrame.Web/src/routes/+page.ts b/immichFrame.Web/src/routes/+page.ts
@@ -1,9 +1,9 @@
 import * as api from '$lib/immichFrameApi';
 import { configStore } from '$lib/stores/config.store.js'
 
-export const load = async ({ fetch }) => {
+export const load = async () => {
 
-  const configRequest = await api.getConfig({ fetch });
+  const configRequest = await api.getConfig({ clientIdentifier: "" });
 
   const config = configRequest.data;