update cloud-sdk (#13)

* bug fix

* update cloud-sdk to v3

Author: sidakphull

cds-plugin.js

@@ -1,8 +1,10 @@
 const cds = require("@sap/cds");
 const { validateNotificationTypes, readFile } = require("./lib/utils");
 const { createNotificationTypesMap, processNotificationTypes} = require("./lib/notificationTypes");
+const { setGlobalLogLevel } = require("@sap-cloud-sdk/util");
 
 cds.once("served", async () => {
+  setGlobalLogLevel("error");
   const profiles = cds.env.profiles ?? [];
   const production = profiles.includes('production');
 

lib/notificationTypes.js

@@ -1,5 +1,6 @@
-const { executeHttpRequest, buildCsrfHeaders } = require("@sap-cloud-sdk/core");
-const { getNotificationDestination, doesKeyExist, getPrefix, getNotificationTypesKeyWithPrefix } = require("./utils");
+const { executeHttpRequest } = require("@sap-cloud-sdk/http-client");
+const { buildHeadersForDestination } = require("@sap-cloud-sdk/connectivity");
+const { getNotificationDestination, doesKeyExist, getPrefix, getNotificationTypesKeyWithPrefix, executeRequest } = require("./utils");
 const _ = require("lodash");
 
 const NOTIFICATION_TYPES_API_ENDPOINT = "v2/NotificationType.svc";
@@ -68,7 +69,7 @@ async function getNotificationTypes() {
 
 async function createNotificationType(notificationType) {
   const notificationDestination = await getNotificationDestination();
-  const csrfHeaders = await buildCsrfHeaders(notificationDestination, {
+  const csrfHeaders = await buildHeadersForDestination(notificationDestination, {
     url: NOTIFICATION_TYPES_API_ENDPOINT,
   });
 
@@ -87,7 +88,7 @@ async function createNotificationType(notificationType) {
 
 async function updateNotificationType(id, notificationType) {
   const notificationDestination = await getNotificationDestination();
-  const csrfHeaders = await buildCsrfHeaders(notificationDestination, {
+  const csrfHeaders = await buildHeadersForDestination(notificationDestination, {
     url: NOTIFICATION_TYPES_API_ENDPOINT,
   });
 
@@ -106,7 +107,7 @@ async function updateNotificationType(id, notificationType) {
 
 async function deleteNotificationType(notificationType) {
   const notificationDestination = await getNotificationDestination();
-  const csrfHeaders = await buildCsrfHeaders(notificationDestination, {
+  const csrfHeaders = await buildHeadersForDestination(notificationDestination, {
     url: NOTIFICATION_TYPES_API_ENDPOINT,
   });
 
@@ -123,6 +124,10 @@ async function deleteNotificationType(notificationType) {
 }
 
 function _createChannelsMap(channels) {
+  if(channels === null || channels === undefined) {
+    return {};
+  }
+
   const channelMap = {};
 
   channels.forEach((channel) => {

lib/notifications.js

@@ -1,17 +1,17 @@
-const { buildCsrfHeaders } = require("@sap-cloud-sdk/core");
+const { buildHeadersForDestination } = require("@sap-cloud-sdk/connectivity");
 const { getNotificationDestination, executeRequest, buildNotification } = require("./utils");
 const NOTIFICATIONS_API_ENDPOINT = "v2/Notification.svc";
 
 async function postNotification() {
-  const notificationServiceDestination = await getNotificationDestination();
-  const csrfHeaders = await buildCsrfHeaders(notificationServiceDestination, {
+  const notificationDestination = await getNotificationDestination();
+  const csrfHeaders = await buildHeadersForDestination(notificationDestination, {
     url: NOTIFICATIONS_API_ENDPOINT,
   });
 
   const notification = buildNotification(arguments);
 
   if (notification) {
-    const response = await executeRequest("post", `${NOTIFICATIONS_API_ENDPOINT}/Notifications`, notification, notificationServiceDestination, csrfHeaders);
+    const response = await executeRequest("post", `${NOTIFICATIONS_API_ENDPOINT}/Notifications`, notification, notificationDestination, csrfHeaders);
     return response.data?.d ?? response;
   }
 }

lib/utils.js

@@ -1,7 +1,8 @@
 const { existsSync, readFileSync } = require('fs');
 const { basename } = require('path')
 const cds = require("@sap/cds");
-const { executeHttpRequest, getDestination } = require("@sap-cloud-sdk/core");
+const { executeHttpRequest } = require("@sap-cloud-sdk/http-client");
+const { getDestination } = require("@sap-cloud-sdk/connectivity");
 const PRIORITIES = ["LOW", "NEUTRAL", "MEDIUM", "HIGH"];
 
 const messages = {
@@ -51,7 +52,7 @@ function readFile(filePath) {
 
 async function getNotificationDestination() {
   const destinationName = cds.env.requires.notifications?.destination ?? "SAP_Notifications"
-  const notificationDestination = await getDestination(destinationName);
+  const notificationDestination = await getDestination({ destinationName, useCache: true });
   if (!notificationDestination) {
     // TODO: What to do if destination isn't found??
     throw new Error(messages.DESTINATION_NOT_FOUND + destinationName);
@@ -68,10 +69,10 @@ function getNotificationTypesKeyWithPrefix(notificationTypeKey) {
   return `${prefix}/${notificationTypeKey}`;
 }
 
-async function executeRequest(httpMethod, targetUrl, payload, notifServiceDest, csrfHeaders) {
+async function executeRequest(httpMethod, targetUrl, payload, notificationDestination, csrfHeaders) {
   let response = {};
   try {
-    response = await executeHttpRequest(notifServiceDest, {
+    response = await executeHttpRequest(notificationDestination, {
       url: targetUrl,
       method: httpMethod,
       data: payload,

package.json

@@ -12,7 +12,9 @@
     "srv"
   ],
   "dependencies": {
-    "@sap-cloud-sdk/core": "^1.54.2",
+    "@sap-cloud-sdk/connectivity": "3.5.0",
+    "@sap-cloud-sdk/http-client": "3.5.0",
+    "@sap-cloud-sdk/util": "3.5.0",
     "lodash": "4.17.21"
   },
   "devDependencies": {