fix: only token, api key or user/pass can be set at once

Author: Daniele Briggi

lib/drivers/utilities.js

@@ -203,17 +203,10 @@ function parseconnectionstring(connectionstring) {
         const config = Object.assign(Object.assign({}, options), { username: decodeURIComponent(url.username), password: decodeURIComponent(url.password), password_hashed: options.password_hashed ? parseBoolean(options.password_hashed) : undefined, host: url.hostname, 
             // type cast values
             port: url.port ? parseInt(url.port) : undefined, insecure: options.insecure ? parseBoolean(options.insecure) : undefined, timeout: options.timeout ? parseInt(options.timeout) : undefined, zerotext: options.zerotext ? parseBoolean(options.zerotext) : undefined, create: options.create ? parseBoolean(options.create) : undefined, memory: options.memory ? parseBoolean(options.memory) : undefined, compression: options.compression ? parseBoolean(options.compression) : undefined, non_linearizable: options.non_linearizable ? parseBoolean(options.non_linearizable) : undefined, noblob: options.noblob ? parseBoolean(options.noblob) : undefined, maxdata: options.maxdata ? parseInt(options.maxdata) : undefined, maxrows: options.maxrows ? parseInt(options.maxrows) : undefined, maxrowset: options.maxrowset ? parseInt(options.maxrowset) : undefined, usewebsocket: options.usewebsocket ? parseBoolean(options.usewebsocket) : undefined, verbose: options.verbose ? parseBoolean(options.verbose) : undefined });
-        // either you use an apikey or username and password
-        if (config.apikey) {
-            if (config.token) {
-                console.error('SQLiteCloudConnection.parseconnectionstring - apikey and token cannot be both specified');
-                throw new types_1.SQLiteCloudError('apikey and token cannot be both specified');
-            }
-            if (config.username || config.password) {
-                console.warn('SQLiteCloudConnection.parseconnectionstring - apikey and username/password are both specified, using apikey');
-            }
-            delete config.username;
-            delete config.password;
+        // either you use an apikey, token or username and password
+        if (Number(!!config.apikey) + Number(!!config.token) + Number(!!(config.username || config.password)) > 1) {
+            console.error('SQLiteCloudConnection.parseconnectionstring - choose between apikey, token or username/password');
+            throw new types_1.SQLiteCloudError('Choose between apikey, token or username/password');
         }
         const database = url.pathname.replace('/', ''); // pathname is database name, remove the leading slash
         if (database) {

lib/sqlitecloud.drivers.dev.js

@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.492",
+  "version": "1.0.493",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

lib/sqlitecloud.drivers.js

@@ -82,7 +82,7 @@ export function getInitializationCommands(config: SQLiteCloudConfig): string {
     }
     commands += `USE DATABASE ${config.database};`
   }
-  
+
   return commands
 }
 
@@ -244,17 +244,10 @@ export function parseconnectionstring(connectionstring: string): SQLiteCloudConf
       verbose: options.verbose ? parseBoolean(options.verbose) : undefined
     }
 
-    // either you use an apikey or username and password
-    if (config.apikey) {
-      if (config.token) {
-        console.error('SQLiteCloudConnection.parseconnectionstring - apikey and token cannot be both specified')
-        throw new SQLiteCloudError('apikey and token cannot be both specified')
-      }
-      if (config.username || config.password) {
-        console.warn('SQLiteCloudConnection.parseconnectionstring - apikey and username/password are both specified, using apikey')
-      }
-      delete config.username
-      delete config.password
+    // either you use an apikey, token or username and password
+    if (Number(!!config.apikey) + Number(!!config.token) + Number(!!(config.username || config.password)) > 1) {
+      console.error('SQLiteCloudConnection.parseconnectionstring - choose between apikey, token or username/password')
+      throw new SQLiteCloudError('Choose between apikey, token or username/password')
     }
 
     const database = url.pathname.replace('/', '') // pathname is database name, remove the leading slash

package.json

@@ -162,6 +162,21 @@ describe('parseconnectionstring', () => {
 
     expect(config.timeout).toBe(123)
   })
+
+  it('expect error when both user/pass and api key are set', () => {
+    const connectionstring = 'sqlitecloud://user:password@host:1234/database?apikey=yyy'
+    expect(() => parseconnectionstring(connectionstring)).toThrowError('Choose between apikey, token or username/password')
+  })
+
+  it('expect error when both user/pass and token are set', () => {
+    const connectionstring = 'sqlitecloud://user:password@host:1234/database?token=yyy'
+    expect(() => parseconnectionstring(connectionstring)).toThrowError('Choose between apikey, token or username/password')
+  })
+
+  it('expect error when both apikey and token are set', () => {
+    const connectionstring = 'sqlitecloud://host:1234/database?apikey=xxx&token=yyy'
+    expect(() => parseconnectionstring(connectionstring)).toThrowError('Choose between apikey, token or username/password')
+  })
 })
 
 describe('getTestingDatabaseName', () => {