feat(people-provider): update PeopleApiClient photo method return type

Update PeopleApiClient.photo method to return PersonPhotoApiResponse instead of Blob since the IHttpClient interface has changed

Adjust related types and methods to handle the updated return type
Modify PersonController to map the API response to Blob and handle errors appropriately

.changeset/dry-experts-vanish.md

@@ -0,0 +1,33 @@
+---
+'@equinor/fusion-framework-react-components-people-provider': minor
+'@equinor/fusion-framework-module-services': minor
+---
+
+## @equinor/fusion-framework-module-services
+
+Updated the `PeopleApiClient.photo` method to properly type the response as `PersonPhotoApiResponse<TVersion>` instead of `Blob`. This allows for more accurate type checking when using the method.
+
+To update your code:
+
+-   If you are using the `PeopleApiClient.photo` method directly, no changes are needed. The method will now properly type the response.
+-   If you have custom type assertions or checks around the response from `PeopleApiClient.photo`, you may need to update them to handle `PersonPhotoApiResponse<TVersion>` instead of `Blob`.
+
+Example:
+
+```ts
+// Before
+const photoResponse: Blob = await peopleApiClient.photo(
+    'v2', 
+    'blob', 
+    { azureId: '123' }
+);
+console.log(typeof photoResponse); // Blob
+
+// After
+const photoResponse: PersonPhotoApiResponse<'v2'> = await peopleApiClient.photo(
+    'v2', 
+    'blob', 
+    { azureId: '123' }
+);
+console.log(typeof photoResponse); // Object - { filename: string, blob: Blob }
+```

packages/modules/services/src/people/client.ts

@@ -83,7 +83,7 @@ export class PeopleApiClient<
     public photo<
         TVersion extends PersonPhotoSupportedApiVersion,
         TArgs extends PersonPhotoApiRequestArgs<TVersion>,
-        TResult extends Blob = PersonPhotoApiResponse<TVersion>,
+        TResult extends PersonPhotoApiResponse<TVersion> = PersonPhotoApiResponse<TVersion>,
         TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
     >(
         version: TVersion,

packages/modules/services/src/people/person-photo/client.ts

@@ -1,4 +1,7 @@
-import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import {
+    type ClientRequestInit,
+    type IHttpClient,
+} from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -22,12 +25,13 @@ export const client =
         version: TVersion,
         method: TMethod = 'blob' as TMethod,
     ) =>
-    <T extends Blob = ApiResponse<TVersion>>(
+    <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
         args: TArgs,
         init?: ClientRequestInit<TClient, T>,
-    ): ClientDataMethod[TMethod] =>
-        client[method](
+    ): ClientDataMethod<T>[TMethod] => {
+        return client[method](
             ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ClientDataMethod[TMethod];
+        ) as ClientDataMethod<T>[TMethod];
+    };
 
 export default client;

packages/modules/services/src/people/person-photo/types.ts

@@ -1,3 +1,4 @@
+import { BlobResult } from '@equinor/fusion-framework-module-http/client';
 import { ApiVersion } from '../static';
 import { ClientDataMethod } from '../../types';
 
@@ -15,7 +16,7 @@ export type ApiRequestArgs<T extends SupportedApiVersion> =
     ApiRequestArgsMap[(typeof ApiVersion)[T]];
 
 type ApiResponseTypes = {
-    [ApiVersion.v2]: Blob;
+    [ApiVersion.v2]: BlobResult;
 };
 
 export type ApiResponse<T extends SupportedApiVersion> = ApiResponseTypes[(typeof ApiVersion)[T]];

packages/modules/services/src/types.ts

@@ -1,8 +1,9 @@
 import {
     ClientRequestInit,
     IHttpClient,
-    FetchResponse,
     StreamResponse,
+    BlobResult,
+    FetchResponse,
 } from '@equinor/fusion-framework-module-http/client';
 
 export type ApiClientFactory<TClient extends IHttpClient = IHttpClient> = (
@@ -38,9 +39,9 @@ export type ClientMethod<T = unknown> = {
     json$: StreamResponse<T>;
 };
 
-export type ClientDataMethod = {
-    blob: Blob;
-    blob$: StreamResponse<Blob>;
+export type ClientDataMethod<T extends BlobResult = BlobResult> = {
+    blob: Promise<T>;
+    blob$: StreamResponse<T>;
 };
 
 export type ClientMethodType = keyof ClientMethod;

packages/react/components/people-resolver/src/PersonController.ts

@@ -88,14 +88,20 @@ export class PersonController implements IPersonController {
             queueOperator: 'merge',
             key: ({ azureId }) => azureId,
             client: {
-                fn: ({ azureId }, signal) => {
+                fn: ({ azureId }, signal): Observable<Blob> => {
                     return client.photo('v2', 'blob$', { azureId }, { signal }).pipe(
+                        map((result) => {
+                            return result.blob;
+                        }),
                         catchError((err) => {
-                            const apiError = err as ApiProviderError;
-                            if (apiError.response.status === 404 && options?.fallbackImage) {
+                            if (
+                                (err as Error).name === 'ApiProviderError' &&
+                                (err as ApiProviderError).response?.status === 404 &&
+                                options?.fallbackImage
+                            ) {
                                 return of(options?.fallbackImage);
                             }
-                            return of(err);
+                            throw err;
                         }),
                     );
                 },