@equinor/fusion-framework-module-services 5.1.1-msal-0b0dadf270ee512f019a325c2f1586f91f9150a4 → 5.1.2

package/src/people/api-models.v4.ts

@@ -1,114 +1,114 @@
-import {
-    ApiAccountClassification,
-    ApiInvitationStatus,
-    ApiManager,
-    ApiProfileAccountLink,
-    ApiProfileAccountType,
-    ApiProjectMaster,
+import type {
+  ApiAccountClassification,
+  ApiInvitationStatus,
+  ApiManager,
+  ApiProfileAccountLink,
+  ApiProfileAccountType,
+  ApiProjectMaster,
 } from './api-models';
 
 export type ApiPersonExpandMap_v4 = {
-    roles: Array<ApiPersonRole_v4>;
-    positions: Array<ApiPersonPosition_v4>;
-    contracts: Array<ApiPersonContract_v4>;
-    manager: ApiManager;
-    companies: Array<ApiCompanyInfo_v4>;
+  roles: Array<ApiPersonRole_v4>;
+  positions: Array<ApiPersonPosition_v4>;
+  contracts: Array<ApiPersonContract_v4>;
+  manager: ApiManager;
+  companies: Array<ApiCompanyInfo_v4>;
 };
 
 export type ApiPersonExpandProps_v4 = keyof ApiPersonExpandMap_v4;
 
 export type ApiPerson_v4<TExpand extends Array<ApiPersonExpandProps_v4> = []> = {
-    azureUniqueId: string;
-    mail?: string;
-    name?: string;
-    jobTitle?: string;
-    department?: string;
-    fullDepartment?: string;
-    mobilePhone?: string;
-    officeLocation?: string;
-    upn?: string;
-    isResourceOwner?: boolean;
-    isExpired?: boolean;
-    expiredDate?: string;
-    isPrimaryAccount?: boolean;
-    preferredContactMail?: string;
-    accountType?: ApiProfileAccountType;
+  azureUniqueId: string;
+  mail?: string;
+  name?: string;
+  jobTitle?: string;
+  department?: string;
+  fullDepartment?: string;
+  mobilePhone?: string;
+  officeLocation?: string;
+  upn?: string;
+  isResourceOwner?: boolean;
+  isExpired?: boolean;
+  expiredDate?: string;
+  isPrimaryAccount?: boolean;
+  preferredContactMail?: string;
+  accountType?: ApiProfileAccountType;
 
-    // TODO is this default
-    invitationStatus?: ApiInvitationStatus;
-    accountClassification?: ApiAccountClassification;
-    managerAzureUniqueId?: string;
+  // TODO is this default
+  invitationStatus?: ApiInvitationStatus;
+  accountClassification?: ApiAccountClassification;
+  managerAzureUniqueId?: string;
 
-    // TODO is this default
-    linkedAccounts?: Array<ApiProfileAccountLink>;
+  // TODO is this default
+  linkedAccounts?: Array<ApiProfileAccountLink>;
 } & /** expanded */ Partial<ApiPersonExpandMap_v4> & {
-        /** Provided */
-        [K in TExpand[number]]: ApiPersonExpandMap_v4[K];
-    };
+    /** Provided */
+    [K in TExpand[number]]: ApiPersonExpandMap_v4[K];
+  };
 
 export type ApiCompanyInfo_v4 = {
-    id: string;
-    name?: string;
+  id: string;
+  name?: string;
 };
 
 export type ApiPersonRole_v4 = {
-    name?: string;
-    displayName?: string;
-    sourceSystem?: string;
-    type?: string;
-    isActive?: boolean;
-    activeToUtc?: string;
-    onDemandSupport?: boolean;
-    scopes?: Array<ApiPersonRoleScope_v4>;
+  name?: string;
+  displayName?: string;
+  sourceSystem?: string;
+  type?: string;
+  isActive?: boolean;
+  activeToUtc?: string;
+  onDemandSupport?: boolean;
+  scopes?: Array<ApiPersonRoleScope_v4>;
 };
 
 export type ApiPersonRoleScope_v4 = {
-    type?: string;
-    values?: string[];
-    valueType?: string;
+  type?: string;
+  values?: string[];
+  valueType?: string;
 };
 
 export type ApiPersonPosition_v4 = {
-    positionId: string;
-    positionExternalId?: string;
-    id: string;
-    parentPositionId?: string;
-    taskOwnerIds?: string[];
-    name?: string;
-    obs?: string;
-    basePosition: ApiPersonBasePosition_v4;
-    project: ApiPersonProject_v4;
-    appliesFrom: string;
-    appliesTo: string;
-    workload?: number;
+  positionId: string;
+  positionExternalId?: string;
+  id: string;
+  parentPositionId?: string;
+  taskOwnerIds?: string[];
+  name?: string;
+  obs?: string;
+  basePosition: ApiPersonBasePosition_v4;
+  project: ApiPersonProject_v4;
+  appliesFrom: string;
+  appliesTo: string;
+  workload?: number;
 };
 
 export type ApiPersonBasePosition_v4 = {
-    id: string;
-    name?: string;
-    type?: string;
-    discipline?: string;
+  id: string;
+  name?: string;
+  type?: string;
+  discipline?: string;
 };
 
 export type ApiPersonProject_v4 = {
-    id: string;
-    name?: string;
-    domainId?: string;
-    type?: string;
+  id: string;
+  name?: string;
+  domainId?: string;
+  type?: string;
 };
 
 export type ApiPersonContract_v4 = {
-    id: string;
-    name?: string;
-    contractNumber?: string;
-    companyId?: string;
-    companyName?: string;
-    project: ApiPersonProject_v4;
-    projectMaster: ApiProjectMaster;
-    positions: Array<ApiPersonPosition_v4>;
+  id: string;
+  name?: string;
+  contractNumber?: string;
+  companyId?: string;
+  companyName?: string;
+  project: ApiPersonProject_v4;
+  projectMaster: ApiProjectMaster;
+  positions: Array<ApiPersonPosition_v4>;
 };
 
 export type ApiCompanyInfoV4 = {
-    id: string;
-    name?: string;
+  id: string;
+  name?: string;
 };

package/src/people/client.ts

@@ -1,99 +1,95 @@
-import { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
+import type { IHttpClient, ClientRequestInit } from '@equinor/fusion-framework-module-http/client';
 
 import type { ClientDataMethod, ClientMethod } from '../types';
 import { ApiVersion } from './static';
 
 import {
-    client as personDetailClient,
-    ApiResponse as PersonDetailApiResponse,
-    ApiResult as PersonDetailResult,
-    SupportedApiVersion as PersonDetailSupportedApiVersion,
-    ApiRequestArgs as PersonDetailApiRequestArgs,
+  client as personDetailClient,
+  type ApiResponse as PersonDetailApiResponse,
+  type ApiResult as PersonDetailResult,
+  type SupportedApiVersion as PersonDetailSupportedApiVersion,
+  type ApiRequestArgs as PersonDetailApiRequestArgs,
 } from './person-details';
 
 import {
-    client as personQueryClient,
-    ApiResponse as PersonQueryApiResponse,
-    ApiResult as PersonQueryResult,
-    SupportedApiVersion as PersonQuerySupportedApiVersion,
-    ApiRequestArgs as PersonQueryApiRequestArgs,
+  client as personQueryClient,
+  type ApiResponse as PersonQueryApiResponse,
+  type ApiResult as PersonQueryResult,
+  type SupportedApiVersion as PersonQuerySupportedApiVersion,
+  type ApiRequestArgs as PersonQueryApiRequestArgs,
 } from './query';
 
 import {
-    client as personPhotoClient,
-    ApiResponse as PersonPhotoApiResponse,
-    ApiResult as PersonPhotoResult,
-    SupportedApiVersion as PersonPhotoSupportedApiVersion,
-    ApiRequestArgs as PersonPhotoApiRequestArgs,
+  client as personPhotoClient,
+  type ApiResponse as PersonPhotoApiResponse,
+  type ApiResult as PersonPhotoResult,
+  type SupportedApiVersion as PersonPhotoSupportedApiVersion,
+  type ApiRequestArgs as PersonPhotoApiRequestArgs,
 } from './person-photo';
 
 export class PeopleApiClient<
-    // TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TClient extends IHttpClient = IHttpClient,
+  // TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+  TClient extends IHttpClient = IHttpClient,
 > {
-    get Version(): typeof ApiVersion {
-        return ApiVersion;
-    }
+  get Version(): typeof ApiVersion {
+    return ApiVersion;
+  }
 
-    constructor(protected _client: TClient) {}
+  constructor(protected _client: TClient) {}
 
-    /**
-     * Fetch person by id
-     */
-    public get<
-        TVersion extends PersonDetailSupportedApiVersion,
-        TArgs extends PersonDetailApiRequestArgs<TVersion>,
-        TResult extends PersonDetailApiResponse<TVersion, TArgs>,
-        TMethod extends keyof ClientMethod<TResult>,
-    >(
-        version: TVersion,
-        method: TMethod,
-        args: TArgs,
-        init?: ClientRequestInit<TClient, TResult>,
-    ): PersonDetailResult<TVersion, TArgs, TMethod, TResult> {
-        const fn = personDetailClient<TVersion, TMethod, TClient, TArgs>(
-            this._client,
-            version,
-            method,
-        );
-        return fn(args, init);
-    }
+  /**
+   * Fetch person by id
+   */
+  public get<
+    TVersion extends PersonDetailSupportedApiVersion,
+    TArgs extends PersonDetailApiRequestArgs<TVersion>,
+    TResult extends PersonDetailApiResponse<TVersion, TArgs>,
+    TMethod extends keyof ClientMethod<TResult>,
+  >(
+    version: TVersion,
+    method: TMethod,
+    args: TArgs,
+    init?: ClientRequestInit<TClient, TResult>,
+  ): PersonDetailResult<TVersion, TArgs, TMethod, TResult> {
+    const fn = personDetailClient<TVersion, TMethod, TClient, TArgs>(this._client, version, method);
+    return fn(args, init);
+  }
 
-    /**
-     * Query person service
-     */
-    public query<
-        TVersion extends PersonQuerySupportedApiVersion,
-        TArgs extends PersonQueryApiRequestArgs<TVersion>,
-        TResult = PersonQueryApiResponse<TVersion>,
-        TMethod extends keyof ClientMethod<TResult> = keyof ClientMethod<TResult>,
-    >(
-        version: TVersion,
-        method: TMethod,
-        args: TArgs,
-        init?: ClientRequestInit<TClient, TResult>,
-    ): PersonQueryResult<TVersion, TMethod, TResult> {
-        const fn = personQueryClient<TVersion, TMethod, TClient>(this._client, version, method);
-        return fn<TResult>(args, init);
-    }
+  /**
+   * Query person service
+   */
+  public query<
+    TVersion extends PersonQuerySupportedApiVersion,
+    TArgs extends PersonQueryApiRequestArgs<TVersion>,
+    TResult = PersonQueryApiResponse<TVersion>,
+    TMethod extends keyof ClientMethod<TResult> = keyof ClientMethod<TResult>,
+  >(
+    version: TVersion,
+    method: TMethod,
+    args: TArgs,
+    init?: ClientRequestInit<TClient, TResult>,
+  ): PersonQueryResult<TVersion, TMethod, TResult> {
+    const fn = personQueryClient<TVersion, TMethod, TClient>(this._client, version, method);
+    return fn<TResult>(args, init);
+  }
 
-    /**
-     * Photo person service
-     */
-    public photo<
-        TVersion extends PersonPhotoSupportedApiVersion,
-        TArgs extends PersonPhotoApiRequestArgs<TVersion>,
-        TResult extends PersonPhotoApiResponse<TVersion> = PersonPhotoApiResponse<TVersion>,
-        TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
-    >(
-        version: TVersion,
-        method: TMethod,
-        args: TArgs,
-        init?: ClientRequestInit<TClient, TResult>,
-    ): PersonPhotoResult<TMethod> {
-        const fn = personPhotoClient<TVersion, TMethod, TClient>(this._client, version, method);
-        return fn<TResult>(args, init);
-    }
+  /**
+   * Photo person service
+   */
+  public photo<
+    TVersion extends PersonPhotoSupportedApiVersion,
+    TArgs extends PersonPhotoApiRequestArgs<TVersion>,
+    TResult extends PersonPhotoApiResponse<TVersion> = PersonPhotoApiResponse<TVersion>,
+    TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
+  >(
+    version: TVersion,
+    method: TMethod,
+    args: TArgs,
+    init?: ClientRequestInit<TClient, TResult>,
+  ): PersonPhotoResult<TMethod> {
+    const fn = personPhotoClient<TVersion, TMethod, TClient>(this._client, version, method);
+    return fn<TResult>(args, init);
+  }
 }
 
 // const oo = new PeopleApiClient(null).get('v4', 'fetch', { azureId: '123' });

package/src/people/person-details/client.ts

@@ -1,4 +1,4 @@
-import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import type { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -12,22 +12,25 @@ import type { ApiResponse, ApiResult, ApiRequestArgs, SupportedApiVersion } from
  * @param method - client method to call
  */
 export const client =
-    <
-        TVersion extends SupportedApiVersion,
-        TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient,
-        TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
-    >(
-        client: TClient,
-        version: TVersion,
-        method: TMethod = 'json' as TMethod,
-    ) =>
-    <T = ApiResponse<TVersion, TArgs>>(
-        args: TArgs,
-        init?: ClientRequestInit<TClient, T>,
-    ): ApiResult<TVersion, TArgs, TMethod, T> =>
-        client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ApiResult<TVersion, TArgs, TMethod, T>;
+  <
+    TVersion extends SupportedApiVersion,
+    TMethod extends keyof ClientMethod = keyof ClientMethod,
+    TClient extends IHttpClient = IHttpClient,
+    TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
+  >(
+    client: TClient,
+    version: TVersion,
+    method: TMethod = 'json' as TMethod,
+  ) =>
+  <T = ApiResponse<TVersion, TArgs>>(
+    args: TArgs,
+    init?: ClientRequestInit<TClient, T>,
+  ): ApiResult<TVersion, TArgs, TMethod, T> =>
+    client[method](...generateParameters<T, TVersion, TClient>(version, args, init)) as ApiResult<
+      TVersion,
+      TArgs,
+      TMethod,
+      T
+    >;
 
 export default client;

package/src/people/person-details/generate-endpoint.ts

@@ -7,22 +7,22 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
  * Method for generating endpoint for getting context by id
  */
 export const generateEndpoint = <TVersion extends SupportedApiVersion>(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
 ) => {
-    const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
-    switch (apiVersion) {
-        case ApiVersion.v4: {
-            const { azureId, expand } = args;
-            const params = new URLSearchParams();
-            params.append('api-version', apiVersion);
-            if (expand) {
-                params.append('$expand', expand.join(','));
-            }
-            return `/persons/${azureId}?${String(params)}`;
-        }
-        default: {
-            throw new UnsupportedApiVersion(version);
-        }
+  const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
+  switch (apiVersion) {
+    case ApiVersion.v4: {
+      const { azureId, expand } = args;
+      const params = new URLSearchParams();
+      params.append('api-version', apiVersion);
+      if (expand) {
+        params.append('$expand', expand.join(','));
+      }
+      return `/persons/${azureId}?${String(params)}`;
     }
+    default: {
+      throw new UnsupportedApiVersion(version);
+    }
+  }
 };

package/src/people/person-details/generate-parameters.ts

@@ -7,16 +7,16 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
 
 /** function for creating http client arguments  */
 export const generateParameters = <
-    TResult,
-    TVersion extends SupportedApiVersion,
-    TClient extends IHttpClient = IHttpClient,
+  TResult,
+  TVersion extends SupportedApiVersion,
+  TClient extends IHttpClient = IHttpClient,
 >(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
+  init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
-    const path = generateEndpoint(version, args);
-    return [path, init];
+  const path = generateEndpoint(version, args);
+  return [path, init];
 };
 
 export default generateParameters;

package/src/people/person-details/types.ts

@@ -1,33 +1,33 @@
 import { ApiVersion } from '../static';
 import type { ApiPerson_v4, ApiPersonExpandProps_v4 } from '../api-models.v4';
-import { ClientMethod } from '../../types';
+import type { ClientMethod } from '../../types';
 
 export type SupportedApiVersion = Extract<keyof typeof ApiVersion, 'v4'>;
 
 type ApiRequestArgsMap = {
-    [ApiVersion.v4]: {
-        azureId: string;
-        expand?: Array<ApiPersonExpandProps_v4>;
-    };
+  [ApiVersion.v4]: {
+    azureId: string;
+    expand?: Array<ApiPersonExpandProps_v4>;
+  };
 };
 
 export type AllowedArgs = ApiRequestArgsMap[keyof ApiRequestArgsMap];
 
 export type ApiRequestArgs<T extends SupportedApiVersion> =
-    ApiRequestArgsMap[(typeof ApiVersion)[T]];
+  ApiRequestArgsMap[(typeof ApiVersion)[T]];
 
 type ApiResponseTypes<TArgs extends AllowedArgs> = {
-    [ApiVersion.v4]: ApiPerson_v4<TArgs['expand'] extends [] ? TArgs['expand'] : []>;
+  [ApiVersion.v4]: ApiPerson_v4<TArgs['expand'] extends [] ? TArgs['expand'] : []>;
 };
 
 export type ApiResponse<
-    T extends SupportedApiVersion,
-    TArgs extends AllowedArgs,
+  T extends SupportedApiVersion,
+  TArgs extends AllowedArgs,
 > = ApiResponseTypes<TArgs>[(typeof ApiVersion)[T]];
 
 export type ApiResult<
-    TVersion extends SupportedApiVersion,
-    TArgs extends ApiRequestArgs<TVersion>,
-    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TResult = ApiResponse<TVersion, TArgs>,
+  TVersion extends SupportedApiVersion,
+  TArgs extends ApiRequestArgs<TVersion>,
+  TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+  TResult = ApiResponse<TVersion, TArgs>,
 > = ClientMethod<TResult>[TMethod];

package/src/people/person-photo/client.ts

@@ -1,7 +1,4 @@
-import {
-    type ClientRequestInit,
-    type IHttpClient,
-} from '@equinor/fusion-framework-module-http/client';
+import type { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -15,23 +12,23 @@ import type { ApiResponse, ApiRequestArgs, SupportedApiVersion } from './types';
  * @param method - client method to call
  */
 export const client =
-    <
-        TVersion extends SupportedApiVersion,
-        TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
-        TClient extends IHttpClient = IHttpClient,
-        TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
-    >(
-        client: TClient,
-        version: TVersion,
-        method: TMethod = 'blob' as TMethod,
-    ) =>
-    <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
-        args: TArgs,
-        init?: ClientRequestInit<TClient, T>,
-    ): ClientDataMethod<T>[TMethod] => {
-        return client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ClientDataMethod<T>[TMethod];
-    };
+  <
+    TVersion extends SupportedApiVersion,
+    TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
+    TClient extends IHttpClient = IHttpClient,
+    TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
+  >(
+    client: TClient,
+    version: TVersion,
+    method: TMethod = 'blob' as TMethod,
+  ) =>
+  <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
+    args: TArgs,
+    init?: ClientRequestInit<TClient, T>,
+  ): ClientDataMethod<T>[TMethod] => {
+    return client[method](
+      ...generateParameters<T, TVersion, TClient>(version, args, init),
+    ) as ClientDataMethod<T>[TMethod];
+  };
 
 export default client;

package/src/people/person-photo/generate-endpoint.ts

@@ -7,19 +7,19 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
  * Method for generating endpoint for getting context by id
  */
 export const generateEndpoint = <TVersion extends SupportedApiVersion>(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
 ) => {
-    const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
-    switch (apiVersion) {
-        case ApiVersion.v2: {
-            const { azureId } = args;
-            const params = new URLSearchParams();
-            params.append('api-version', apiVersion);
-            return `/persons/${azureId}/photo?${String(params)}`;
-        }
-        default: {
-            throw new UnsupportedApiVersion(version);
-        }
+  const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
+  switch (apiVersion) {
+    case ApiVersion.v2: {
+      const { azureId } = args;
+      const params = new URLSearchParams();
+      params.append('api-version', apiVersion);
+      return `/persons/${azureId}/photo?${String(params)}`;
     }
+    default: {
+      throw new UnsupportedApiVersion(version);
+    }
+  }
 };

package/src/people/person-photo/generate-parameters.ts

@@ -7,16 +7,16 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
 
 /** function for creating http client arguments  */
 export const generateParameters = <
-    TResult,
-    TVersion extends SupportedApiVersion,
-    TClient extends IHttpClient = IHttpClient,
+  TResult,
+  TVersion extends SupportedApiVersion,
+  TClient extends IHttpClient = IHttpClient,
 >(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
+  init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
-    const path = generateEndpoint(version, args);
-    return [path, init];
+  const path = generateEndpoint(version, args);
+  return [path, init];
 };
 
 export default generateParameters;