Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CL-16691: Support Okta Access token #148

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

CL-16691: Support Okta Access token #148

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3d86935
CL-16691: Support Okta Access token
vyerawar Jun 15, 2022
5728b6e
CL-16691: Based on flag is_okta_token using Gateway url
vyerawar Jun 15, 2022
254f273
CL-16691: Space before comment
vyerawar Jun 15, 2022
4844baa
CL-16691: BaseUrl updated in createMethod file
vyerawar Jun 16, 2022
dfe2e5a
CL-16691: Added comment
vyerawar Jun 21, 2022
f30bf59
CL-16691: Fixed base url issue
vyerawar Jun 22, 2022
e26d2fa
Yarn & CA changes
ESoch Jul 12, 2022
2ac38a0
Update package name
ESoch Jul 12, 2022
0769294
CL-16691: Config param name change
vyerawar Sep 19, 2022
0539770
Merge pull request #1 from vyerawar/CL-16691-Ethan
vyerawar Sep 19, 2022
a4efe8c
v3.2.2
vyerawar Sep 19, 2022
9f95c25
v3.2.3
vyerawar Sep 19, 2022
e6a5db8
Merge pull request #3 from vyerawar/CL-16691
vyerawar Sep 19, 2022
dd9f1a2
Merge branch 'master' of github.com:vyerawar/classy-node into CL-16691
vyerawar Sep 19, 2022
65c9a91
CL-16691: Updated code with master
vyerawar Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Classy/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ class Classy {
DEFAULT_STRICT_SSL
);

this.oktaBaseUrl = (
!_.isUndefined(config.oktaBaseUrl) ?
config.oktaBaseUrl :
''
);

/**
* Add the ability to define an error logger.
*
Expand Down
4 changes: 2 additions & 2 deletions src/ClassyResource/_makeRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { utils } from '../utils';
* @param {object} form Request form (optional)
* @return {promise} Promise based on API request
*/
export default function _makeRequest(path, method, headers = {}, form, data = {}) {
export default function _makeRequest(path, method, headers = {}, form, data = {}, baseUrl = null) {
let forceQs = null;

if (data.noLog) {
Expand All @@ -32,7 +32,7 @@ export default function _makeRequest(path, method, headers = {}, form, data = {}
: undefined;

const requestParams = {
baseUrl: this.baseUrl,
baseUrl: baseUrl ? baseUrl : this.baseUrl,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this.baseUrl get set? I'd prefer that we update that value in the appropriate place if config.oktaBaseUrl is passed in.

Copy link
Author

@vyerawar vyerawar Jun 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.baseUrl is set in src/ClassyResource/main.js. In that we are not getting request payload to check is_okta_token flag.
I am removing this change from here and updating the this.baseUrl value in src/ClassyResource/createMethod.js file. I have updated the code, please review.

uri: path,
method: method,
headers: headers,
Expand Down
9 changes: 8 additions & 1 deletion src/ClassyResource/createMethod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,19 @@ export default function createMethod(spec) {
}

if (response === 'member') {

let baseUrl = this._classy.baseUrl;
// Gateway url to support okta based member token
if (_.get(data, 'token.is_okta_token', false)) {
baseUrl = this._classy.oktaBaseUrl;
}

const memberToken = _.get(data, 'token.access_token', false);
delete data.token;

requestHeaders.Authorization = 'Bearer ' + memberToken;

return this._makeRequest(requestPath, requestMethod, requestHeaders, form, data);
return this._makeRequest(requestPath, requestMethod, requestHeaders, form, data, baseUrl);
}

}, (error) => {
Expand Down