Skip to content

Commit 6e8284f

Browse files
authored
Merge pull request #1 from 7elephants/configure-scheme
Configurable scheme
2 parents a4b985f + 268cda5 commit 6e8284f

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quickbase",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"description": "A lightweight, typed, promise-based Quickbase API, autogenerated from the OpenAPI spec",
55
"keywords": [
66
"QuickBase",
@@ -22,7 +22,11 @@
2222
"email": "[email protected]"
2323
},
2424
"maintainers": [],
25-
"contributors": [],
25+
"contributors": [{
26+
"name": "Andrew Steiger",
27+
"email": "[email protected]",
28+
"url": "https://github.com/7elephants"
29+
}],
2630
"main": "./dist/quickbase.js",
2731
"types": "./dist/quickbase.d.ts",
2832
"repository": {

src/code-generation/base.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ export class QuickBase {
147147
* The default settings of a `QuickBase` instance
148148
*/
149149
static defaults: Required<QuickBaseOptions> = {
150+
scheme: 'https',
150151
server: 'api.quickbase.com',
151152
version: 'v1',
152153
realm: IS_BROWSER ? window.location.host.split('.')[0] : '',
@@ -215,7 +216,7 @@ export class QuickBase {
215216
private getBaseRequest(){
216217
return {
217218
method: 'GET',
218-
baseURL: `https://${this.settings.server}/${this.settings.version}`,
219+
baseURL: `${this.settings.scheme}://${this.settings.server}/${this.settings.version}`,
219220
headers: {
220221
'Content-Type': 'application/json; charset=UTF-8',
221222
[IS_BROWSER ? 'X-User-Agent' : 'User-Agent']: `${this.settings.userAgent} node-quickbase/v${VERSION} ${IS_BROWSER ? (window.navigator ? window.navigator.userAgent : '') : 'nodejs/' + process.version}`.trim(),
@@ -393,6 +394,13 @@ export class QuickBase {
393394

394395
/* Types */
395396
export type QuickBaseOptions = Partial<{
397+
/**
398+
* Quickbase API Server scheme
399+
*
400+
* Default is `https`
401+
*/
402+
scheme: string;
403+
396404
/**
397405
* Quickbase API Server FQDN
398406
*

src/quickbase.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ export class QuickBase {
148148
* The default settings of a `QuickBase` instance
149149
*/
150150
static defaults: Required<QuickBaseOptions> = {
151+
scheme: 'https',
151152
server: 'api.quickbase.com',
152153
version: 'v1',
153154
realm: IS_BROWSER ? window.location.host.split('.')[0] : '',
@@ -216,7 +217,7 @@ export class QuickBase {
216217
private getBaseRequest(){
217218
return {
218219
method: 'GET',
219-
baseURL: `https://${this.settings.server}/${this.settings.version}`,
220+
baseURL: `${this.settings.scheme}://${this.settings.server}/${this.settings.version}`,
220221
headers: {
221222
'Content-Type': 'application/json; charset=UTF-8',
222223
[IS_BROWSER ? 'X-User-Agent' : 'User-Agent']: `${this.settings.userAgent} node-quickbase/v${VERSION} ${IS_BROWSER ? (window.navigator ? window.navigator.userAgent : '') : 'nodejs/' + process.version}`.trim(),
@@ -1945,6 +1946,13 @@ export class QuickBase {
19451946

19461947
/* Types */
19471948
export type QuickBaseOptions = Partial<{
1949+
/**
1950+
* Quickbase API Server scheme
1951+
*
1952+
* Default is `https`
1953+
*/
1954+
scheme: string;
1955+
19481956
/**
19491957
* Quickbase API Server FQDN
19501958
*

src/tests/quickbase.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const TEST_UTF_16 = process.env.TEST_UTF_16 === 'true';
2020
const TEST_FILE = process.env.TEST_FILE === 'true';
2121

2222
const qbOptions: QuickBaseOptions = {
23+
scheme: 'https',
2324
server: 'api.quickbase.com',
2425
version: 'v1',
2526

0 commit comments

Comments
 (0)