@@ -1832,37 +1832,41 @@ function initAdmin() {
1832
1832
}
1833
1833
}
1834
1834
1835
- function onOAuth2Change ( ) {
1835
+ function onOAuth2Change ( applyDefaultValues ) {
1836
1836
$ ( '.open_id_connect_auto_discovery_url, .oauth2_use_custom_url' ) . hide ( ) ;
1837
1837
$ ( '.open_id_connect_auto_discovery_url input[required]' ) . removeAttr ( 'required' ) ;
1838
1838
1839
1839
const provider = $ ( '#oauth2_provider' ) . val ( ) ;
1840
1840
switch ( provider ) {
1841
- case 'github' :
1842
- case 'gitlab' :
1843
1841
case 'gitea' :
1844
1842
case 'nextcloud' :
1845
1843
case 'mastodon' :
1844
+ $ ( '#oauth2_use_custom_url' ) . attr ( 'checked' , 'checked' ) ;
1845
+ // fallthrough intentional
1846
+ case 'github' :
1847
+ case 'gitlab' :
1846
1848
$ ( '.oauth2_use_custom_url' ) . show ( ) ;
1847
1849
break ;
1848
1850
case 'openidConnect' :
1849
1851
$ ( '.open_id_connect_auto_discovery_url input' ) . attr ( 'required' , 'required' ) ;
1850
1852
$ ( '.open_id_connect_auto_discovery_url' ) . show ( ) ;
1851
1853
break ;
1852
1854
}
1853
- onOAuth2UseCustomURLChange ( ) ;
1855
+ onOAuth2UseCustomURLChange ( applyDefaultValues ) ;
1854
1856
}
1855
1857
1856
- function onOAuth2UseCustomURLChange ( ) {
1858
+ function onOAuth2UseCustomURLChange ( applyDefaultValues ) {
1857
1859
const provider = $ ( '#oauth2_provider' ) . val ( ) ;
1858
1860
$ ( '.oauth2_use_custom_url_field' ) . hide ( ) ;
1859
1861
$ ( '.oauth2_use_custom_url_field input[required]' ) . removeAttr ( 'required' ) ;
1860
1862
1861
1863
if ( $ ( '#oauth2_use_custom_url' ) . is ( ':checked' ) ) {
1862
- $ ( '#oauth2_token_url' ) . val ( $ ( `#${ provider } _token_url` ) . val ( ) ) ;
1863
- $ ( '#oauth2_auth_url' ) . val ( $ ( `#${ provider } _auth_url` ) . val ( ) ) ;
1864
- $ ( '#oauth2_profile_url' ) . val ( $ ( `#${ provider } _profile_url` ) . val ( ) ) ;
1865
- $ ( '#oauth2_email_url' ) . val ( $ ( `#${ provider } _email_url` ) . val ( ) ) ;
1864
+ if ( applyDefaultValues ) {
1865
+ $ ( '#oauth2_token_url' ) . val ( $ ( `#${ provider } _token_url` ) . val ( ) ) ;
1866
+ $ ( '#oauth2_auth_url' ) . val ( $ ( `#${ provider } _auth_url` ) . val ( ) ) ;
1867
+ $ ( '#oauth2_profile_url' ) . val ( $ ( `#${ provider } _profile_url` ) . val ( ) ) ;
1868
+ $ ( '#oauth2_email_url' ) . val ( $ ( `#${ provider } _email_url` ) . val ( ) ) ;
1869
+ }
1866
1870
1867
1871
switch ( provider ) {
1868
1872
case 'github' :
@@ -1923,7 +1927,7 @@ function initAdmin() {
1923
1927
case '6' : // OAuth2
1924
1928
$ ( '.oauth2' ) . show ( ) ;
1925
1929
$ ( '.oauth2 div.required:not(.oauth2_use_custom_url,.oauth2_use_custom_url_field,.open_id_connect_auto_discovery_url) input' ) . attr ( 'required' , 'required' ) ;
1926
- onOAuth2Change ( ) ;
1930
+ onOAuth2Change ( true ) ;
1927
1931
break ;
1928
1932
case '7' : // SSPI
1929
1933
$ ( '.sspi' ) . show ( ) ;
@@ -1941,8 +1945,8 @@ function initAdmin() {
1941
1945
$ ( '#auth_type' ) . trigger ( 'change' ) ;
1942
1946
$ ( '#security_protocol' ) . on ( 'change' , onSecurityProtocolChange ) ;
1943
1947
$ ( '#use_paged_search' ) . on ( 'change' , onUsePagedSearchChange ) ;
1944
- $ ( '#oauth2_provider' ) . on ( 'change' , onOAuth2Change ) ;
1945
- $ ( '#oauth2_use_custom_url' ) . on ( 'change' , onOAuth2UseCustomURLChange ) ;
1948
+ $ ( '#oauth2_provider' ) . on ( 'change' , ( ) => onOAuth2Change ( true ) ) ;
1949
+ $ ( '#oauth2_use_custom_url' ) . on ( 'change' , ( ) => onOAuth2UseCustomURLChange ( true ) ) ;
1946
1950
$ ( '#groups_enabled' ) . on ( 'change' , onVerifyGroupMembershipChange ) ;
1947
1951
}
1948
1952
// Edit authentication
@@ -1956,9 +1960,9 @@ function initAdmin() {
1956
1960
$ ( '#use_paged_search' ) . on ( 'change' , onUsePagedSearchChange ) ;
1957
1961
}
1958
1962
} else if ( authType === '6' ) {
1959
- $ ( '#oauth2_provider' ) . on ( 'change' , onOAuth2Change ) ;
1960
- $ ( '#oauth2_use_custom_url' ) . on ( 'change' , onOAuth2UseCustomURLChange ) ;
1961
- onOAuth2Change ( ) ;
1963
+ $ ( '#oauth2_provider' ) . on ( 'change' , ( ) => onOAuth2Change ( true ) ) ;
1964
+ $ ( '#oauth2_use_custom_url' ) . on ( 'change' , ( ) => onOAuth2UseCustomURLChange ( false ) ) ;
1965
+ onOAuth2Change ( false ) ;
1962
1966
}
1963
1967
}
1964
1968
0 commit comments