fix merge conflicts

Author: devksingh4

package.json

@@ -54,7 +54,7 @@
     "@aws-sdk/client-dynamodb": "^3.624.0",
     "@aws-sdk/client-secrets-manager": "^3.624.0",
     "@aws-sdk/util-dynamodb": "^3.624.0",
-    "@azure/msal-node": "^2.16.0",
+    "@azure/msal-node": "^2.16.1",
     "@fastify/auth": "^4.6.1",
     "@fastify/aws-lambda": "^4.1.0",
     "@fastify/cors": "^9.0.1",

src/errors/index.ts

@@ -133,6 +133,9 @@ export class EntraInvitationError extends BaseError<"EntraInvitationError"> {
       httpStatusCode: 500,
     });
     this.email = email;
+  }
+}
+
 export class TicketNotFoundError extends BaseError<"TicketNotFoundError"> {
   constructor({ message }: { message?: string }) {
     super({

yarn.lock

@@ -530,10 +530,10 @@
   resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.16.0.tgz#f3470fcaec788dbe50859952cd499340bda23d7a"
   integrity sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==
 
-"@azure/msal-node@^2.16.0":
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.16.0.tgz#028ac69bc75738d6744dab3e3f20f8240f4f6e2c"
-  integrity sha512-oww0oJTOOvPKTVXqVyxfcFVjExQKYEkKR5KM0cTG3jnzt6u/MRMx8XaK49L/bxV35r9sCHQFjNlEShad9qGSYA==
+"@azure/msal-node@^2.16.1":
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.16.1.tgz#89828832e8e6c8a88cecc4ef6d8d4e4352116b77"
+  integrity sha512-1NEFpTmMMT2A7RnZuvRl/hUmJU+GLPjh+ShyIqPktG2PvSd2yvPnzGd/BxIBAAvJG5nr9lH4oYcQXepDbaE7fg==
   dependencies:
     "@azure/msal-common" "14.16.0"
     jsonwebtoken "^9.0.0"