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

fix: read iam client id and secret from environment variables #30

Merged
merged 2 commits into from
Jun 23, 2019
Merged

fix: read iam client id and secret from environment variables #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac6ae16
fix: read iam client id and secret from environment variables
dpopp07 Jun 22, 2019
704f55e
build: update vulnerable dependency
dpopp07 Jun 22, 2019
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
12 changes: 12 additions & 0 deletions lib/base_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ export interface Credentials {
iam_access_token?: string;
iam_apikey?: string;
iam_url?: string;
iam_client_id?: string;
iam_client_secret?: string;
authentication_type?: string;
}

Expand Down Expand Up @@ -243,6 +245,12 @@ export class BaseService {
if (this._options.iam_url) {
credentials.iam_url = this._options.iam_url;
}
if (this._options.iam_client_id) {
credentials.iam_client_id = this._options.iam_client_id;
}
if (this._options.iam_client_secret) {
credentials.iam_client_secret = this._options.iam_client_secret;
}
if (this._options.icp4d_access_token) {
credentials.icp4d_access_token = this._options.icp4d_access_token;
}
Expand Down Expand Up @@ -421,6 +429,8 @@ export class BaseService {
const iamAccessToken: string = envObj[`${_name}_IAM_ACCESS_TOKEN`] || envObj[`${nameWithUnderscore}_IAM_ACCESS_TOKEN`];
const iamApiKey: string = envObj[`${_name}_IAM_APIKEY`] || envObj[`${nameWithUnderscore}_IAM_APIKEY`];
const iamUrl: string = envObj[`${_name}_IAM_URL`] || envObj[`${nameWithUnderscore}_IAM_URL`];
const iamClientId: string = envObj[`${_name}_IAM_CLIENT_ID`] || envObj[`${_name}_IAM_CLIENT_ID`];
const iamClientSecret: string = envObj[`${_name}_IAM_CLIENT_SECRET`] || envObj[`${_name}_IAM_CLIENT_SECRET`];
const icp4dAccessToken: string = envObj[`${_name}_ICP4D_ACCESS_TOKEN`] || envObj[`${nameWithUnderscore}_ICP4D_ACCESS_TOKEN`];
const icp4dUrl: string = envObj[`${_name}_ICP4D_URL`] || envObj[`${nameWithUnderscore}_ICP4D_URL`];
const authenticationType: string = envObj[`${_name}_AUTHENTICATION_TYPE`] || envObj[`${nameWithUnderscore}_AUTHENTICATION_TYPE`];
Expand All @@ -432,6 +442,8 @@ export class BaseService {
iam_access_token: iamAccessToken,
iam_apikey: iamApiKey,
iam_url: iamUrl,
iam_client_id: iamClientId,
iam_client_secret: iamClientSecret,
icp4d_access_token: icp4dAccessToken,
icp4d_url: icp4dUrl,
authentication_type: authenticationType,
Expand Down
Loading