Skip to content
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

support custom headers init and in request #191

Merged
merged 1 commit into from
Sep 30, 2024
Merged

support custom headers init and in request #191

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
7 changes: 7 additions & 0 deletions src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
options.setCookie = opt.setCookie || setCookie;
options.getCart = opt.getCart;
options.updateCart = opt.updateCart;
options.headers = opt.headers || {};

utils.setOptions(options);
},

Expand Down Expand Up @@ -129,6 +131,10 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
const allOptions = {
...options,
...opt,
headers: {
...options.headers,
...(opt ? opt.headers : undefined),
},
};

const session = allOptions.session || allOptions.getCookie('swell-session');
Expand Down Expand Up @@ -164,6 +170,7 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
}

const reqHeaders = {
...(allOptions.headers || undefined),
Accept: 'application/json',
'Content-Type': 'application/json',
Authorization: `Basic ${utils.base64Encode(String(allOptions.key))}`,
Expand Down
82 changes: 46 additions & 36 deletions src/api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,54 +8,41 @@ describe('api', () => {
describe('auth', () => {
it('should call init() for backward compatibility', () => {
api.auth('test1', 'pk_test1');
expect(api.options).toEqual({
previewContent: false,
store: 'test1',
key: 'pk_test1',
timeout: 20000,
url: 'https://test1.swell.store',
vaultUrl: 'https://vault.schema.io',
useCamelCase: false,
api: api.options.api,
setCookie: api.options.setCookie,
getCookie: api.options.getCookie,
});
expect(api.options.previewContent).toEqual(false);
expect(api.options.store).toEqual('test1');
expect(api.options.key).toEqual('pk_test1');
expect(api.options.timeout).toEqual(20000);
expect(api.options.url).toEqual('https://test1.swell.store');
expect(api.options.vaultUrl).toEqual('https://vault.schema.io');
expect(api.options.useCamelCase).toEqual(false);
expect(api.options.api).toBeDefined();
expect(api.options.setCookie).toBeDefined();
expect(api.options.getCookie).toBeDefined();
});
});

describe('init', () => {
it('should set options', () => {
api.init('test1', 'pk_test1');
expect(api.options).toEqual({
previewContent: false,
store: 'test1',
key: 'pk_test1',
timeout: 20000,
url: 'https://test1.swell.store',
vaultUrl: 'https://vault.schema.io',
useCamelCase: false,
api: api.options.api,
setCookie: api.options.setCookie,
getCookie: api.options.getCookie,
});
expect(api.options.previewContent).toEqual(false);
expect(api.options.store).toEqual('test1');
expect(api.options.key).toEqual('pk_test1');
expect(api.options.timeout).toEqual(20000);
expect(api.options.url).toEqual('https://test1.swell.store');
expect(api.options.vaultUrl).toEqual('https://vault.schema.io');
expect(api.options.useCamelCase).toEqual(false);
expect(api.options.api).toBeDefined();
expect(api.options.setCookie).toBeDefined();
expect(api.options.getCookie).toBeDefined();
});

it('should set url from options', () => {
api.init('test2', 'pk_test2', {
url: 'https://www.test2.com',
});
expect(api.options).toEqual({
previewContent: false,
store: 'test2',
key: 'pk_test2',
timeout: 20000,
url: 'https://www.test2.com',
vaultUrl: 'https://vault.schema.io',
useCamelCase: false,
api: api.options.api,
setCookie: api.options.setCookie,
getCookie: api.options.getCookie,
});
expect(api.options.store).toEqual('test2');
expect(api.options.key).toEqual('pk_test2');
expect(api.options.url).toEqual('https://www.test2.com');
});
});

Expand All @@ -71,6 +58,29 @@ describe('api', () => {
});
});

it('should make a fetch request with custom header options', async () => {
api.init('test', 'pk_test', {
headers: {
'X-Test-1a': 'foo',
'X-Test-2a': 'bar',
},
});
await api.request('get', '/test', undefined, undefined, {
headers: {
'X-Test-1b': 'foo',
'X-Test-2b': 'bar',
},
});

expect(fetch.mock.calls.length).toEqual(1);
expect(fetch.mock.calls[0][1].headers).toMatchObject({
'X-Test-1a': 'foo',
'X-Test-2a': 'bar',
'X-Test-1b': 'foo',
'X-Test-2b': 'bar',
});
});

it('should make a fetch request without credentials', async () => {
await api.request('get', '/test');

Expand Down
Loading