Skip to content
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

fix: remove strict w3c subjectId uri validation #1805

Merged
merged 3 commits into from
Mar 28, 2024
Merged

fix: remove strict w3c subjectId uri validation #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03dd388
fix: remove strict w3c subjectId uri validation
auer-martin Mar 27, 2024
c9f44b3
Merge branch 'main' into fix/remove-strict-w3c-subjectId-validation
TimoGlastra Mar 28, 2024
cfc80dd
Merge branch 'main' into fix/remove-strict-w3c-subjectId-validation
TimoGlastra Mar 28, 2024
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
6 changes: 2 additions & 4 deletions packages/core/src/modules/vc/models/credential/W3cCredentialSubject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { IsOptional, ValidateBy, buildMessage, isInstance } from 'class-validator'

import { CredoError } from '../../../../error'
import { IsUri, isUri } from '../../../../utils/validators'

Check warning on line 7 in packages/core/src/modules/vc/models/credential/W3cCredentialSubject.ts

View workflow job for this annotation

GitHub Actions / Validate 

'IsUri' is defined but never used

Check warning on line 7 in packages/core/src/modules/vc/models/credential/W3cCredentialSubject.ts

View workflow job for this annotation

GitHub Actions / Validate 

'isUri' is defined but never used

/**
* @see https://www.w3.org/TR/vc-data-model/#credential-subject
Expand All @@ -27,7 +27,6 @@
}
}

@IsUri()
@IsOptional()
public id?: string

Expand Down Expand Up @@ -70,12 +69,11 @@
name: 'IsW3cCredentialSubject',
validator: {
validate: (value): boolean => {
return isInstance(value, W3cCredentialSubject) && (!value.id || isUri(value.id))
return isInstance(value, W3cCredentialSubject)
},
defaultMessage: buildMessage(
(eachPrefix) =>
eachPrefix +
'$property must be an object or an array of objects with an optional id property which is an URI',
eachPrefix + '$property must be an object or an array of objects with an optional id property',
validationOptions
),
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/modules/vc/models/credential/__tests__/W3cCredential.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ describe('W3cCredential', () => {
},
W3cCredential
)
).toThrow()
).not.toThrow()

expect(() =>
JsonTransformer.fromJSON(
Expand Down
Loading