Skip to content

chore: sync upstream changes from grafana-cold-storage/django-saml2-auth#2

Merged
ap0ught merged 26 commits into
mainfrom
sync-upstream-20260717-django-saml2-auth
Jul 17, 2026
Merged

chore: sync upstream changes from grafana-cold-storage/django-saml2-auth#2
ap0ught merged 26 commits into
mainfrom
sync-upstream-20260717-django-saml2-auth

Conversation

@ap0ught

@ap0ught ap0ught commented Jul 17, 2026

Copy link
Copy Markdown
Collaborator

This PR syncs django-saml2-auth with upstream grafana-cold-storage/django-saml2-auth.

  • Upstream branch: main
  • Fork branch: main
  • Upstream commits brought in: 25

Included upstream commit subjects:

This is a straight upstream sync; no fork-specific changes were introduced.

mostafa and others added 26 commits October 9, 2024 14:24
* Update deps
* Add TRIGGER.EXTRACT_USER_IDENTITY hook function to extract_user_identity
* Update README
* Format code
* Update tests to reflect changes in extract_user_identity function
* Add new test for testing EXTRACT_USER_IDENTITY
* Submit coverage and PyPI package only once
* Create a release just once
* Fix mypy errors
* Revert "Submit coverage and PyPI package only once"
* This reverts commit 7f7fb0f.
* Update GitHub release action
…-cold-storage#345)

* [FEAT] Implement a setting to disable the exception handler.
* Some fixes and improvements
* feat: Allow custom assertion URIs
* Update README
* Remove CUSTOM_ASSERTION_URI
* Lambda to func
* URI to URL
* feat: Separate the Build and Deploy job
* Change syntax
* feat: Trgger to get custom frontend URLs
* Fix the typing
* Try parallel coveralls
* Update Django versions and poetry version
* Update deps
… return the JWT (grafana-cold-storage#361)

* Move use_jwt block below login block
* Update test to verify the user is logged in to both the Single Page App and the Django admin console
* Fix linting
* Update deps
* Remove interrogate to fix CVE-2022-42969
* Update Django versions
* Update poetry to v2
* Use the latest released version of Django
* Replace poetry with uv
* Update uv.lock
* Fix workflows
* Use uv to run python build command
* Update Django versions to check compatibility
* Update action version and permissions
* Fix permissions
…rafana-cold-storage#366)

* Handle case where the frontend url already contains query parameters
* Fix grafana-cold-storage#365
* Add test for new feature
* Use JWT since tokens are only appended in the JWT scenario
* Fix uv.lock
* Parse query string and keep backward compatibility
* Fix linter issues

---------

Co-authored-by: Mostafa Moradian <mostafa@grafana.com>
@ap0ught
ap0ught merged commit ca124fa into main Jul 17, 2026
@ap0ught
ap0ught deleted the sync-upstream-20260717-django-saml2-auth branch July 17, 2026 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants