@ixo/common 1.1.33 → 1.1.35

package/src/services/session-manager/session-manager.service.ts

@@ -401,18 +401,19 @@ ___________________________________________________________
     let userContext: UserContextData | undefined;
     if (
       this.memoryEngineService &&
-      createSessionDto.oracleToken &&
-      createSessionDto.userToken
+      (createSessionDto.ucanInvocation ||
+        (createSessionDto.oracleToken && createSessionDto.userToken))
     ) {
       try {
         Logger.debug('Gathering user context from Memory Engine');
         userContext = await this.memoryEngineService.gatherUserContext({
           oracleDid: createSessionDto.oracleDid,
           roomId,
-          oracleToken: createSessionDto.oracleToken,
-          userToken: createSessionDto.userToken,
+          oracleToken: createSessionDto.oracleToken ?? '',
+          userToken: createSessionDto.userToken ?? '',
           oracleHomeServer: createSessionDto.oracleHomeServer ?? '',
           userHomeServer: createSessionDto.userHomeServer ?? '',
+          ucanInvocation: createSessionDto.ucanInvocation,
         });
       } catch (error) {
         Logger.error('Failed to gather user context:', error);

package/src/utils/get-user-subscription.ts

@@ -34,25 +34,32 @@ export interface GetUserSubscriptionParams {
   network: 'mainnet' | 'testnet' | 'devnet';
   bearerToken: string;
   subscriptionUrl?: string;
+  /** When set to 'ucan', includes X-Auth-Type header for UCAN invocation auth */
+  authType?: 'ucan';
 }
 
 export const getUserSubscription = async ({
   bearerToken,
   network,
   subscriptionUrl: _subscriptionUrl,
+  authType,
 }: GetUserSubscriptionParams): Promise<GetMySubscriptionsResponseDto | null> => {
   const subscriptionUrl =
     _subscriptionUrl ?? getSubscriptionUrlByNetwork(network);
   try {
     Logger.debug('Fetching user subscription from:', subscriptionUrl);
+    const headers: Record<string, string> = {
+      Authorization: `Bearer ${bearerToken}`,
+      'Content-Type': 'application/json',
+    };
+    if (authType === 'ucan') {
+      headers['X-Auth-Type'] = 'ucan';
+    }
     const response = await fetch(
       `${subscriptionUrl.endsWith('/') ? subscriptionUrl.slice(0, -1) : subscriptionUrl}/api/v1/subscriptions`,
       {
         method: 'GET',
-        headers: {
-          Authorization: `Bearer ${bearerToken}`,
-          'Content-Type': 'application/json',
-        },
+        headers,
       },
     );