Add authInfo to align with CDS (#378)

* add authInfo to align with CDS

* upgrade cds

* wip

* wip

Author: soccermax

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v1.11.0 - 2025-07-09
+
+### Added
+
+- Added `authInfo` to cds.User as CDS 9.3 deprecated `tokenInfo`.
+
 ## v1.10.10 - 2025-07-09
 
 ### Fixed

package-lock.json

@@ -48,17 +48,17 @@
   },
   "dependencies": {
     "@sap/xssec": "^4.6.0",
-    "cron-parser": "^5.2.0",
+    "cron-parser": "^5.3.1",
     "redis": "^4.7.0",
     "verror": "^1.10.1",
     "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@cap-js/cds-test": "^0.4.0",
-    "@cap-js/hana": "^2.1.0",
+    "@cap-js/hana": "^2.2.0",
     "@cap-js/sqlite": "^2.0.1",
-    "@sap/cds": "^9.1.0",
-    "@sap/cds-dk": "^9.1.0",
+    "@sap/cds": "^9.3.1",
+    "@sap/cds-dk": "^9.3.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.6.0",

package.json

@@ -114,7 +114,7 @@ class Config {
   #redisNamespace;
   #publishEventBlockList;
   #crashOnRedisUnavailable;
-  #tenantIdFilterTokenInfoCb;
+  #tenantIdFilterAuthContextCb;
   #tenantIdFilterEventProcessingCb;
   #configEvents;
   #configPeriodicEvents;
@@ -770,12 +770,12 @@ class Config {
     this.#crashOnRedisUnavailable = value;
   }
 
-  get tenantIdFilterTokenInfo() {
-    return this.#tenantIdFilterTokenInfoCb;
+  get tenantIdFilterAuthContext() {
+    return this.#tenantIdFilterAuthContextCb;
   }
 
-  set tenantIdFilterTokenInfo(value) {
-    this.#tenantIdFilterTokenInfoCb = value;
+  set tenantIdFilterAuthContext(value) {
+    this.#tenantIdFilterAuthContextCb = value;
   }
 
   get tenantIdFilterEventProcessing() {

src/config.js

@@ -22,6 +22,6 @@ module.exports = {
   },
   TenantIdCheckTypes: {
     eventProcessing: "eventProcessing",
-    getTokenInfo: "getTokenInfo",
+    getAuthContext: "getAuthContext",
   },
 };

src/constants.js

@@ -14,7 +14,7 @@ export declare type EventProcessingStatusType = (typeof EventProcessingStatus)[E
 
 export declare const TenantIdCheckTypes: {
   eventProcessing: "eventProcessing";
-  getTokenInfo: "getTokenInfo";
+  getAuthContext: "getAuthContext";
 };
 
 export declare const TransactionMode: {
@@ -215,8 +215,8 @@ declare class Config {
   get publishEventBlockList(): any;
   set crashOnRedisUnavailable(value: any);
   get crashOnRedisUnavailable(): any;
-  set tenantIdFilterTokenInfo(value: any);
-  get tenantIdFilterTokenInfo(): any;
+  set tenantIdFilterAuthContext(value: any);
+  get tenantIdFilterAuthContext(): any;
   set tenantIdFilterEventProcessing(value: any);
   get tenantIdFilterEventProcessing(): any;
   set runInterval(value: any);

src/index.d.ts

@@ -327,9 +327,11 @@ class EventQueueGenericOutboxHandler extends EventQueueBaseClass {
   }
 
   async #setContextUser(context, userId, reg) {
+    const authInfo = await common.getAuthContext(context.tenant);
     context.user = new cds.User.Privileged({
       id: userId,
-      tokenInfo: await common.getTokenInfo(this.baseContext.tenant),
+      authInfo,
+      tokenInfo: authInfo?.token,
     });
     if (reg) {
       reg.user = context.user;

src/outbox/EventQueueGenericOutboxHandler.js

@@ -119,7 +119,8 @@ const _processLocalWithoutRedis = async (tenantId, events) => {
     let context = {};
     if (tenantId) {
       const user = await cds.tx({ tenant: tenantId }, async () => {
-        return new cds.User.Privileged({ id: config.userId, tokenInfo: await common.getTokenInfo(tenantId) });
+        const authInfo = await common.getAuthContext(tenantId);
+        return new cds.User.Privileged({ id: config.userId, authInfo, tokenInfo: authInfo.token });
       });
       context = {
         tenant: tenantId,

src/redis/redisPub.js

@@ -78,7 +78,8 @@ const _messageHandlerProcessEvents = async (messageData) => {
     }
 
     const user = await cds.tx({ tenant: tenantId }, async () => {
-      return new cds.User.Privileged({ id: config.userId, tokenInfo: await common.getTokenInfo(tenantId) });
+      const authInfo = await common.getAuthContext(tenantId);
+      return new cds.User.Privileged({ id: config.userId, authInfo, tokenInfo: authInfo?.token });
     });
     const tenantContext = {
       tenant: tenantId,

src/redis/redisSub.js

@@ -149,9 +149,11 @@ const _executeEventsAllTenantsRedis = async (tenantIds) => {
           tx.context,
           "get-openEvents-and-publish",
           async () => {
+            const authInfo = await common.getAuthContext(tenantId);
             tx.context.user = new cds.User.Privileged({
               id: config.userId,
-              tokenInfo: await common.getTokenInfo(tenantId),
+              authInfo,
+              tokenInfo: authInfo?.token,
             });
             const entries = await openEvents.getOpenQueueEntries(tx, false);
             logger.info("broadcasting events for run", {
@@ -187,10 +189,11 @@ const _executeEventsAllTenants = async (tenantIds, runId) => {
     try {
       events = await trace(
         { id, tenant: tenantId },
-        "fetch-openEvents-and-tokenInfo",
+        "fetch-openEvents-and-authInfo",
         async () => {
           const user = await cds.tx({ tenant: tenantId }, async () => {
-            return new cds.User.Privileged({ id: config.userId, tokenInfo: await common.getTokenInfo(tenantId) });
+            const authInfo = await common.getAuthContext(tenantId);
+            return new cds.User.Privileged({ id: config.userId, authInfo, tokenInfo: authInfo?.token });
           });
           tenantContext = {
             tenant: tenantId,
@@ -258,7 +261,8 @@ const _executePeriodicEventsAllTenants = async (tenantIds) => {
   for (const tenantId of tenantIds) {
     try {
       const user = await cds.tx({ tenant: tenantId }, async () => {
-        return new cds.User.Privileged({ id: config.userId, tokenInfo: await common.getTokenInfo(tenantId) });
+        const authInfo = await common.getAuthContext(tenantId);
+        return new cds.User.Privileged({ id: config.userId, authInfo, tokenInfo: authInfo?.token });
       });
       const tenantContext = {
         tenant: tenantId,
@@ -289,7 +293,7 @@ const _singleTenantDb = async () => {
   const id = cds.utils.uuid();
   const events = await trace(
     { id },
-    "fetch-openEvents-and-tokenInfo",
+    "fetch-openEvents-and-authInfo",
     async () => {
       return await cds.tx({}, async (tx) => {
         return await openEvents.getOpenQueueEntries(tx);
@@ -530,7 +534,7 @@ const _checkPeriodicEventsSingleTenant = async (context) => {
   try {
     logger.info("executing updating periodic events", {
       tenantId: context.tenant,
-      subdomain: context.user?.tokenInfo?.extAttributes?.zdn,
+      subdomain: context.user?.authInfo?.getSubdomain?.(),
     });
     await periodicEvents.checkAndInsertPeriodicEvents(context);
   } catch (err) {