search

Watson-Personal-Assistant / AudioClientSampleCodeJava

Apache License 2.0
1 stars 5 forks source link

adds tenantId as a header to websocket connection #7

Closed troyibm closed 6 years ago

troyibm commented 6 years ago

it has conflicts, so I will merge those in But thanks for the look through @esilky !

esilky commented 6 years ago

It seems like the conflict is that we changed 'IAMAPIKey' to 'iamApiKey' (to conform to Java standards). That should be easy to resolve.

troyibm commented 6 years ago

Actually @esilky, you changed it to iamAPiKey. The middle P is still capital. But don't fix that until after merge this PR. And if you want to do the honors, that's fine with me.

arivatibm commented 6 years ago

@esilky @troyibm please do not merge this code until:

  1. I approve it from an architectural and security perspective (I have a meeting with Jaydeep to discuss it)
  2. Audio Gateway is refactored to support receiving a tenant ID
  3. QA testing is done
esilky commented 6 years ago

I fixed that in my Unit-Test PR. I am in the process of getting that updated with master for review and merge. So, it's fixed, but it shouldn't cause you problems.

esilky commented 6 years ago

@arivatibm I'll let you merge. @erezbi The unit-test PR is updated to pull master into it to resolve the conflicts. That also updates the name mentioned above.

arivatibm commented 6 years ago

I have created my own pull request for this fix that works also with the audio gateway