Skip to content

[PBE-000] fix undefined location #590

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[PBE-000] fix undefined location #590

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dd354e
chore: fix undefined location
xernobyl Dec 21, 2023
0a6b50c
chore: fix type
xernobyl Dec 21, 2023
9f2a3ba
chore: fix length
xernobyl Dec 22, 2023
79b2722
Merge branch 'main' into fix_empty_location
xernobyl Jan 29, 2024
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
22 changes: 15 additions & 7 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class StreamClient<StreamFeedGenerics extends DefaultGenerics = DefaultGe
fayeUrl: string;
group: string;
expireTokens: boolean;
location: string;
location: string | undefined;
fayeClient: Faye.Client<RealTimeMessage<StreamFeedGenerics>> | null;
browser: boolean;
node: boolean;
Expand Down Expand Up @@ -237,7 +237,10 @@ export class StreamClient<StreamFeedGenerics extends DefaultGenerics = DefaultGe
this.subscriptions = {};
this.expireTokens = this.options.expireTokens ? this.options.expireTokens : false;
// which data center to use
this.location = this.options.location as string;
const location = this.options.location as string;
if (location) {
this.location = location;
}
this.baseUrl = this.getBaseUrl();

if (typeof process !== 'undefined') {
Expand Down Expand Up @@ -572,15 +575,20 @@ export class StreamClient<StreamFeedGenerics extends DefaultGenerics = DefaultGe
* @return {axios.AxiosRequestConfig}
*/
enrichKwargs({ method, token, ...kwargs }: AxiosConfig & { method: axios.Method }): axios.AxiosRequestConfig {
const params: Record<string, string> = {
api_key: this.apiKey,
...(kwargs.qs || {}),
};

if (this.group) {
params.location = this.group;
}

return {
method,
url: this.enrichUrl(kwargs.url, kwargs.serviceName),
data: kwargs.body,
params: {
api_key: this.apiKey,
location: this.group,
...(kwargs.qs || {}),
},
params,
headers: {
'X-Stream-Client': this.userAgent(),
'stream-auth-type': 'jwt',
Expand Down