@cinerino/sdk 18.3.0 → 18.4.0-alpha.1

package/lib/abstract/chevre/event/factory.d.ts

@@ -77,7 +77,7 @@ export interface IFindSubEventsParams {
 /**
  * イベントのサブカタログ検索結果
  */
-export type ISearchOfferCatalogItemResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'additionalProperty' | 'relatedOffer'> & {
+export type ISearchOfferCatalogItemResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'relatedOffer'> & {
     /**
      * カタログ内インデックス
      */

package/lib/abstract/chevreAdmin/offerCatalogItem.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../factory';
 import { Service } from '../service';
-type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
+type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'relatedOffer'> & {
     /**
      * アイテム数
      */

package/lib/abstract/chevreConsole/offerCatalog.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../factory';
 import { Service } from '../service';
-type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
+type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered'> & {
     /**
      * アイテム数
      */
@@ -13,7 +13,7 @@ type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id'
 type IItemAsOffer = Pick<factory.unitPriceOffer.IUnitPriceOffer, 'id' | 'identifier' | 'name' | 'alternateName' | 'priceSpecification' | 'typeOf'> & {
     sortIndex?: number;
 };
-type IItemAsOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
+type IItemAsOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'typeOf' | 'identifier' | 'itemOffered' | 'relatedOffer'> & {
     sortIndex?: number;
 };
 type IItemListElement = IItemAsOffer | IItemAsOfferCatalog;

package/lib/abstract/chevreConsole/offerCatalogItem.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../factory';
 import { Service } from '../service';
-type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
+type IOfferCatalogAsSearchResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'relatedOffer'> & {
     /**
      * アイテム数
      */

package/lib/abstract/transporters.js

@@ -67,6 +67,7 @@ class DefaultTransporter {
             // Headers インスタンス化して大文字・小文字を吸収する
             const headers = new Headers(options.headers);
             const currentUserAgent = headers.get('user-agent');
+            /* istanbul ignore else -- @preserve */
             if (!currentUserAgent) {
                 headers.set('user-agent', DefaultTransporter.USER_AGENT);
             }

package/lib/auth/clientCredentialsClient.d.ts

@@ -1,11 +1,15 @@
 import { ICredentials } from './credentials';
-import { OAuth2client } from './oAuth2client';
+import { OAuth2client, IIAPHeaderGenerator } from './oAuth2client';
 export interface IOptions {
     domain: string;
     clientId: string;
     clientSecret: string;
     scopes: string[];
     state: string;
+    /**
+     * Google IAP認証ヘッダー生成関数
+     */
+    iapHeaderGenerator?: IIAPHeaderGenerator;
 }
 /**
  * クライアント認証OAuthクライアント

package/lib/auth/implicitGrantClient.d.ts

@@ -12,6 +12,7 @@ export interface IOptions {
     nonce: string | null;
     audience?: string;
     tokenIssuer: string;
+    iapHeaderGenerator?: never;
 }
 /**
  * OAuth2 client using grant type 'implicit grant'
@@ -21,7 +22,8 @@ export declare class ImplicitGrantClient extends OAuth2client {
     static LOGOUT_URL: string;
     options: IOptions;
     credentials: ICredentials;
-    constructor(options: IOptions);
+    constructor({ iapHeaderGenerator: _iapHeaderGenerator, // browserではひとまず非対応(2026-11-05~)
+    ...options }: IOptions);
     static BUILD_PASRSE_HASH_RESPONS(qsParams: any, __: string, idTokenPayload: any): ICredentials;
     isSignedIn(): Promise<ICredentials | null>;
     getAccessToken(): Promise<string>;

package/lib/auth/implicitGrantClient.js

@@ -23,7 +23,8 @@ class ImplicitGrantClient extends oAuth2client_1.OAuth2client {
     static LOGOUT_URL = '/logout';
     options;
     credentials;
-    constructor(options) {
+    constructor({ iapHeaderGenerator: _iapHeaderGenerator, // browserではひとまず非対応(2026-11-05~)
+    ...options }) {
         // assert.check(
         //     options,
         //     { type: 'object', message: 'options parameter is not valid' },

package/lib/auth/oAuth2client.d.ts

@@ -16,6 +16,7 @@ interface IPreFetchParams {
 type IPreFetch = (params: IPreFetchParams) => Promise<{
     options: RequestInit;
 }>;
+export type IIAPHeaderGenerator = () => Promise<string>;
 export interface IOptions {
     domain: string;
     clientId?: string;
@@ -29,6 +30,10 @@ export interface IOptions {
     nonce?: string | null;
     audience?: string;
     tokenIssuer?: string;
+    /**
+     * Google IAP認証ヘッダー生成関数
+     */
+    iapHeaderGenerator?: IIAPHeaderGenerator;
 }
 export interface IVerifyIdTokenOptions {
     audience?: string | string[];

package/lib/auth/oAuth2client.js

@@ -243,7 +243,6 @@ class OAuth2client {
     ) {
         // Callbacks will close over this to ensure that we only retry once
         let retry = true;
-        options.headers = (options.headers === undefined || options.headers === null) ? {} : options.headers;
         let result;
         let numberOfTry = 0;
         while (result === undefined) {
@@ -252,8 +251,23 @@ class OAuth2client {
                 if (numberOfTry > exports.MAX_RETRY_NUM) {
                     retry = false;
                 }
-                options.headers.Authorization = `Bearer ${await this.getAccessToken()}`;
-                result = await this.makeFetch(url, options, expectedStatusCodes);
+                // Headers インスタンスに正規化してプロパティ欠落を防止
+                const headers = new Headers((options.headers === undefined || options.headers === null) ? {} : options.headers);
+                // options.headers = (options.headers === undefined || options.headers === null) ? {} : options.headers;
+                // support IAP(2026-11-04~)
+                /* istanbul ignore if */
+                if (typeof this.options.iapHeaderGenerator === 'function') {
+                    console.log('await this.options.iapHeaderGenerator():', await this.options.iapHeaderGenerator());
+                    headers.set('Proxy-Authorization', `${await this.options.iapHeaderGenerator()}`);
+                }
+                headers.set('Authorization', `Bearer ${await this.getAccessToken()}`);
+                // (options.headers as Record<string, string>).Authorization = `Bearer ${await this.getAccessToken()}`;
+                // options に正規化した headers を戻す
+                const makeFetchOptions = {
+                    ...options,
+                    headers
+                };
+                result = await this.makeFetch(url, makeFetchOptions, expectedStatusCodes);
                 break;
             }
             catch (error) {

package/lib/browser.d.ts

@@ -7,4 +7,4 @@ export { loadCloudAdmin, loadCloudAsset, loadCloudPay, loadCloudSearch, loadClou
 /**
  * create OAuth2 client instance using implicit grant
  */
-export declare function createAuthInstance(options: IImplicitGrantClientOptions): ImplicitGrantClient;
+export declare function createAuthInstance(options: Pick<IImplicitGrantClientOptions, 'audience' | 'clientId' | 'domain' | 'logoutUri' | 'nonce' | 'redirectUri' | 'responseMode' | 'responseType' | 'scope' | 'state' | 'tokenIssuer'>): ImplicitGrantClient;