Facing issue to connect etp-server from etp-client and issue while deploying etp-client in openshift

Issue 1:

We were not able to connect to etp-server from etp-client, it seems as per current etp-client code considering both bearer token and basic auth as jwt bearer token, so when basic auth is using to connect to etp-server from etp-client, code is not working properly. We have done the below code changes in a feature branch to address this issue.

1. commit1
2. commit2

Could anyone look into the changes and suggest whether we can merge this changes into the main branch.

Issue 2:

We are also facing issue while deploying the etp-client code into openshift. So, the below changes made into the package.json to address the issue.

1. commit1
2. commit2

Please suggest whether we can made this changes in package.json file in open-etp client.