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.

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(deps): Migrate MFA code to our codebase and bump djangorestframework #3988

Merged
merged 11 commits into from
Jun 7, 2024

Conversation

gagantrivedi
Copy link
Member

@gagantrivedi gagantrivedi commented May 21, 2024

Thanks for submitting a PR! Please check the boxes below:

  • I have run pre-commit to check linting
  • I have added information to docs/ if required so people know about the feature!
  • I have filled in the "Changes" section below?
  • I have filled in the "How did you test this code" section below?
  • I have used a Conventional Commit title for this Pull Request

Changes

  • Because Trench is no longer maintained, this commit adds all the code that we depend on.
  • Bump djangorestframework
  • Fixes update feature external resource endpoint

How did you test this code?

The following scenarios were tested manually:

  • Generate MFA code from the old library and log in using the code from this PR and vice versa.
  • Log in using the backup codes generated by the old library with the code from this PR and vice versa.

Copy link

vercel bot commented May 21, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
docs ⬜️ Ignored (Inspect) Visit Preview Jun 7, 2024 3:33am
flagsmith-frontend-preview ⬜️ Ignored (Inspect) Visit Preview Jun 7, 2024 3:33am
flagsmith-frontend-staging ⬜️ Ignored (Inspect) Visit Preview Jun 7, 2024 3:33am

Copy link
Contributor

github-actions bot commented May 21, 2024

Uffizzi Preview deployment-52049 was deleted.

@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from 123345f to ecb9104 Compare May 21, 2024 10:00
@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from 7e46a2c to fb728b5 Compare May 22, 2024 05:41
@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from fb728b5 to 9f31bc2 Compare May 22, 2024 07:37
@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from 9f31bc2 to 369c595 Compare May 23, 2024 03:52
@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from 369c595 to 7e50b93 Compare May 23, 2024 07:42
@matthewelwell
Copy link
Contributor

@gagantrivedi this looks good to me now, I think we can resolve the merge conflicts and merge it in.

@gagantrivedi gagantrivedi force-pushed the fix/upgrade-djangorestframework branch from ee5b15d to ea24e6a Compare June 7, 2024 03:32
@github-actions github-actions bot added the fix label Jun 7, 2024
@gagantrivedi gagantrivedi added this pull request to the merge queue Jun 7, 2024
Merged via the queue into main with commit e217df7 Jun 7, 2024
22 checks passed
@gagantrivedi gagantrivedi deleted the fix/upgrade-djangorestframework branch June 7, 2024 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api Issue related to the REST API fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants