merge: merge branch 'THU/replace_guid_dependency'

Author: csm-thu

api/GetEmbedInfo/utils.js

@@ -1,7 +1,7 @@
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
 
-const guid = require('guid');
+const uuid = require('uuid');
 const jwt = require('jsonwebtoken');
 const jwksClient = require('jwks-rsa');
 const { MSAL_CONFIG, GUID_PARAMETERS, REQUIRED_PARAMETERS, getConfigValue } = require('./config');
@@ -19,7 +19,7 @@ const sanitizeAndValidateConfig = () => {
 
   for (const parameter of GUID_PARAMETERS) {
     const sanitizedValue = getConfigValue(parameter);
-    if (sanitizedValue && !guid.isGuid(sanitizedValue))
+    if (sanitizedValue && !uuid.validate(sanitizedValue))
       throw new ServiceAccountError(
         500,
         'Configuration error',
@@ -88,7 +88,7 @@ const validateQuery = async (req) => {
     );
 
   for (const reportId of reportsIds) {
-    if (!guid.isGuid(reportId))
+    if (!uuid.validate(reportId))
       throw new ServiceAccountError(
         400,
         'Bad request',
@@ -98,7 +98,7 @@ const validateQuery = async (req) => {
 
   // Check PowerBI workspace id parameter
   const workspaceId = req?.body?.workspaceId;
-  if (workspaceId != null && !guid.isGuid(workspaceId))
+  if (workspaceId != null && !uuid.validate(workspaceId))
     throw new ServiceAccountError(
       400,
       'Bad request',

api/package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@azure/msal-node": "^2.16.2",
-    "guid": "0.0.12",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.2.0"
+    "jwks-rsa": "^3.2.0",
+    "uuid": "^11.1.0"
   },
   "engines": {
     "node": "^18"

api/yarn.lock

@@ -146,9 +146,9 @@ __metadata:
   resolution: "api@workspace:."
   dependencies:
     "@azure/msal-node": "npm:^2.16.2"
-    guid: "npm:0.0.12"
     jsonwebtoken: "npm:^9.0.2"
     jwks-rsa: "npm:^3.2.0"
+    uuid: "npm:^11.1.0"
   languageName: unknown
   linkType: soft
 
@@ -180,13 +180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"guid@npm:0.0.12":
-  version: 0.0.12
-  resolution: "guid@npm:0.0.12"
-  checksum: 10c0/e7db93917a7fce9871f7d02651a5c250691213a7c97f3943e04e8c73885122e61289c833d10aa35b6eea253a11a2c3431100c3b5b5ecfdbdb8f58340211efae0
-  languageName: node
-  linkType: hard
-
 "jose@npm:^4.15.4":
   version: 4.15.9
   resolution: "jose@npm:4.15.9"
@@ -366,6 +359,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "uuid@npm:11.1.0"
+  bin:
+    uuid: dist/esm/bin/uuid
+  checksum: 10c0/34aa51b9874ae398c2b799c88a127701408cd581ee89ec3baa53509dd8728cbb25826f2a038f9465f8b7be446f0fbf11558862965b18d21c993684297628d4d3
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^8.3.0":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"