-
-
+
+
+
+
Embedded Credentials -
-
+
@@ -152,15 +152,15 @@
value: ''
},
container: { value: 'oauth2Response' },
- grant_type: { value: 'set_by_credentials' },
- access_token_url: { value: '' },
- authorization_endpoint: { value: '' },
- redirect_uri: { value: '/oauth2/redirect_uri' },
- open_authentication: { value: '' },
+ grantType: { value: 'setByCredentials' },
+ accessTokenUrl: { value: '' },
+ authorizationEndpoint: { value: '' },
+ redirectUri: { value: '/oauth2/redirectUri' },
+ openAuthentication: { value: '' },
username: { value: '' },
password: { value: '' },
- client_id: { value: '' },
- client_secret: { value: '' },
+ clientId: { value: '' },
+ clientSecret: { value: '' },
scope: { value: '' },
resource: { value: ''},
state: { value: '' },
@@ -170,7 +170,7 @@
label: RED._('node-red:oauth2.label.proxy-config')
},
senderr: { value: false },
- client_credentials_in_body: { value: false },
+ clientCredentialsInBody: { value: false },
rejectUnauthorized: { value: true },
headers: { value: {} }
},
@@ -214,59 +214,59 @@
types: ['msg']
});
- $('#node-input-grant_type').on('change', function () {
- if ($('#node-input-grant_type').val() === 'set_by_credentials') {
- $('#node-authorization_endpoint').hide();
- $('#node-open_authentication').hide();
- $('#node-redirect_uri').hide();
- $('#node-password_credentials').hide();
- $('#node-access_token_url').hide();
- $('#node-client_id').hide();
- $('#node-client_secret').hide();
+ $('#node-input-grantType').on('change', function () {
+ if ($('#node-input-grantType').val() === 'setByCredentials') {
+ $('#node-authorizationEndpoint').hide();
+ $('#node-openAuthentication').hide();
+ $('#node-redirectUri').hide();
+ $('#node-passwordCredentials').hide();
+ $('#node-accessTokenUrl').hide();
+ $('#node-clientId').hide();
+ $('#node-clientSecret').hide();
$('#node-scope').hide();
$('#node-resource').hide();
$('#node-state').hide();
$('#node-rejectUnauthorized').show();
- $('#node-client_credentials_in_body').show();
- } else if ($('#node-input-grant_type').val() === 'client_credentials') {
- $('#node-authorization_endpoint').hide();
- $('#node-open_authentication').hide();
- $('#node-redirect_uri').hide();
- $('#node-password_credentials').hide();
- $('#node-access_token_url').show();
- $('#node-client_id').show();
- $('#node-client_secret').show();
+ $('#node-clientCredentialsInBody').show();
+ } else if ($('#node-input-grantType').val() === 'clientCredentials') {
+ $('#node-authorizationEndpoint').hide();
+ $('#node-openAuthentication').hide();
+ $('#node-redirectUri').hide();
+ $('#node-passwordCredentials').hide();
+ $('#node-accessTokenUrl').show();
+ $('#node-clientId').show();
+ $('#node-clientSecret').show();
$('#node-scope').show();
$('#node-resource').show();
$('#node-state').show();
$('#node-rejectUnauthorized').show();
- $('#node-client_credentials_in_body').show();
- } else if ($('#node-input-grant_type').val() === 'password') {
- $('#node-authorization_endpoint').hide();
- $('#node-open_authentication').hide();
- $('#node-redirect_uri').hide();
- $('#node-password_credentials').show();
- $('#node-access_token_url').show();
- $('#node-client_id').show();
- $('#node-client_secret').show();
+ $('#node-clientCredentialsInBody').show();
+ } else if ($('#node-input-grantType').val() === 'password') {
+ $('#node-authorizationEndpoint').hide();
+ $('#node-openAuthentication').hide();
+ $('#node-redirectUri').hide();
+ $('#node-passwordCredentials').show();
+ $('#node-accessTokenUrl').show();
+ $('#node-clientId').show();
+ $('#node-clientSecret').show();
$('#node-scope').show();
$('#node-resource').show();
$('#node-state').show();
$('#node-rejectUnauthorized').show();
- $('#node-client_credentials_in_body').show();
- } else if ($('#node-input-grant_type').val() === 'authorization_code') {
- $('#node-password_credentials').hide();
- $('#node-open_authentication').show();
- $('#node-redirect_uri').show();
- $('#node-access_token_url').show();
- $('#node-authorization_endpoint').show();
- $('#node-client_id').show();
- $('#node-client_secret').show();
+ $('#node-clientCredentialsInBody').show();
+ } else if ($('#node-input-grantType').val() === 'authorizationCode') {
+ $('#node-passwordCredentials').hide();
+ $('#node-openAuthentication').show();
+ $('#node-redirectUri').show();
+ $('#node-accessTokenUrl').show();
+ $('#node-authorizationEndpoint').show();
+ $('#node-clientId').show();
+ $('#node-clientSecret').show();
$('#node-scope').show();
$('#node-resource').show();
$('#node-state').show();
$('#node-rejectUnauthorized').show();
- $('#node-client_credentials_in_body').show();
+ $('#node-clientCredentialsInBody').show();
}
RED.tray.resize();
});
@@ -274,7 +274,7 @@
function pollCredentials() {
$.getJSON('oauth2/credentials/' + id, function (data) {
if (data) {
- $('#node-input-open_authentication').val(data.code);
+ $('#node-input-openAuthentication').val(data.code);
delete window.configNodeIntervalId;
} else {
window.configNodeIntervalId = window.setTimeout(pollCredentials, 5000);
@@ -283,9 +283,9 @@
}
$('#authorizeButton').mousedown(function () {
- const authorizationEndpoint = $('#node-input-authorization_endpoint').val();
- const clientId = $('#node-input-client_id').val();
- const clientSecret = $('#node-input-client_secret').val();
+ const authorizationEndpoint = $('#node-input-authorizationEndpoint').val();
+ const clientId = $('#node-input-clientId').val();
+ const clientSecret = $('#node-input-clientSecret').val();
const proxy = $('#node-input-proxy').val();
var scope = $('#node-input-scope').val();
scope = scope.replace(/\n/g, '%20');
@@ -307,8 +307,8 @@
window.configNodeIntervalId = window.setTimeout(pollCredentials, 5000);
});
$('#authorizeButton').click(function () {
- var clientId = $('#node-input-client_id').val();
- var clientSecret = $('#node-input-client_secret').val();
+ var clientId = $('#node-input-clientId').val();
+ var clientSecret = $('#node-input-clientSecret').val();
if (clientId === '' || clientSecret === '') {
e.preventDefault();
}
diff --git a/src/oauth2.js b/src/oauth2.js
index 5c90891..d78798b 100644
--- a/src/oauth2.js
+++ b/src/oauth2.js
@@ -49,17 +49,17 @@ module.exports = function (RED) {
// Store local copies of the node configuration (as defined in the .html)
this.name = oauth2Node.name || '';
this.container = oauth2Node.container || '';
- this.access_token_url = oauth2Node.access_token_url || '';
- this.grant_type = oauth2Node.grant_type || '';
+ this.accessTokenUrl = oauth2Node.accessTokenUrl || '';
+ this.grantType = oauth2Node.grantType || '';
this.username = oauth2Node.username || '';
this.password = oauth2Node.password || '';
- this.client_id = oauth2Node.client_id || '';
- this.client_secret = oauth2Node.client_secret || '';
+ this.clientId = oauth2Node.clientId || '';
+ this.clientSecret = oauth2Node.clientSecret || '';
this.scope = oauth2Node.scope || '';
this.resource = oauth2Node.resource || '';
this.state = oauth2Node.state || '';
this.rejectUnauthorized = oauth2Node.rejectUnauthorized || false;
- this.client_credentials_in_body = oauth2Node.client_credentials_in_body || false;
+ this.clientCredentialsInBody = oauth2Node.clientCredentialsInBody || false;
this.headers = oauth2Node.headers || {};
this.sendErrorsToCatch = oauth2Node.senderr || false;
@@ -148,50 +148,50 @@ module.exports = function (RED) {
form: {}
};
- if (node.grant_type === 'set_by_credentials') {
- baseOptions.url = msg.oauth2Request.access_token_url;
- baseOptions.headers.Authorization = 'Basic ' + Buffer.from(`${msg.oauth2Request.credentials.client_id}:${msg.oauth2Request.credentials.client_secret}`).toString('base64');
- baseOptions.form.grant_type = msg.oauth2Request.credentials.grant_type;
+ if (node.grantType === 'setByCredentials') {
+ baseOptions.url = msg.oauth2Request.accessTokenUrl;
+ baseOptions.headers.Authorization = 'Basic ' + Buffer.from(`${msg.oauth2Request.credentials.clientId}:${msg.oauth2Request.credentials.clientSecret}`).toString('base64');
+ baseOptions.form.grantType = msg.oauth2Request.credentials.grantType;
baseOptions.form.scope = msg.oauth2Request.credentials.scope;
baseOptions.form.resource = msg.oauth2Request.credentials.resource;
baseOptions.form.state = msg.oauth2Request.credentials.state;
// Additional configurations based on grant type
- if (msg.oauth2Request.credentials.grant_type === 'password') {
+ if (msg.oauth2Request.credentials.grantType === 'password') {
baseOptions.form.username = msg.oauth2Request.credentials.username;
baseOptions.form.password = msg.oauth2Request.credentials.password;
- } else if (msg.oauth2Request.credentials.grant_type === 'refresh_token') {
+ } else if (msg.oauth2Request.credentials.grantType === 'refresh_token') {
baseOptions.form.refresh_token = msg.oauth2Request.credentials.refresh_token;
}
- if (node.client_credentials_in_body) {
- baseOptions.form.client_id = msg.oauth2Request.credentials.client_id;
- baseOptions.form.client_secret = msg.oauth2Request.credentials.client_secret;
+ if (node.clientCredentialsInBody) {
+ baseOptions.form.clientId = msg.oauth2Request.credentials.clientId;
+ baseOptions.form.clientSecret = msg.oauth2Request.credentials.clientSecret;
baseOptions.headers = Object.fromEntries(Object.entries(baseOptions.headers).filter(([key]) => key !== 'Authorization'));
}
} else {
- baseOptions.url = node.access_token_url;
- baseOptions.headers.Authorization = 'Basic ' + Buffer.from(`${node.client_id}:${node.client_secret}`).toString('base64');
- baseOptions.form.grant_type = node.grant_type;
+ baseOptions.url = node.accessTokenUrl;
+ baseOptions.headers.Authorization = 'Basic ' + Buffer.from(`${node.clientId}:${node.clientSecret}`).toString('base64');
+ baseOptions.form.grantType = node.grantType;
baseOptions.form.scope = node.scope;
baseOptions.form.resource = node.resource;
baseOptions.form.state = node.state;
// Additional configurations based on grant type
- if (node.grant_type === 'password') {
+ if (node.grantType === 'password') {
baseOptions.form.username = node.username;
baseOptions.form.password = node.password;
- } else if (node.grant_type === 'authorization_code') {
- if (node.client_credentials_in_body) {
- baseOptions.form.client_id = node.client_id;
- baseOptions.form.client_secret = node.client_secret;
+ } else if (node.grantType === 'authorizationCode') {
+ if (node.clientCredentialsInBody) {
+ baseOptions.form.clientId = node.clientId;
+ baseOptions.form.clientSecret = node.clientSecret;
baseOptions.headers = Object.fromEntries(Object.entries(baseOptions.headers).filter(([key]) => key !== 'Authorization'));
}
const credentials = RED.nodes.getCredentials(node.id);
if (credentials) {
baseOptions.form.code = credentials.code;
- baseOptions.form.redirect_uri = credentials.redirectUri;
+ baseOptions.form.redirectUri = credentials.redirectUri;
}
}
}
@@ -286,7 +286,7 @@ module.exports = function (RED) {
if (credentials) {
res.json({
code: credentials.code,
- redirect_uri: credentials.redirect_uri
+ redirectUri: credentials.redirectUri
});
} else {
res.send('oauth2.error.no-credentials');
@@ -301,11 +301,11 @@ module.exports = function (RED) {
RED.httpAdmin.get('/oauth2/redirect', function (req, res) {
if (req.query.code) {
const state = req.query.state.split(':');
- const node_id = state[0];
- const credentials = RED.nodes.getCredentials(node_id);
+ const nodeId = state[0];
+ const credentials = RED.nodes.getCredentials(nodeId);
if (credentials) {
credentials.code = req.query.code;
- RED.nodes.addCredentials(node_id, credentials);
+ RED.nodes.addCredentials(nodeId, credentials);
const html = `