Skip to content

Commit 2247d0a

Browse files
authored
fix: read iam client id and secret from environment variables (#30)
* fix: read iam client id and secret from environment variables * build: update vulnerable dependency
1 parent 018c075 commit 2247d0a

File tree

4 files changed

+192
-119
lines changed

4 files changed

+192
-119
lines changed

lib/base_service.ts

+12
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ export interface Credentials {
6363
iam_access_token?: string;
6464
iam_apikey?: string;
6565
iam_url?: string;
66+
iam_client_id?: string;
67+
iam_client_secret?: string;
6668
authentication_type?: string;
6769
}
6870

@@ -243,6 +245,12 @@ export class BaseService {
243245
if (this._options.iam_url) {
244246
credentials.iam_url = this._options.iam_url;
245247
}
248+
if (this._options.iam_client_id) {
249+
credentials.iam_client_id = this._options.iam_client_id;
250+
}
251+
if (this._options.iam_client_secret) {
252+
credentials.iam_client_secret = this._options.iam_client_secret;
253+
}
246254
if (this._options.icp4d_access_token) {
247255
credentials.icp4d_access_token = this._options.icp4d_access_token;
248256
}
@@ -421,6 +429,8 @@ export class BaseService {
421429
const iamAccessToken: string = envObj[`${_name}_IAM_ACCESS_TOKEN`] || envObj[`${nameWithUnderscore}_IAM_ACCESS_TOKEN`];
422430
const iamApiKey: string = envObj[`${_name}_IAM_APIKEY`] || envObj[`${nameWithUnderscore}_IAM_APIKEY`];
423431
const iamUrl: string = envObj[`${_name}_IAM_URL`] || envObj[`${nameWithUnderscore}_IAM_URL`];
432+
const iamClientId: string = envObj[`${_name}_IAM_CLIENT_ID`] || envObj[`${_name}_IAM_CLIENT_ID`];
433+
const iamClientSecret: string = envObj[`${_name}_IAM_CLIENT_SECRET`] || envObj[`${_name}_IAM_CLIENT_SECRET`];
424434
const icp4dAccessToken: string = envObj[`${_name}_ICP4D_ACCESS_TOKEN`] || envObj[`${nameWithUnderscore}_ICP4D_ACCESS_TOKEN`];
425435
const icp4dUrl: string = envObj[`${_name}_ICP4D_URL`] || envObj[`${nameWithUnderscore}_ICP4D_URL`];
426436
const authenticationType: string = envObj[`${_name}_AUTHENTICATION_TYPE`] || envObj[`${nameWithUnderscore}_AUTHENTICATION_TYPE`];
@@ -432,6 +442,8 @@ export class BaseService {
432442
iam_access_token: iamAccessToken,
433443
iam_apikey: iamApiKey,
434444
iam_url: iamUrl,
445+
iam_client_id: iamClientId,
446+
iam_client_secret: iamClientSecret,
435447
icp4d_access_token: icp4dAccessToken,
436448
icp4d_url: icp4dUrl,
437449
authentication_type: authenticationType,

0 commit comments

Comments
 (0)