Skip to content

Remove botid header from directlinejs #296

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

Merged
swagatmishra2007 merged 1 commit into from
Jul 27, 2020
Merged

Remove botid header from directlinejs #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 0 additions & 44 deletions src/directLine.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,48 +241,4 @@ describe('MockSuite', () => {
expect(actualError.status).toStrictEqual(429);
expect(endTime - startTime).toStrictEqual(10);
});

test('SendDebugHeader', () => {
let expectedBotId:string;
const actual = 'botid';
services.ajax = DirectLineMock.mockAjax(server, (urlOrRequest) => {
if(typeof urlOrRequest === 'string'){
throw new Error();
}

if(urlOrRequest.url && urlOrRequest.url.indexOf(server.conversation.conversationId)>0){
const response: Partial<AjaxResponse> = {
response: {id:'blah'},
status: 200
};
expectedBotId = urlOrRequest.headers['x-ms-bot-id'];
return response as AjaxResponse;
}
else if(urlOrRequest.url && urlOrRequest.url.indexOf('/conversations') > 0){
// start conversation
const response: Partial<AjaxResponse> = {
response: server.conversation,
status: 201,
xhr: {
getResponseHeader: (name) => actual
} as XMLHttpRequest
};
return response as AjaxResponse;
}
throw new Error();
});
directline = new DirectLineExport.DirectLine(services);
const scenario = function* (): IterableIterator<Observable<unknown>> {
yield Observable.timer(200, scheduler);
yield directline.postActivity(expected.x).catch(() => Observable.empty(scheduler));
};

// lack of subscribe arguments means that the empty subscriber is used
// the empty subscriber will propagate observable errors on the JS call stack
// within the scheduler notification action handling loop because of the observeOn
subscriptions.push(lazyConcat(scenario()).observeOn(scheduler).subscribe());
scheduler.flush();

expect(expectedBotId).toBe(actual);
});
});
19 changes: 5 additions & 14 deletions src/directLine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ export class DirectLine implements IBotConnection {
private services: Services;
private _userAgent: string;
public referenceGrammarId: string;
private botIdHeader: string;
private timeout = 20 * 1000;
private retries: number;

Expand Down Expand Up @@ -627,15 +626,7 @@ export class DirectLine implements IBotConnection {
}
})
// .do(ajaxResponse => konsole.log("conversation ajaxResponse", ajaxResponse.response))
.map(ajaxResponse => {
try{
if(!this.botIdHeader ){
this.botIdHeader = ajaxResponse.xhr.getResponseHeader('x-ms-bot-id');
}
}
catch{/*don't care if the above throws for any reason*/}
return ajaxResponse.response as Conversation;
})
.map(ajaxResponse => ajaxResponse.response as Conversation)
.retryWhen(error$ =>
// for now we deem 4xx and 5xx errors as unrecoverable
// for everything else (timeouts), retry for a while
Expand Down Expand Up @@ -992,10 +983,10 @@ export class DirectLine implements IBotConnection {
}

private commonHeaders() {
return Object.assign({
"Authorization": `Bearer ${this.token}`,
"x-ms-bot-agent": this._botAgent
}, this.botIdHeader ? {'x-ms-bot-id': this.botIdHeader}: null);
return {
"Authorization": `Bearer ${this.token}`,
"x-ms-bot-agent": this._botAgent
};
}

private getBotAgent(customAgent: string = ''): string {
Expand Down