[PR #1388] Merging oidc branch with develop #3427

New issue

Open

opened 2026-02-26 08:30:36 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 08:30:36 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/1388
Author: @jc21
Created: 9/8/2021
Status: 🔄 Open

Base: develop ← Head: openidc

📝 Commits (10+)

8e10b7d Add UI tab for specifying OpenID Connect options for proxy hosts.
53792a5 Add database columns to store OpenID Connect information for Proxy Hosts.
5811345 Use OpenResty instead of plain nginx to support OpenID Connect authorization.
cdf702e Add a field to specify a list of allowed emails when using OpenID Connect auth.
daf3991 Allow limiting OpenID Connect auth to a list of users.
9f2d3a1 Manually set the default values for the OpenID Connect columns.
87d9bab Fix conditionals in the liquid template for OpenID Connect conf.
8539930 Updated the docs to add a section about OpenID Connect
076d89b Use localized strings for the OpenID Connect texts.
e7f7be2 OpenIDC: Trigger the change event of the "restrict users" toggle when enabling/disabling oidc.

📊 Changes

13 files changed (+517 additions, -34 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 (+17 -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 (+24 -2)
📝 docker/rootfs/etc/nginx/nginx.conf (+15 -1)
📝 docs/src/advanced-config/index.md (+22 -0)
📝 frontend/js/app/nginx/proxy/form.ejs (+66 -0)
📝 frontend/js/app/nginx/proxy/form.js (+87 -30)
📝 frontend/js/i18n/messages.json (+10 -0)
📝 frontend/js/models/proxy-host.js (+8 -0)

📄 Description

See discussion on #753

See this doc for instructions.

NOTE: For anyone wanting to test this patch, back up your entire NginxProxyManager config and database first. You won't be able to jump back to the latest tag afterwards as this PR will run a database migration.

_{🔄 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/1388 **Author:** [@jc21](https://github.com/jc21) **Created:** 9/8/2021 **Status:** 🔄 Open **Base:** `develop` ← **Head:** `openidc` --- ### 📝 Commits (10+) - [`8e10b7d`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/8e10b7da37e5f679f0a855ffb88265d12a2f2312) Add UI tab for specifying OpenID Connect options for proxy hosts. - [`53792a5`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/53792a5cf700987a20c05c8ae83be0cdd48d9d10) Add database columns to store OpenID Connect information for Proxy Hosts. - [`5811345`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/58113450505e892f9551007d1195dc8dce8d50cf) Use OpenResty instead of plain nginx to support OpenID Connect authorization. - [`cdf702e`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/cdf702e5456c8d340bc03d689228993d178f78eb) Add a field to specify a list of allowed emails when using OpenID Connect auth. - [`daf3991`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/daf399163ccc700e9538aac6030d7c212e5ee611) Allow limiting OpenID Connect auth to a list of users. - [`9f2d3a1`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/9f2d3a1737581237e45aacaba02346f4e939e251) Manually set the default values for the OpenID Connect columns. - [`87d9bab`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/87d9babbd3382536ab1225a37256f7e36bc49845) Fix conditionals in the liquid template for OpenID Connect conf. - [`8539930`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/8539930f89de609d96c5f5487886a60cdf253c40) Updated the docs to add a section about OpenID Connect - [`076d89b`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/076d89b5b5e2e4e5fae9a02322d5245c58ecbc57) Use localized strings for the OpenID Connect texts. - [`e7f7be2`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/e7f7be2a2bcd13f51b2900f685114e48f244d7c0) OpenIDC: Trigger the change event of the "restrict users" toggle when enabling/disabling oidc. ### 📊 Changes **13 files changed** (+517 additions, -34 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` (+17 -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` (+24 -2) 📝 `docker/rootfs/etc/nginx/nginx.conf` (+15 -1) 📝 `docs/src/advanced-config/index.md` (+22 -0) 📝 `frontend/js/app/nginx/proxy/form.ejs` (+66 -0) 📝 `frontend/js/app/nginx/proxy/form.js` (+87 -30) 📝 `frontend/js/i18n/messages.json` (+10 -0) 📝 `frontend/js/models/proxy-host.js` (+8 -0) </details> ### 📄 Description See discussion on #753 See [this doc](https://github.com/jc21/nginx-proxy-manager/pull/1388/files?file-filters%5B%5D=.ejs&file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.md#diff-76faa2300d31c8c0153b6ca48c9aa4b54ff640cc59808a2065d2e8ac10ee21f0) for instructions. *NOTE:* For anyone wanting to test this patch, back up your entire NginxProxyManager config and database first. You won't be able to jump back to the `latest` tag afterwards as this PR will run a database migration. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>