Revert "BB2-4675: Add SAMHSA checkbox to v3 permissions screen"#1619
Merged
JamesDemeryNava merged 1 commit intoJun 4, 2026
Conversation
This reverts commit e1b0b7b.
JamesDemeryNava
deleted the
revert-1607-jamesdemery/bb2-4675-v3-permissions-screen-samhsa-checkbox
branch
ryan-morosa
pushed a commit
that referenced
this pull request
Jun 8, 2026
ryan-morosa
added a commit
that referenced
this pull request
Jun 17, 2026
* initial commit * add more boiler code * initial attempt at running api in codebuild runner * renive okd byukd oridyctuib cide * re-enable workflow dispatch * typo in compose * fix dockerfile * final initial changset 400 * fix path * 3rd time is the charm * path change again * fixed part 1003231 * fixing paths * use make for codebuild instance * I don't understand file paths * using the power of root paths * what if there were even more path changes * fix path * fix some more stuff * more path fixes * minor spelling mistake * one day..... * more path fixes * more changes * cooking with gas * maybe last changes but probably not * remove debugpy * cleaning some stuff up * remove return exit code * check db path * remove readonly from codebuild * attempt number 5000 * added integration tests and teardown * paths!!! * paths part 2 * almost there * still file paths * I hate you file paths * more path shenanigans * tests run but they error out now * unnecessary makefile changes * makefile beautification (also fix relative paths for docker) * make migrate simpler (scope creep) * cleanup env, make some make changes, migrate and collectstatic work * change mslsx for better teardown * podman support (does the database need a persistence volume?) * persist database locally * this worked before and now it doesn't * test certificate issue * tabs * not sure what changed here * change podman tmpfs which doesnt work in docker * cleaning up files * change makefile targets * lower tmp size in codebuild * check memory in action * not anything * add explicit env file * up memory limit on tmp * add container env to codebuild instance, remove from integration test * remove unused envvars * MAYBE? * ruff failure * Fail unit tests * change unit tests back * ruff failure * fail unit test * Fix unit tests * BB2-4183: Dynamic v3 Permissions Screen (#1531) * BB2-4183: Dynamic permissions screen for v3 * Add unit testing * Raise a no scopes provided error if there are no scopes in the DB for an app, or if the scopes passed in the scope param has no overlap with an app's scopes in DB * Ensure v3 only shows scopes that are both requested/in the DB * Add another unit test * Added bene name, some styling * Add svg icon, modify some styling, add unit tests * Finish up styling and make sure Rubik font shows correctly * New tab for privacy policy/ToS links and add icon for those as well * Modify format_patient_name, add profile to list of scopes that shows patient info on v3 permissions screen * BB2-4676: SAMHSA filtering v3 EOB calls (#1595) * Add param support for EOB call * BB2-4676: Add SAMHSA filtering for v3 EOB calls based on include_samhsa value * Add back ioncorrectly removed tag and override_switch on integration test * Use httpstatus.ok instead of 200 and remove commented out line * Address PR feedback * anna/bb2 4818 display app contact in permissions screen (#1606) Displays an application's contact email in the v3 permissions screen. * add application support email to v3 permissions screen * add changes to authorize_v3_coverage_only.html * match wording in figma files * fix template formatting * update contributors information (#1608) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Make apt get install Debian:13 lcms2 to version 2.16-2+deb13u2 (#1610) * Bump the pip group across 1 directory with 2 updates (#1601) * Bump the pip group across 1 directory with 2 updates Bumps the pip group with 2 updates in the /requirements directory: [idna](https://github.com/kjd/idna) and [urllib3](https://github.com/urllib3/urllib3). Updates `idna` from 3.7 to 3.15 - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.md) - [Commits](kjd/idna@v3.7...v3.15) Updates `urllib3` from 2.6.3 to 2.7.0 - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.6.3...2.7.0) --- updated-dependencies: - dependency-name: idna dependency-version: '3.15' dependency-type: direct:production - dependency-name: urllib3 dependency-version: 2.7.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Add back our via value --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Demery <jamesdemery@navapbc.com> * (NFC) Update synthetic beneficiary test password (#1609) * Fix integration test (#1600) * ryan-morosa/bb2-4860-respect-app-settings-follow-up (#1603) * Fix the search vs.read functionality * Work on more testing * Get unit tests to work for FHIRResourcesReadSearchTest * BB2-4183: Dynamic v3 Permissions Screen (#1531) * BB2-4183: Dynamic permissions screen for v3 * Add unit testing * Raise a no scopes provided error if there are no scopes in the DB for an app, or if the scopes passed in the scope param has no overlap with an app's scopes in DB * Ensure v3 only shows scopes that are both requested/in the DB * Add another unit test * Added bene name, some styling * Add svg icon, modify some styling, add unit tests * Finish up styling and make sure Rubik font shows correctly * New tab for privacy policy/ToS links and add icon for those as well * Modify format_patient_name, add profile to list of scopes that shows patient info on v3 permissions screen * BB2-4676: SAMHSA filtering v3 EOB calls (#1595) * Add param support for EOB call * BB2-4676: Add SAMHSA filtering for v3 EOB calls based on include_samhsa value * Add back ioncorrectly removed tag and override_switch on integration test * Use httpstatus.ok instead of 200 and remove commented out line * Address PR feedback * Fix some more integration tests * Get more integration tests to pass * Get all tests passing * Do some cleanup * Cleanup database setup commands * Remove from audit logger * Final cleanup * Cleanup some of the app scope permission code * Add app scope permission class to insurance card view * Add bundle for dic endpoint * Get insurance card endpoint to work with app scope permissions too * Update logic in read/search section of app scope permissions * Get rid of is_not_empty and rename dictionary lookup --------- Co-authored-by: James Demery <jamesdemery@navapbc.com> * BB2-4817 run scheduled django commands on GitHub Actions (#1604) Run scheduled Django management commands on GitHub actions. * add workflow_call to run-manage-command.yml and add scheduled commands workflow * add name for workflow * fix syntax * fix syntax (2) * fix syntax (3) * fix syntax (4) * update input description * add fail-fast: false and inherit secrets --------- Co-authored-by: James Demery <jamesdemery@navapbc.com> * update contributors information (#1612) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Noor1027/bb2 4604 prod fargate release clean (#1611) * BB2-4604: add prod SOPS config and fix ACM cert lookup for prod environment Set ACM domain to api.bluebutton.cms.gov in 20-microservices platform module since the default domain pattern does not match the prod cert. Add encrypted SOPS config for the prod environment. * updated SOPS and softlink * skip environment protection for workflow_call * fix environment protection bypass using skip_protection input * Rename test job to unit-test in workflow (#1613) Co-authored-by: ryan-morosa <Ryan.Morosa@icf.com> * BB2-4781: Revoke prior tokens on new auth flow (#1605) * BB2-4781: Revoke prior tokens on new auth flow * Ensure token revocation only happens on v3 auth flows * Move the revocation of prior tokens to form_valid of AuthorizationView from post of TokenView. Revoke all previous tokens as the newest one will not have been created yet at that point * Address PR feedback, remove no longer needed test * Address feedback - use previously existing utils function * Fix typo * Add unit test coverage * Delete unit test yaml file * Try to run sequentially * Add some debugging steps * change some of the commands * Get rid of inspection * Get back to normal * added validation around code_challenge_method to reject non S256 values (#1599) * added validation around code_challenge_method to reject non S256 values * intermediate commit * Fix authorize POST param handling in code_challenge_method validation Agent-Logs-Url: https://github.com/CMSgov/bluebutton-web-server/sessions/ec2649c7-d427-4f59-ad18-098613b75e4e Co-authored-by: bwang-icf <178809349+bwang-icf@users.noreply.github.com> * Remove stale commented lines in authorization GET handler Agent-Logs-Url: https://github.com/CMSgov/bluebutton-web-server/sessions/ec2649c7-d427-4f59-ad18-098613b75e4e Co-authored-by: bwang-icf <178809349+bwang-icf@users.noreply.github.com> * cleanup of previous pkce setup * removing unnecessary error handling * adding updated tests with pkce params as part of enforcing pkce params on auth * adding extra tests for pkce param verification before login * removing unnecessary change for this pr * reverting code_challenge_method back to post_auth * removing invalid code challenge method printing --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bwang-icf <178809349+bwang-icf@users.noreply.github.com> Co-authored-by: annamontare-nava <267455234+annamontare-nava@users.noreply.github.com> * Noor1027/bb2 4816 release notes missing last commit (#1616) * Bug fix publish-release.yml always drops the oldest commit from release notes * temp change to run GHA * Revert "temp change to run GHA" This reverts commit dae8864. * BB2-4675: Add SAMHSA checkbox to v3 permissions screen (#1607) * BB2-4675: Add SAMHSA checkbox to v3 permissions screen * Use cache.add instead of cache.set, modify default for code * Address PR feedback - add docstrings * Add a new table to track user SAMHSA preferences rather than use caching * Address PR feedback * Remove commented out line * Address copilot feedback * Convert share_samhsa_data to a BooleanField to make the code less confusing * Revert "BB2-4675: Add SAMHSA checkbox to v3 permissions screen (#1607)" (#1619) This reverts commit e1b0b7b. * BB2-4890 - Add Fargate pre-deploy migrations safety gate * Revert "BB2-4890 - Add Fargate pre-deploy migrations safety gate" This reverts commit ffc450b. * update sops values (#1617) Co-authored-by: James Demery <jamesdemery@navapbc.com> * BB2-4851: Update lodash (#1621) * BB2-4851: Update lodash * Fix new vulnerability that popped up * BB2-4845: Update libgnutls (#1618) * BB2-4845: Update libgnutls * Update bb-css Dockerfile * Update gnutls in mslsx Dockerfile * Revert file mode change * docs(contributor): contributors readme action update (#1624) * update contributors information * Trigger unit tests --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: James Demery <jamesdemery@navapbc.com> * BB2-4574: Run unit and integration tests with pytest (#1614) * BB2-4574: Install pytest-django and add .ini file * Add conftest.py file, skip one test file, add a fixture * Add pytest.mark.integration, update ini file * Ensure all unit and integration tests pass with pytest, update some docs * removed unneeded code from conftest.py * Update unit test command for GHA * Remove commented out code * Address most PR feedback - still have documentation updates to make * Update documentation to reflect latest * Add strict-markers to toml file * B2-4890 Add pre/post-deploy migration support to Fargate deploy workflow (#1623) * masking hostname and removed gates * Update run-manage-command.yml * updated task def * removed multiple env for confirm apporvals * Updated Gate Approval for Post deploy * Fix New Relic reporting 401, 403, and 405 errors in Fargate * Fix New Relic ignoring status codes by dynamically creating config file on startup --------- Co-authored-by: jimmyfagan <90421499+jimmyfagan@users.noreply.github.com> * upgrading with npm --legacy-peer-deps (#1626) * Change workflow to run on push to any branch * Try just one test * Update docker compose codebuild to have no volumes * Roll back to run all integration tests * change it to run integration tests with pytest * Add aws credentials setup * testing certs * catch OOM traceback * Update Makefile * masking for test * test with codebuild VPC updates * Target impl for integration tests * adding health to chek certs are exisit * See if integration tag is working properly * Change the github action to use pytest instead of the old way * Separate out ruff and unit test jobs * Change back to regular integration testing bfd test * Only collect the ones that are deselected to compare * Put the collected tests into a file * Upload collected tests as an artifact to compare locally * Show integration and deslected that weren't integration * try to get deselected test summary in gha * BB2-4675: v3 Permissions Screen SAMHSA Checkbox (#1620) * BB2-4675: Add SAMHSA checkbox to v3 permissions screen * Use cache.add instead of cache.set, modify default for code * Address PR feedback - add docstrings * Add a new table to track user SAMHSA preferences rather than use caching * Address PR feedback * Remove commented out line * Address copilot feedback * Convert share_samhsa_data to a BooleanField to make the code less confusing * Small changes to get it back to the way it was * Delete unit tests yml since it is absorbed by pr checks now * Ensure runnign with bfd sbx locally still works * Help consolidate some of the make file selenium building and running locally * Comment changes * Make test names plural * Ensure we use make integration-test in make file * Change it back to pytest command * Update pull request checks to ignore certain paths Added paths-ignore to pull request checks for docs and markdown files. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Ryan Morosa <Ryan.Morosa@icf.com> Co-authored-by: James Demery <jamesdemery@navapbc.com> Co-authored-by: annamontare-nava <267455234+annamontare-nava@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jimmyfagan <90421499+jimmyfagan@users.noreply.github.com> Co-authored-by: noor1027 <noorulla@gmail.com> Co-authored-by: bwang-icf <Brandon.Wang@icf.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bwang-icf <178809349+bwang-icf@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Reverts #1607
reverting because we can't run the migration before the new code is deployed.