fix(http): let client decide http(s) version to use

Qlever-LLC · Feb 12, 2023 · 3575c31 · 3575c31
1 parent 6904757
commit 3575c31
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -27,13 +27,6 @@ const config = convict({
       env: 'DOMAIN',
       arg: 'domain',
     },
-    mode: {
-      doc: 'Specific HTTP or HTTPS for OADA API connection',
-      format: ['http', 'https'],
-      default: 'https' as 'http' | 'https',
-      env: 'HTTP_MODE',
-      arg: 'mode',
-    },
     token: {
       doc: 'OADA API token',
       format: Array,

diff --git a/src/index.ts b/src/index.ts
@@ -36,7 +36,6 @@ const fatal = debug('unfisk:fatal');
 
 // Tolerant of https or not https on domain
 const domain = config.get('oada.domain').replace(/^https?:\/\//, '');
-const mode = config.get('oada.mode');
 const tokens = config.get('oada.token');
 const flat = config.get('lists.flat');
 const unflat = config.get('lists.unflat'); // Day-index will be added to this
@@ -51,7 +50,7 @@ async function unfisk(token: string) {
   // Connect to the OADA API
   const conn = oada
     ? oada.clone(token)
-    : (oada = await connect({ token, domain: `${mode}://${domain}` }));
+    : (oada = await connect({ token, domain }));
 
   await ensureAllPathsExist(conn);
 

diff --git a/test/external.test.ts b/test/external.test.ts
@@ -29,16 +29,15 @@ import testasn from './testasn.js';
 
 // DO NOT include ../ because we are testing externally.
 
-const domain = config.get('oada.domain').replace(/^https?:\/\//, '');
-const mode = config.get('oada.mode');
+const domain = config.get('oada.domain');
 const token = config.get('oada.token')[0]!;
 
 const asnKey = 'UNFISK_TEST_ASN1';
 const asnID = `resources/${asnKey}`;
 
 let conn: OADAClient;
 test.before(async () => {
-  conn = await connect({ token, domain: `${mode}://${domain}` });
+  conn = await connect({ token, domain });
 });
 
 test.after(async () => {