From 19639aba2b8b14e8faa2f12a68f76acd57476361 Mon Sep 17 00:00:00 2001 From: Lucian Hontau Date: Fri, 16 Oct 2015 13:34:05 -0400 Subject: [PATCH] Make client secret optional, depending on grant type. --- lib/swagger-oauth.js | 12 ++++++++---- src/main/html/index.html | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/swagger-oauth.js b/lib/swagger-oauth.js index 214a3b9a..fd045400 100644 --- a/lib/swagger-oauth.js +++ b/lib/swagger-oauth.js @@ -185,7 +185,7 @@ function initOAuth(opts) { popupMask = (o.popupMask||$('#api-common-mask')); popupDialog = (o.popupDialog||$('.api-popup-dialog')); clientId = (o.clientId||errors.push('missing client id')); - clientSecret = (o.clientSecret||errors.push('missing client secret')); + clientSecret = (o.clientSecret||null); realm = (o.realm||errors.push('missing realm')); if(errors.length > 0){ @@ -208,11 +208,15 @@ function initOAuth(opts) { window.processOAuthCode = function processOAuthCode(data) { var params = { 'client_id': clientId, - 'client_secret': clientSecret, 'code': data.code, 'grant_type': 'authorization_code', 'redirect_uri': redirect_uri + }; + + if (clientSecret) { + params.client_secret = clientSecret; } + $.ajax( { url : window.swaggerUi.tokenUrl, @@ -227,7 +231,7 @@ window.processOAuthCode = function processOAuthCode(data) { onOAuthComplete(""); } }); -} +}; window.onOAuthComplete = function onOAuthComplete(token) { if(token) { @@ -284,4 +288,4 @@ window.onOAuthComplete = function onOAuthComplete(token) { } } } -} +}; diff --git a/src/main/html/index.html b/src/main/html/index.html index a7ae94d4..c02ab467 100644 --- a/src/main/html/index.html +++ b/src/main/html/index.html @@ -37,7 +37,7 @@ if(typeof initOAuth == "function") { initOAuth({ clientId: "your-client-id", - clientSecret: "your-client-secret", + clientSecret: "your-client-secret-if-required", realm: "your-realms", appName: "your-app-name" });