Skip to content

Commit

Permalink
feat(auth): integrate ldap (#3031)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewelwell authored Nov 29, 2023
1 parent 980bb86 commit 65f78f7
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/api-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:

- name: Install poetry
run: pipx install poetry

- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ jobs:
context: .
build-args: |
SAML_INSTALLED=1
POETRY_OPTS=--with saml,auth-controller
POETRY_OPTS=--with saml,auth-controller,ldap
GH_TOKEN=${{ secrets.GH_PRIVATE_ACCESS_TOKEN }}
stop-runner:
needs: [start-runner, build-dockerhub]
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ ARG POETRY_VIRTUALENVS_CREATE=false
RUN make install-poetry
ENV PATH="$PATH:/root/.local/bin"

ARG GH_TOKEN
RUN if [ -n "${GH_TOKEN}" ]; \
then echo "https://${GH_TOKEN}:@github.com" > ${HOME}/.git-credentials \
&& git config --global credential.helper store; fi;

ARG POETRY_OPTS
RUN make install-packages opts="${POETRY_OPTS}"

Expand Down
5 changes: 5 additions & 0 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ ARG POETRY_VIRTUALENVS_CREATE=false
RUN make install-poetry
ENV PATH="$PATH:/root/.local/bin"

ARG GH_TOKEN
RUN if [ -n "${GH_TOKEN}" ]; \
then echo "https://${GH_TOKEN}:@github.com" > ${HOME}/.git-credentials \
&& git config --global credential.helper store; fi;

ARG POETRY_OPTS
RUN make install-packages opts="${POETRY_OPTS}"

Expand Down
61 changes: 55 additions & 6 deletions api/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ optional = true
[tool.poetry.group.saml.dependencies]
pysaml2 = "^7.0.0"

[tool.poetry.group.ldap]
optional = true

[tool.poetry.group.ldap.dependencies]
flagsmith-ldap = { git = "https://github.com/flagsmith/flagsmith-ldap", tag = "v0.0.2" }

[tool.poetry.group.dev.dependencies]
django-test-migrations = "~1.2.0"
responses = "~0.22.0"
Expand Down

3 comments on commit 65f78f7

@vercel
Copy link

@vercel vercel bot commented on 65f78f7 Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs – ./docs

docs-git-main-flagsmith.vercel.app
docs-flagsmith.vercel.app
docs.bullet-train.io
docs.flagsmith.com

@vercel
Copy link

@vercel vercel bot commented on 65f78f7 Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 65f78f7 Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.