Skip to content

Misleading error code used #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
britsta merged 2 commits into from
May 8, 2025
Merged

Misleading error code used #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
325b87d
fix: misleading error code used
britsta May 8, 2025
8a65c7c
Merge branch 'release/v7' into fix/use-of-misleading-error-code
mergify[bot] May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...equests/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,31 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte
file = await this.accountController.files.getOrLoadFileByTruncated(requestItem.fileReference.truncate());
} catch (_) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
ConsumptionCoreErrors.requests.invalidRequestItem(
`You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' could not be found.`
)
);
}

if (file.cache!.expiresAt.isExpired()) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
ConsumptionCoreErrors.requests.invalidRequestItem(
`You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' is already expired.`
)
);
}

if (file.isOwn) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
ConsumptionCoreErrors.requests.invalidRequestItem(
`You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is already owned by you.`
)
);
}

if (file.cache!.owner.toString() !== requestInfo.peer.toString()) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
ConsumptionCoreErrors.requests.invalidRequestItem(
`You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is not owned by the peer.`
)
);
Expand All @@ -100,7 +100,7 @@ export class TransferFileOwnershipRequestItemProcessor extends GenericRequestIte
const tagValidationResult = await this.consumptionController.attributes.validateTagsForType(file.cache!.tags, "IdentityFileReference");
if (tagValidationResult.isError()) {
return ValidationResult.error(
ConsumptionCoreErrors.requests.invalidAcceptParameters(
ConsumptionCoreErrors.requests.invalidRequestItem(
`You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' has invalid tags. ${tagValidationResult.error.message}`
)
);
Expand Down
6 changes: 3 additions & 3 deletions ...ts/itemProcessors/transferFileOwnership/TransferFileOwnershipRequestItemProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () {

const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest);
expect(result).errorValidationResult({
code: "error.consumption.requests.invalidAcceptParameters",
code: "error.consumption.requests.invalidRequestItem",
message: `You cannot accept this RequestItem since the File with the given ID '${requestItem.fileReference.id.toString()}' could not be found.`
});
});
Expand All @@ -191,7 +191,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () {

const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest);
expect(result).errorValidationResult({
code: "error.consumption.requests.invalidAcceptParameters",
code: "error.consumption.requests.invalidRequestItem",
message: `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is already owned by you.`
});
});
Expand All @@ -214,7 +214,7 @@ describe("TransferFileOwnershipRequestItemProcessor", function () {

const result = await recipientProcessor.canAccept(requestItem, { accept: true }, incomingRequest);
expect(result).errorValidationResult({
code: "error.consumption.requests.invalidAcceptParameters",
code: "error.consumption.requests.invalidRequestItem",
message: `You cannot accept this RequestItem since the File with the given fileReference '${requestItem.fileReference.id.toString()}' is not owned by the peer.`
});
});
Expand Down