Query RelationshipTemplates for password protection #353
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Magnus-Kuhn
added
wip
Codecov ReportAll modified and coverable lines are covered by tests ✅
|
Magnus-Kuhn
removed
the
wip
Magnus-Kuhn
requested review from
sebbi08,
jkoenig134,
britsta and
Milena-Czierlinski
jkoenig134
reviewed
Nov 29, 2024
Comment on lines
+60
to
+74
| [`${nameof<RelationshipTemplateDTO>((r) => r.passwordProtection)}.password`]: (query: any, input: string) => { | ||
| query[`${nameof<RelationshipTemplate>((t) => t.passwordProtection)}.${nameof<PasswordProtection>((t) => t.password)}`] = input; | ||
| }, | ||
| [`${nameof<RelationshipTemplateDTO>((t) => t.passwordProtection)}.passwordIsPin`]: (query: any, input: string) => { | ||
| if (input === "true") { | ||
| query[`${nameof<RelationshipTemplate>((t) => t.passwordProtection)}.${nameof<PasswordProtection>((t) => t.passwordType)}`] = { | ||
| $regex: "^pin" | ||
| }; | ||
| } | ||
| if (input === "!true") { | ||
| query[`${nameof<RelationshipTemplate>((t) => t.passwordProtection)}.${nameof<PasswordProtection>((t) => t.passwordType)}`] = { | ||
| $in: ["pw", undefined] | ||
| }; | ||
| } | ||
| } |
There was a problem hiding this comment.
I don't see a need for a custom filter here, just add aliases.
There was a problem hiding this comment.
password needs a custom filter, because PINs are otherwise turned into numbers (and I can't switch this off since then the maxNumberOfAllocations would be a problem).
And we don't store passwordIsPin, only passwordType in the database, so the custom filter does that mapping
There was a problem hiding this comment.
argh, I see. Then we'll have to discuss on how to align these custom thingies to our query translator.
There was a problem hiding this comment.
Maybe it could be enough to do ! instead of !true
jkoenig134
requested changes
Nov 29, 2024
Comment on lines
+331
to
+393
| test("password query", async () => { | ||
| const passwordProtectedTemplate = await createTemplate(runtimeServices1.transport, undefined, { password: "password" }); | ||
|
|
||
| const pinProtectedTemplate = await createTemplate(runtimeServices1.transport, undefined, { password: "1234", passwordIsPin: true }); | ||
|
|
||
| const passwordProtectedTemplates = ( | ||
| await runtimeServices1.transport.relationshipTemplates.getRelationshipTemplates({ | ||
| query: { | ||
| "passwordProtection.password": "password" | ||
| } | ||
| }) | ||
| ).value; | ||
| const passwordProtectedTemplateIds = passwordProtectedTemplates.map((t) => t.id); | ||
|
|
||
| expect(passwordProtectedTemplateIds).toContain(passwordProtectedTemplate.id); | ||
| expect(passwordProtectedTemplateIds).not.toContain(pinProtectedTemplate.id); | ||
|
|
||
| const pinProtectedTemplates = ( | ||
| await runtimeServices1.transport.relationshipTemplates.getRelationshipTemplates({ | ||
| query: { | ||
| "passwordProtection.password": "1234" | ||
| } | ||
| }) | ||
| ).value; | ||
| const pinProtectedTemplateIds = pinProtectedTemplates.map((t) => t.id); | ||
|
|
||
| expect(pinProtectedTemplateIds).not.toContain(passwordProtectedTemplate.id); | ||
| expect(pinProtectedTemplateIds).toContain(pinProtectedTemplate.id); | ||
| }); | ||
|
|
||
| test("passwordIsPin query", async () => { | ||
| const passwordProtectedTemplate = await createTemplate(runtimeServices1.transport, undefined, { password: "password" }); | ||
|
|
||
| const pinProtectedTemplate = await createTemplate(runtimeServices1.transport, undefined, { password: "1234", passwordIsPin: true }); | ||
|
|
||
| const unprotectedTemplate = await createTemplate(runtimeServices1.transport); | ||
|
|
||
| const templatesWithoutPin = ( | ||
| await runtimeServices1.transport.relationshipTemplates.getRelationshipTemplates({ | ||
| query: { | ||
| "passwordProtection.passwordIsPin": "!true" | ||
| } | ||
| }) | ||
| ).value; | ||
| const templateIdsWithoutPin = templatesWithoutPin.map((t) => t.id); | ||
|
|
||
| expect(templateIdsWithoutPin).toContain(passwordProtectedTemplate.id); | ||
| expect(templateIdsWithoutPin).not.toContain(pinProtectedTemplate.id); | ||
| expect(templateIdsWithoutPin).toContain(unprotectedTemplate.id); | ||
|
|
||
| const templatesWithPin = ( | ||
| await runtimeServices1.transport.relationshipTemplates.getRelationshipTemplates({ | ||
| query: { | ||
| "passwordProtection.passwordIsPin": "true" | ||
| } | ||
| }) | ||
| ).value; | ||
| const templateIdsWithPin = templatesWithPin.map((t) => t.id); | ||
|
|
||
| expect(templateIdsWithPin).not.toContain(passwordProtectedTemplate.id); | ||
| expect(templateIdsWithPin).toContain(pinProtectedTemplate.id); | ||
| expect(templateIdsWithPin).not.toContain(unprotectedTemplate.id); | ||
| }); |
There was a problem hiding this comment.
please see the other tests that do querying, we have a fabulous tester for querystrings :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Readiness checklist