Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
devksingh4 committed Nov 12, 2024
1 parent a9f9787 commit 1312e78
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/errors/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 1312e78

Please sign in to comment.