mirror of
https://github.com/cwinfo/powerdns-admin.git
synced 2025-07-27 15:54:16 +00:00
Resolved merge conflict
This commit is contained in:
@@ -1659,8 +1659,6 @@ def setting_authentication():
|
||||
request.form.get('google_oauth_scope'))
|
||||
Setting().set('google_authorize_url',
|
||||
request.form.get('google_authorize_url'))
|
||||
Setting().set('google_oauth_jwks_url',
|
||||
request.form.get('google_oauth_jwks_url'))
|
||||
Setting().set('google_base_url',
|
||||
request.form.get('google_base_url'))
|
||||
result = {
|
||||
@@ -1694,8 +1692,6 @@ def setting_authentication():
|
||||
request.form.get('github_oauth_token_url'))
|
||||
Setting().set('github_oauth_authorize_url',
|
||||
request.form.get('github_oauth_authorize_url'))
|
||||
Setting().set('github_oauth_jwks_url',
|
||||
request.form.get('github_oauth_jwks_url'))
|
||||
result = {
|
||||
'status': True,
|
||||
'msg':
|
||||
@@ -1727,8 +1723,6 @@ def setting_authentication():
|
||||
request.form.get('azure_oauth_token_url'))
|
||||
Setting().set('azure_oauth_authorize_url',
|
||||
request.form.get('azure_oauth_authorize_url'))
|
||||
Setting().set('azure_oauth_jwks_url',
|
||||
request.form.get('azure_oauth_jwks_url'))
|
||||
Setting().set(
|
||||
'azure_sg_enabled', True
|
||||
if request.form.get('azure_sg_enabled') == 'ON' else False)
|
||||
@@ -1782,8 +1776,6 @@ def setting_authentication():
|
||||
request.form.get('oidc_oauth_token_url'))
|
||||
Setting().set('oidc_oauth_authorize_url',
|
||||
request.form.get('oidc_oauth_authorize_url'))
|
||||
Setting().set('oidc_oauth_jwks_url',
|
||||
request.form.get('oidc_oauth_jwks_url'))
|
||||
Setting().set('oidc_oauth_logout_url',
|
||||
request.form.get('oidc_oauth_logout_url'))
|
||||
Setting().set('oidc_oauth_username',
|
||||
|
Reference in New Issue
Block a user