Merge branch 'develop' into readme404bug

cap-js · Jan 16, 2025 · 125e415 · 125e415
2 parents f60f79b + 2f65938
commit 125e415
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 11 deletions.
diff --git a/lib/sdm.js b/lib/sdm.js
@@ -39,8 +39,9 @@ module.exports = class SDMAttachmentsService extends (
 
   async checkRepositoryType(req) {
     const { repositoryId } = getConfigurations();
+    let subdomain = cds.context.user?.tokenInfo?.getPayload()?.ext_attr?.zdn;
     //check if repository is versionable
-    let repotype = cache.get(repositoryId) 
+    let repotype = cache.get(repositoryId+"_"+subdomain);
     let isVersioned;
     if (repotype == undefined) {
       const token = await getClientCredentialsToken(this.creds);

diff --git a/lib/util/index.js b/lib/util/index.js
@@ -70,9 +70,10 @@ function isRepositoryVersioned(repoInfo, repositoryId) {
 }
 
 function saveRepoToCache(repositoryId, type) {
-  const repoType = cache.get(repositoryId);
+   let subdomain = cds.context.user?.tokenInfo?.getPayload()?.ext_attr?.zdn;
+  const repoType = cache.get(repositoryId+"_"+subdomain);
   if (repoType === undefined) {
-    cache.set(repositoryId, type, 60 * 60 * 24 * 60);
+    cache.set((repositoryId+"_"+subdomain), type, 60 * 60 * 24 * 60);
   }
 }
 

diff --git a/test/lib/sdm.test.js b/test/lib/sdm.test.js
@@ -101,7 +101,18 @@ describe("SDMAttachmentsService", () => {
           },
         },
       };
-
+  cds = require("@sap/cds/lib");
+cds.context = {
+        user: {
+            tokenInfo: {
+                getPayload: jest.fn(() => ({
+                    ext_attr: {
+                        zdn: 'subdomain' // simulate the subdomain extraction
+                    }
+                })),
+            },
+        },
+    };
       const attachments = ["attachment1", "attachment2"];
       const keys = ["key1", "key2"];
       const response = { url: "mockUrl" };
@@ -132,6 +143,18 @@ describe("SDMAttachmentsService", () => {
           },
         },
       };
+         cds = require("@sap/cds/lib");
+      cds.context = {
+              user: {
+                  tokenInfo: {
+                      getPayload: jest.fn(() => ({
+                          ext_attr: {
+                              zdn: 'subdomain' // simulate the subdomain extraction
+                          }
+                      })),
+                  },
+              },
+          };
       const attachments = ["attachment1", "attachment2"];
       const keys = ["key1", "key2"];
       const response = { url: "mockUrl" };
@@ -169,6 +192,18 @@ describe("SDMAttachmentsService", () => {
         },
         reject: jest.fn(),
       };
+         cds = require("@sap/cds/lib");
+      cds.context = {
+              user: {
+                  tokenInfo: {
+                      getPayload: jest.fn(() => ({
+                          ext_attr: {
+                              zdn: 'subdomain' // simulate the subdomain extraction
+                          }
+                      })),
+                  },
+              },
+          };
       const attachments = ["attachment1", "attachment2"];
       const keys = ["key1", "key2"];
       isRepositoryVersioned.mockResolvedValue(true);
@@ -189,6 +224,18 @@ describe("SDMAttachmentsService", () => {
         },
         reject: jest.fn(),
       };
+         cds = require("@sap/cds/lib");
+      cds.context = {
+              user: {
+                  tokenInfo: {
+                      getPayload: jest.fn(() => ({
+                          ext_attr: {
+                              zdn: 'subdomain' // simulate the subdomain extraction
+                          }
+                      })),
+                  },
+              },
+          };
       const attachments = ["attachment1", "attachment2"];
       const keys = ["key1", "key2"];
       isRepositoryVersioned.mockResolvedValue(true);
@@ -208,7 +255,18 @@ describe("SDMAttachmentsService", () => {
           },
         },
       };
-
+         cds = require("@sap/cds/lib");
+cds.context = {
+        user: {
+            tokenInfo: {
+                getPayload: jest.fn(() => ({
+                    ext_attr: {
+                        zdn: 'subdomain' // simulate the subdomain extraction
+                    }
+                })),
+            },
+        },
+    };
       const attachments = ["attachment1", "attachment2"];
       const keys = ["key1", "key2"];
       const response = { url: "mockUrl" };
@@ -267,14 +325,25 @@ describe("SDMAttachmentsService", () => {
         info: jest.fn(),
         warn: jest.fn()
       };
-
+   cds = require("@sap/cds/lib");
       cds.model.definitions[mockReq.query.target.name + ".attachments"] = {
         keys: {
           up_: {
             keys: [{ ref: ["attachment"] }],
           },
         },
       };
+      cds.context = {
+              user: {
+                  tokenInfo: {
+                      getPayload: jest.fn(() => ({
+                          ext_attr: {
+                              zdn: 'subdomain' // simulate the subdomain extraction
+                          }
+                      })),
+                  },
+              },
+          };
       NodeCache.prototype.get.mockImplementation(() => undefined);
       getConfigurations.mockResolvedValueOnce({repositoryId: "123"});
       getRepositoryInfo.mockResolvedValueOnce(repoInfo);

diff --git a/test/lib/util/index.test.js b/test/lib/util/index.test.js
@@ -276,8 +276,8 @@ describe("util", () => {
       }
       const isVersioned = isRepositoryVersioned(mockRepoInfo, "mockedRepoId");
       expect(isVersioned).toBe(true);
-      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId");
-      expect(NodeCache.prototype.set).toBeCalledWith("mockedRepoId", "versioned", 60 * 60 * 24 * 60);
+      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId_subdomain");
+      expect(NodeCache.prototype.set).toBeCalledWith("mockedRepoId_subdomain", "versioned", 60 * 60 * 24 * 60);
     });
 
     it("should not set cache and return true when repotype is pwconly", () => {
@@ -293,7 +293,7 @@ describe("util", () => {
       }
       const isVersioned = isRepositoryVersioned(mockRepoInfo, "mockedRepoId");
       expect(isVersioned).toBe(true);
-      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId");
+      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId_subdomain");
       expect(NodeCache.prototype.set).not.toHaveBeenCalled();
     });
 
@@ -308,10 +308,11 @@ describe("util", () => {
           }
         }
       }
+
       const isVersioned = isRepositoryVersioned(mockRepoInfo, "mockedRepoId");
       expect(isVersioned).toBe(false);
-      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId");
-      expect(NodeCache.prototype.set).toBeCalledWith("mockedRepoId", "non-versioned", 60 * 60 * 24 * 60);
+      expect(NodeCache.prototype.get).toBeCalledWith("mockedRepoId_subdomain");
+      expect(NodeCache.prototype.set).toBeCalledWith("mockedRepoId_subdomain", "non-versioned", 60 * 60 * 24 * 60);
     });
   })