Skip to content

chore(datafile manager): Fix lint and formatting #500

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
mjc1283 merged 1 commit into from
Jun 5, 2020
Merged

chore(datafile manager): Fix lint and formatting #500

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
9 changes: 6 additions & 3 deletions packages/datafile-manager/__test__/nodeDatafileManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ describe('nodeDatafileManager', () => {
});
manager.start();
expect(makeGetRequestSpy).toBeCalledTimes(1);
expect(makeGetRequestSpy).toBeCalledWith('https://config.optimizely.com/datafiles/auth/1234.json', expect.anything());
expect(makeGetRequestSpy).toBeCalledWith(
'https://config.optimizely.com/datafiles/auth/1234.json',
expect.anything()
);
await manager.stop();
});

Expand Down Expand Up @@ -157,7 +160,7 @@ describe('nodeDatafileManager', () => {
});
manager.start();
expect(makeGetRequestSpy).toBeCalledTimes(1);
expect(makeGetRequestSpy).toBeCalledWith(expect.anything(), { 'Authorization': 'Bearer abcdefgh'});
expect(makeGetRequestSpy).toBeCalledWith(expect.anything(), { Authorization: 'Bearer abcdefgh' });
await manager.stop();
});

Expand All @@ -173,7 +176,7 @@ describe('nodeDatafileManager', () => {
const manager = new NodeDatafileManager({
sdkKey: '1234',
datafileAccessToken: 'abcdefgh',
urlTemplate: 'https://myawesomeurl/'
urlTemplate: 'https://myawesomeurl/',
});
manager.start();
expect(makeGetRequestSpy).toBeCalledTimes(1);
Expand Down
15 changes: 4 additions & 11 deletions packages/datafile-manager/src/nodeDatafileManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,25 @@ import { getLogger } from '@optimizely/js-sdk-logging';
import { makeGetRequest } from './nodeRequest';
import HttpPollingDatafileManager from './httpPollingDatafileManager';
import { Headers, AbortableRequest } from './http';
import {
NodeDatafileManagerConfig,
DatafileManagerConfig,
} from './datafileManager';
import {
DEFAULT_URL_TEMPLATE,
DEFAULT_AUTHENTICATED_URL_TEMPLATE,
} from './config';
import { NodeDatafileManagerConfig, DatafileManagerConfig } from './datafileManager';
import { DEFAULT_URL_TEMPLATE, DEFAULT_AUTHENTICATED_URL_TEMPLATE } from './config';

const logger = getLogger('NodeDatafileManager');

export default class NodeDatafileManager extends HttpPollingDatafileManager {

private accessToken?: string;

constructor(config: NodeDatafileManagerConfig) {
const defaultUrlTemplate = config.datafileAccessToken ? DEFAULT_AUTHENTICATED_URL_TEMPLATE : DEFAULT_URL_TEMPLATE;
super({
... config,
...config,
urlTemplate: config.urlTemplate || defaultUrlTemplate,
});
this.accessToken = config.datafileAccessToken;
}

protected makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
let requestHeaders = Object.assign({}, headers);
const requestHeaders = Object.assign({}, headers);
if (this.accessToken) {
logger.debug('Adding Authorization header with Bearer Token');
requestHeaders['Authorization'] = `Bearer ${this.accessToken}`;
Expand Down