[PR #753] [CLOSED] Merging oidc branch with master #3291

New issue

Closed

opened 2026-02-26 07:38:46 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 07:38:46 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/753
Author: @joe307bad
Created: 12/2/2020
Status: ❌ Closed

Base: develop ← Head: oidc-to-master

📝 Commits (10+)

46a2911 Add UI tab for specifying OpenID Connect options for proxy hosts.
102571f Add database columns to store OpenID Connect information for Proxy Hosts.
a2992ae Use OpenResty instead of plain nginx to support OpenID Connect authorization.
69b56ae Add a field to specify a list of allowed emails when using OpenID Connect auth.
5a41fe9 Allow limiting OpenID Connect auth to a list of users.
8e1bfe5 Manually set the default values for the OpenID Connect columns.
4428b52 Fix conditionals in the liquid template for OpenID Connect conf.
878e164 Updated the docs to add a section about OpenID Connect
fe280a3 Use localized strings for the OpenID Connect texts.
9ee912b OpenIDC: Trigger the change event of the "restrict users" toggle when enabling/disabling oidc.

📊 Changes

14 files changed (+489 additions, -5 deletions)

View changed files

➕ backend/migrations/20200522113248_openid_connect.js (+48 -0)
➕ backend/migrations/20200522144240_openid_allowed_users.js (+40 -0)
📝 backend/models/proxy_host.js (+42 -1)
📝 backend/schema/definitions.json (+37 -0)
📝 backend/schema/endpoints/proxy-hosts.json (+96 -0)
➕ backend/templates/_openid_connect.conf (+47 -0)
📝 backend/templates/proxy_host.conf (+2 -0)
📝 docker/Dockerfile (+1 -1)
📝 docker/rootfs/etc/nginx/nginx.conf (+10 -0)
📝 docs/advanced-config/README.md (+23 -0)
📝 frontend/js/app/nginx/proxy/form.ejs (+66 -0)
📝 frontend/js/app/nginx/proxy/form.js (+59 -2)
📝 frontend/js/i18n/messages.json (+10 -1)
📝 frontend/js/models/proxy-host.js (+8 -0)

📄 Description

This PR merges the changes introduced in the oidc branch into the master branch. These changes add the ability to specify an OIDC provider for authentication.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/NginxProxyManager/nginx-proxy-manager/pull/753 **Author:** [@joe307bad](https://github.com/joe307bad) **Created:** 12/2/2020 **Status:** ❌ Closed **Base:** `develop` ← **Head:** `oidc-to-master` --- ### 📝 Commits (10+) - [`46a2911`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/46a2911bad380123464db3eab76dffbc4beeda6e) Add UI tab for specifying OpenID Connect options for proxy hosts. - [`102571f`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/102571f7282416f933c1bb50b4bae471bbb2c289) Add database columns to store OpenID Connect information for Proxy Hosts. - [`a2992ae`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/a2992aeedca22a8d0587d13c2723bc27ca82f266) Use OpenResty instead of plain nginx to support OpenID Connect authorization. - [`69b56ae`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/69b56ae73a08c9e1f6055ca500fe796a9f964ab2) Add a field to specify a list of allowed emails when using OpenID Connect auth. - [`5a41fe9`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/5a41fe9c860507b1886097e9a4651f07fae59f3a) Allow limiting OpenID Connect auth to a list of users. - [`8e1bfe5`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/8e1bfe59407b24342aa6035d05e886f93bc950c0) Manually set the default values for the OpenID Connect columns. - [`4428b52`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4428b52864d216af983e624498421f72f72f45cf) Fix conditionals in the liquid template for OpenID Connect conf. - [`878e164`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/878e1649b32faa03db14079de37fa031c4ca5701) Updated the docs to add a section about OpenID Connect - [`fe280a3`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/fe280a3e1e8ec8e66f42459c9372c58c4a10598f) Use localized strings for the OpenID Connect texts. - [`9ee912b`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/9ee912be01e7f21bcf0f2358725d9d11cf195dfb) OpenIDC: Trigger the change event of the "restrict users" toggle when enabling/disabling oidc. ### 📊 Changes **14 files changed** (+489 additions, -5 deletions) <details> <summary>View changed files</summary> ➕ `backend/migrations/20200522113248_openid_connect.js` (+48 -0) ➕ `backend/migrations/20200522144240_openid_allowed_users.js` (+40 -0) 📝 `backend/models/proxy_host.js` (+42 -1) 📝 `backend/schema/definitions.json` (+37 -0) 📝 `backend/schema/endpoints/proxy-hosts.json` (+96 -0) ➕ `backend/templates/_openid_connect.conf` (+47 -0) 📝 `backend/templates/proxy_host.conf` (+2 -0) 📝 `docker/Dockerfile` (+1 -1) 📝 `docker/rootfs/etc/nginx/nginx.conf` (+10 -0) 📝 `docs/advanced-config/README.md` (+23 -0) 📝 `frontend/js/app/nginx/proxy/form.ejs` (+66 -0) 📝 `frontend/js/app/nginx/proxy/form.js` (+59 -2) 📝 `frontend/js/i18n/messages.json` (+10 -1) 📝 `frontend/js/models/proxy-host.js` (+8 -0) </details> ### 📄 Description This PR merges the changes introduced in the `oidc` branch into the `master` branch. These changes add the ability to specify an OIDC provider for authentication. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-26 07:38:46 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/nginx-proxy-manager-NginxProxyManager#3291

No description provided.

Rows
Columns