Skip to content

Commit

Permalink
Merge branch 'bcgov:main' into fix/FORMS-1654-make-print-visible-to-p…
Browse files Browse the repository at this point in the history
…ublic
  • Loading branch information
bhuvan-aot authored Jan 6, 2025
2 parents 77e58df + 5974fd5 commit 5333674
Show file tree
Hide file tree
Showing 11 changed files with 788 additions and 217 deletions.
3 changes: 1 addition & 2 deletions .devcontainer/chefs_local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
volumes:
postgres_kc_data:
driver: local
Expand Down Expand Up @@ -39,4 +38,4 @@ services:
- "-Dkeycloak.migration.action=import"
- "-Dkeycloak.migration.provider=singleFile"
- "-Dkeycloak.migration.file=/tmp/realm-export.json"
- "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING"
- "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING"
2 changes: 1 addition & 1 deletion .github/workflows/reusable-owasp-zap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Run Scan
uses: zaproxy/action-full-scan@v0.10.0
uses: zaproxy/action-full-scan@v0.12.0
with:
# Do not create GitHub Issues
allow_issue_writing: false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
const BCEID_EXTRAS = {
formAccessSettings: 'idim',
addTeamMemberSearch: {
text: {
minLength: 4,
message: 'trans.manageSubmissionUsers.searchInputLength',
},
email: {
exact: true,
message: 'trans.manageSubmissionUsers.exactBCEIDSearch',
},
},
};

const BCEID_EXTRAS_NEW = {
...BCEID_EXTRAS,
userSearch: {
filters: [
{ name: 'filterIdpUserId', param: 'idpUserId', required: 0 },
{ name: 'filterIdpCode', param: 'idpCode', required: 0 },
{ name: 'filterUsername', param: 'username', required: 2, exact: true, caseSensitive: false },
{ name: 'filterFullName', param: 'fullName', required: 0 },
{ name: 'filterFirstName', param: 'firstName', required: 0 },
{ name: 'filterLastName', param: 'lastName', required: 0 },
{ name: 'filterEmail', param: 'email', required: 2, exact: true, caseSensitive: false },
{ name: 'filterSearch', param: 'search', required: 0 },
],
detail: 'Could not retrieve BCeID users. Invalid options provided.',
},
};

const BCEID_EXTRAS_OLD = {
...BCEID_EXTRAS,
userSearch: {
filters: [
{ name: 'filterIdpUserId', param: 'idpUserId', required: 0 },
{ name: 'filterIdpCode', param: 'idpCode', required: 0 },
{ name: 'filterUsername', param: 'username', required: 2, exact: true },
{ name: 'filterFullName', param: 'fullName', required: 0 },
{ name: 'filterFirstName', param: 'firstName', required: 0 },
{ name: 'filterLastName', param: 'lastName', required: 0 },
{ name: 'filterEmail', param: 'email', required: 2, exact: true },
{ name: 'filterSearch', param: 'search', required: 0 },
],
detail: 'Could not retrieve BCeID users. Invalid options provided.',
},
};

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function (knex) {
return Promise.resolve().then(() =>
knex.schema
.then(() =>
knex('identity_provider').where({ code: 'bceid-business' }).update({
extra: BCEID_EXTRAS_NEW,
})
)
.then(() =>
knex('identity_provider').where({ code: 'bceid-basic' }).update({
extra: BCEID_EXTRAS_NEW,
})
)
);
};

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function (knex) {
return Promise.resolve().then(() =>
knex.schema
.then(() =>
knex('identity_provider').where({ code: 'bceid-business' }).update({
extra: BCEID_EXTRAS_OLD,
})
)
.then(() =>
knex('identity_provider').where({ code: 'bceid-basic' }).update({
extra: BCEID_EXTRAS_OLD,
})
)
);
};
Loading

0 comments on commit 5333674

Please sign in to comment.