Update error messages for external authentication in Thin mode and the corresponding test cases

Author: sharadraju

lib/errors.js

@@ -134,6 +134,7 @@ const ERR_INVALID_COLL_INDEX_GET = 132;
 const ERR_DELETE_ELEMENTS_OF_VARRAY = 133;
 const ERR_WRONG_VALUE_FOR_DBOBJECT_ATTR = 134;
 const ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM = 135;
+const ERR_WRONG_CRED_FOR_EXTAUTH = 136;
 
 // Oracle Net layer errors start from 500
 const ERR_CONNECTION_CLOSED = 500;
@@ -387,6 +388,8 @@ messages.set(ERR_WRONG_VALUE_FOR_DBOBJECT_ATTR,         // NJS-134
   'value is of wrong type for attribute %s of object %s');
 messages.set(ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM,         // NJS-135
   'value is of wrong type for an element of object %s');
+messages.set(ERR_WRONG_CRED_FOR_EXTAUTH,                // NJS-136
+  'user name and password cannot be set when using external authentication');
 
 // Oracle Net layer errors
 
@@ -755,6 +758,7 @@ module.exports = {
   ERR_DELETE_ELEMENTS_OF_VARRAY,
   ERR_WRONG_VALUE_FOR_DBOBJECT_ATTR,
   ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM,
+  ERR_WRONG_CRED_FOR_EXTAUTH,
   ERR_CONNECTION_CLOSED_CODE: `${ERR_PREFIX}-${ERR_CONNECTION_CLOSED}`,
   assert,
   assertArgCount,

lib/oracledb.js

@@ -486,6 +486,11 @@ async function _verifyOptions(options, inCreatePool) {
 
   }
 
+  // Check external Auth config
+  if (outOptions.token === undefined && outOptions.externalAuth && (outOptions.user || outOptions.password)) {
+    errors.throwErr(errors.ERR_WRONG_CRED_FOR_EXTAUTH);
+  }
+
   return outOptions;
 }
 

lib/thin/pool.js

@@ -41,7 +41,7 @@ class ThinPoolImpl extends PoolImpl {
 
   _init(params) {
     if (!params.homogeneous) {
-      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'Heterogeneous Pool');
+      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'Heterogeneous Pooling');
     }
     thinUtil.checkCredentials(params);
 

lib/thin/util.js

@@ -268,12 +268,12 @@ function checkProxyUserValidity(userName) {
 //---------------------------------------------------------------------------
 function checkCredentials(params) {
   if (params.token === undefined) {
+    if (params.externalAuth === true) {
+      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'External Authentication');
+    }
     if (params.password === undefined) {
       errors.throwErr(errors.ERR_MISSING_CREDENTIALS);
     }
-    if (params.externalAuth === true) {
-      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'External Auth');
-    }
   }
 }
 

test/externalAuth.js

@@ -74,8 +74,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // DPI-1032: user and password should not be set when using external authentication
-        /DPI-1032:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
 
     }); // 5.1.2
@@ -92,8 +92,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // ORA-01017: invalid username/password; logon denied
-        /ORA-01017:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
     }); // 5.1.3
 
@@ -109,8 +109,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // DPI-1032: user and password should not be set when using external authentication
-        /DPI-1032:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
     }); // 5.1.4
 
@@ -145,8 +145,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // DPI-1032: user and password should not be set when using external authentication
-        /DPI-1032:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
     }); // 5.1.6
 
@@ -162,8 +162,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // DPI-1032: user and password should not be set when using external authentication
-        /DPI-1032:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
     }); // 5.1.7
 
@@ -179,8 +179,8 @@ const dbConfig = require('./dbconfig.js');
             }
           );
         },
-        // DPI-1032: user and password should not be set when using external authentication
-        /DPI-1032:/
+        // NJS-136: user and password should not be set when using external authentication
+        /NJS-136:/
       );
     }); // 5.1.8
 

test/externalProxyAuth.js

@@ -214,7 +214,7 @@ describe('180. externalProxyAuth.js', function() {
             externalAuth: true,
           });
         },
-        /DPI-1032:/
+        /NJS-136:/
       );
     });
 
@@ -230,7 +230,7 @@ describe('180. externalProxyAuth.js', function() {
             externalAuth: true,
           });
         },
-        /DPI-1032:/
+        /NJS-136:/
       );
     });
 

test/pool.js

@@ -751,7 +751,7 @@ describe('2. pool.js', function() {
       } else {
         await assert.rejects(
           async () => await oracledb.createPool(config),
-          /NJS-101:/
+          /NJS-089:/
         );
       }
     });  // 2.15.7
@@ -854,7 +854,7 @@ describe('2. pool.js', function() {
       } else {
         await assert.rejects(
           async () => await oracledb.createPool(config),
-          /NJS-101:/
+          /NJS-089:/
         );
       }
     });  // 2.15.13
@@ -882,10 +882,23 @@ describe('2. pool.js', function() {
       };
       await assert.rejects(
         async () => await oracledb.createPool(config),
-        /DPI-1032:|NJS-089:/
+        /NJS-136:/
       );
     });  // 2.15.15
 
+    it('2.15.16 empty Credentials', async function() {
+      const config = {
+        connectString: dbConfig.connectString,
+        poolMin:       1,
+        poolMax:       1,
+        poolIncrement: 0,
+      };
+      await assert.rejects(
+        async () => await oracledb.createPool(config),
+        /ORA-24415:|NJS-101:/
+      );
+    });  // 2.15.16
+
   });   // 2.15
 
   describe('2.16 Pool non-configurable properties global/local override', function() {
@@ -1020,7 +1033,7 @@ describe('2. pool.js', function() {
         } else {
           await assert.rejects(
             async () => await oracledb.createPool(config),
-            /NJS-101:/
+            /NJS-089:/
           );
         }
       } finally {