-
Notifications
You must be signed in to change notification settings - Fork 26
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
OIDC/Auth2 integration #2649
Open
boehlke
wants to merge
8
commits into
OpenSlides:feature/keycloak-oidc
Choose a base branch
from
kryptance:main
base: feature/keycloak-oidc
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
OIDC/Auth2 integration #2649
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3e8ce49
Bump debugpy from 1.8.5 to 1.8.6 in /requirements/partial (#2648)
dependabot[bot] 8ac3dd3
change imports to os_authlib
boehlke 8b3b009
Cleanup saml and auth service based code
boehlke 8abec7b
cleanup
boehlke 54c3b2c
Use pip-auth libraries code directly from local source
boehlke 27594ea
Implement back-channel logout endpoint
boehlke 48ad18f
Change build scripts so that fullstack feature use-case (wiring own l…
boehlke f374182
Add stages for normal dev deps and fullstack dep resolution (local)
boehlke File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
FROM python:3.10.13-slim-bookworm | ||
FROM python:3.10.13-slim-bookworm as base | ||
|
||
RUN apt-get update && apt-get install --yes make git curl ncat vim bash-completion mime-support gcc libpq-dev libmagic1 | ||
|
||
WORKDIR /app | ||
|
||
COPY requirements/ requirements/ | ||
ARG REQUIREMENTS_FILE=requirements_development.txt | ||
RUN . requirements/export_service_commits.sh && pip install --no-cache-dir --requirement requirements/$REQUIREMENTS_FILE | ||
|
||
COPY dev/.bashrc . | ||
COPY dev/cleanup.sh . | ||
|
||
|
@@ -42,3 +38,17 @@ ENV DEFAULT_FROM_EMAIL [email protected] | |
STOPSIGNAL SIGKILL | ||
ENTRYPOINT ["./entrypoint.sh"] | ||
CMD exec python -m debugpy --listen 0.0.0.0:5678 openslides_backend | ||
|
||
FROM base as development | ||
|
||
COPY requirements/ requirements/ | ||
ARG REQUIREMENTS_FILE=requirements_development.txt | ||
RUN . requirements/export_service_commits.sh && pip install --no-cache-dir --requirement requirements/$REQUIREMENTS_FILE | ||
|
||
FROM base as development-fullstack | ||
|
||
COPY --from=pipauth / /pip-auth | ||
COPY --from=datastore / /openslides-datastore-service | ||
COPY requirements/ requirements/ | ||
ARG REQUIREMENTS_FILE=requirements_development_fullstack.txt | ||
RUN pip install --no-cache-dir --requirement requirements/$REQUIREMENTS_FILE |
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
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
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
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
119 changes: 0 additions & 119 deletions
119
openslides_backend/action/actions/user/forget_password.py
This file was deleted.
Oops, something went wrong.
63 changes: 0 additions & 63 deletions
63
openslides_backend/action/actions/user/forget_password_confirm.py
This file was deleted.
Oops, something went wrong.
39 changes: 0 additions & 39 deletions
39
openslides_backend/action/actions/user/generate_new_password.py
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it is going to be empty, you can delete the
additional_optional_fields
attribute.