[KEYCLOAK-11971] Remove credentials option from configuration
This commit is contained in:
parent
4574d37d8d
commit
913056b2b2
1 changed files with 2 additions and 13 deletions
|
@ -613,11 +613,7 @@
|
||||||
req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
|
req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
|
||||||
req.withCredentials = true;
|
req.withCredentials = true;
|
||||||
|
|
||||||
if (kc.clientId && kc.clientSecret) {
|
params += '&client_id=' + encodeURIComponent(kc.clientId);
|
||||||
req.setRequestHeader('Authorization', 'Basic ' + btoa(kc.clientId + ':' + kc.clientSecret));
|
|
||||||
} else {
|
|
||||||
params += '&client_id=' + encodeURIComponent(kc.clientId);
|
|
||||||
}
|
|
||||||
|
|
||||||
var timeLocal = new Date().getTime();
|
var timeLocal = new Date().getTime();
|
||||||
|
|
||||||
|
@ -728,12 +724,7 @@
|
||||||
req.open('POST', url, true);
|
req.open('POST', url, true);
|
||||||
req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
|
req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
|
||||||
|
|
||||||
if (kc.clientId && kc.clientSecret) {
|
params += '&client_id=' + encodeURIComponent(kc.clientId);
|
||||||
req.setRequestHeader('Authorization', 'Basic ' + btoa(kc.clientId + ':' + kc.clientSecret));
|
|
||||||
} else {
|
|
||||||
params += '&client_id=' + encodeURIComponent(kc.clientId);
|
|
||||||
}
|
|
||||||
|
|
||||||
params += '&redirect_uri=' + oauth.redirectUri;
|
params += '&redirect_uri=' + oauth.redirectUri;
|
||||||
|
|
||||||
if (oauth.pkceCodeVerifier) {
|
if (oauth.pkceCodeVerifier) {
|
||||||
|
@ -863,7 +854,6 @@
|
||||||
kc.authServerUrl = config['auth-server-url'];
|
kc.authServerUrl = config['auth-server-url'];
|
||||||
kc.realm = config['realm'];
|
kc.realm = config['realm'];
|
||||||
kc.clientId = config['resource'];
|
kc.clientId = config['resource'];
|
||||||
kc.clientSecret = (config['credentials'] || {})['secret'];
|
|
||||||
setupOidcEndoints(null);
|
setupOidcEndoints(null);
|
||||||
promise.setSuccess();
|
promise.setSuccess();
|
||||||
} else {
|
} else {
|
||||||
|
@ -879,7 +869,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
kc.clientId = config.clientId;
|
kc.clientId = config.clientId;
|
||||||
kc.clientSecret = (config.credentials || {}).secret;
|
|
||||||
|
|
||||||
var oidcProvider = config['oidcProvider'];
|
var oidcProvider = config['oidcProvider'];
|
||||||
if (!oidcProvider) {
|
if (!oidcProvider) {
|
||||||
|
|
Loading…
Reference in a new issue