Merge pull request #3260 from Countly/revert-3225-fix/mongodb-options

ar2rsawseen · web-flow · commit 49432f8da829 · 2022-06-13T21:34:32.000+03:00
Revert "Fix/mongodb options"
diff --git a/api/configextender.js b/api/configextender.js
@@ -26,81 +26,8 @@ const OVERRIDES = {
         REPLSETSERVERS: 'replSetServers',
         REPLICANAME: 'replicaName',
         MAX_POOL_SIZE: 'max_pool_size',
-        DBOPTIONS: {
-            __name: "dbOptions",
-            AUTHMECHANISM: 'authMechanism',
-            AUTHMECHANISMPROPERTIES: 'authMechanismProperties',
-            AUTHSOURCE: 'authSource',
-            AUTOENCRYPTION: 'autoEncryption',
-            BSONREGEXP: 'bsonRegExp',
-            CHECKKEYS: 'checkKeys',
-            CHECKSERVERIDENTITY: 'checkServerIdentity',
-            CONNECTTIMEOUTMS: 'connectTimeoutMS',
-            DIRECTCONNECTION: 'directConnection',
-            DRIVERINFO: 'driverInfo',
-            ECDHCURVE: 'ecdhCurve',
-            ENABLEUTF8VALIDATION: 'enableUtf8Validation',
-            FIELDSASRAW: 'fieldsAsRaw',
-            FORCESERVEROBJECTID: 'forceServerObjectId',
-            HEARTBEATFREQUENCYMS: 'heartbeatFrequencyMS',
-            IGNOREUNDEFINED: 'ignoreUndefined',
-            KEEPALIVE: 'keepAlive',
-            KEEPALIVEINITIALDELAY: 'keepAliveInitialDelay',
-            LOADBALANCED: 'loadBalanced',
-            LOCALADDRESS: 'localAddress',
-            LOCALPORT: 'localPort',
-            LOCALTHRESHOLDMS: 'localThresholdMS',
-            LOGGERLEVEL: 'loggerLevel',
-            MAXIDLETIMEMS: 'maxIdleTimeMS',
-            MAXPOOLSIZE: 'maxPoolSize',
-            MAXSTALENESSSECONDS: 'maxStalenessSeconds',
-            MINDHSIZE: 'minDHSize',
-            MINHEARTBEATFREQUENCYMS: 'minHeartbeatFrequencyMS',
-            MINPOOLSIZE: 'minPoolSize',
-            MONITORCOMMANDS: 'monitorCommands',
-            NODELAY: 'noDelay',
-            PKFACTORY: 'pkFactory',
-            PROMISELIBRARY: 'promiseLibrary',
-            PROMOTEBUFFERS: 'promoteBuffers',
-            PROMOTELONGS: 'promoteLongs',
-            PROMOTEVALUES: 'promoteValues',
-            PROXYHOST: 'proxyHost',
-            PROXYPASSWORD: 'proxyPassword',
-            PROXYPORT: 'proxyPort',
-            PROXYUSERNAME: 'proxyUsername',
-            READCONCERN: 'readConcern',
-            READCONCERNLEVEL: 'readConcernLevel',
-            READPREFERENCE: 'readPreference',
-            READPREFERENCETAGS: 'readPreferenceTags',
-            REJECTUNAUTHORIZED: 'rejectUnauthorized',
-            REPLICASET: 'replicaSet',
-            RETRYREADS: 'retryReads',
-            RETRYWRITES: 'retryWrites',
-            SECURECONTEXT: 'secureContext',
-            SECUREPROTOCOL: 'secureProtocol',
-            SERIALIZEFUNCTIONS: 'serializeFunctions',
-            SERVERAPI: 'serverApi',
-            SERVERSELECTIONTIMEOUTMS: 'serverSelectionTimeoutMS',
-            SOCKETTIMEOUTMS: 'socketTimeoutMS',
-            SRVMAXHOSTS: 'srvMaxHosts',
-            SRVSERVICENAME: 'srvServiceName',
-            SSLCA: 'sslCA',
-            SSLCRL: 'sslCRL',
-            SSLCERT: 'sslCert',
-            SSLKEY: 'sslKey',
-            SSLPASS: 'sslPass',
-            SSLVALIDATE: 'sslValidate',
-            TLSALLOWINVALIDCERTIFICATES: 'tlsAllowInvalidCertificates',
-            TLSALLOWINVALIDHOSTNAMES: 'tlsAllowInvalidHostnames',
-            TLSCAFILE: 'tlsCAFile',
-            TLSCERTIFICATEFILE: 'tlsCertificateFile',
-            TLSCERTIFICATEKEYFILE: 'tlsCertificateKeyFile',
-            TLSCERTIFICATEKEYFILEPASSWORD: 'tlsCertificateKeyFilePassword',
-            TLSINSECURE: 'tlsInsecure',
-            WAITQUEUETIMEOUTMS: 'waitQueueTimeoutMS',
-            WTIMEOUTMS: 'wtimeoutMS',
-            ZLIBCOMPRESSIONLEVEL: 'zlibCompressionLevel',
-        },
+        DBOPTIONS: 'dbOptions',
+        SERVEROPTIONS: 'serverOptions'
     },
 
     API: {
@@ -139,9 +66,6 @@ function dig(config, over, name, value) {
                 sub = over[n];
                 over[n] = {};
             }
-            else if (over[n] && over[n].__name) {
-                sub = over[n].__name;
-            }
             else {
                 sub = Object.keys(config).filter(k => k.toUpperCase() === n)[0];
             }
diff --git a/frontend/express/public/themes/rtl/theme.css b/frontend/express/public/themes/rtl/theme.css
@@ -9,4 +9,5 @@
 .cly-vue-nps-preview .rating-labels .left { float: right !important; }
 .cly-vue-nps-preview .rating-labels .right { float: left !important; }
 .cly-vue-nps-preview .submit-wrapper .submit-button { float: left !important; }
-.cly-vue-nps-preview .submit-wrapper img { float: right !important; }
+.cly-vue-nps-preview .submit-wrapper img { float: right !important; }
+.cly-vue-ratings-preview { direction: rtl; }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "apidoc": "0.51.1",
     "apidoc-template": "github:kanwarujjaval/dash-apidoc-template",
     "argon2": "0.28.5",
-    "async": "3.2.3",
+    "async": "3.2.4",
     "basic-auth": "2.0.1",
     "bluebird": "3.7.2",
     "body-parser": "1.20.0",
@@ -73,7 +73,7 @@
     "method-override": "3.0.0",
     "moment": "2.29.3",
     "moment-timezone": "0.5.34",
-    "mongodb": "4.6.0",
+    "mongodb": "4.7.0",
     "nginx-conf": "1.5.0",
     "node-xlsx-stream": "0.1.8",
     "nodemailer": "6.7.5",
@@ -83,10 +83,10 @@
     "object-hash": "3.0.0",
     "offline-geocoder": "github:iartem/offline-geocoder",
     "properties-parser": "0.3.1",
-    "puppeteer": "14.2.1",
+    "puppeteer": "14.3.0",
     "request": "2.88.2",
-    "sass": "1.52.2",
-    "uglify-js": "3.15.5",
+    "sass": "1.52.3",
+    "uglify-js": "3.16.0",
     "underscore": "1.13.4",
     "yamljs": "0.3.0"
   },
diff --git a/plugins/pluginManager.js b/plugins/pluginManager.js
@@ -1078,12 +1078,8 @@ var pluginManager = function pluginManager() {
             config = config || JSON.parse(JSON.stringify(countlyConfig));
         }
 
-        if (config && typeof config.mongodb === "string") {
-            config.mongodb = {uri: config.mongodb};
-        }
-
-        if (config.mongodb.uri) {
-            var dbName = this.replaceDatabaseString(config.mongodb.uri, db);
+        if (typeof config.mongodb === 'string') {
+            var dbName = this.replaceDatabaseString(config.mongodb, db);
             //remove protocol
             dbName = dbName.split("://").pop();
             if (dbName.indexOf("@") !== -1) {
@@ -1102,11 +1098,17 @@ var pluginManager = function pluginManager() {
                 var qstring = parts[1];
                 if (qstring && qstring.length) {
                     qstring = querystring.parse(qstring);
-                    if (qstring.ssl) {
+                    if (qstring.ssl && (qstring.ssl === true || qstring.ssl === "true")) {
                         ob.ssl = "";
                         ob.sslAllowInvalidCertificates = "";
                         ob.sslAllowInvalidHostnames = "";
                     }
+                    if (qstring.tls && (qstring.tls === true || qstring.tls === "true")) {
+                        ob.tls = "";
+                        ob.tlsAllowInvalidCertificates = "";
+                        ob.tlsAllowInvalidHostnames = "";
+                        ob.tlsInsecure = "";
+                    }
                     if (qstring.replicaSet) {
                         ob.host = qstring.replicaSet + "/" + ob.host;
                     }
@@ -1129,11 +1131,17 @@ var pluginManager = function pluginManager() {
             else {
                 ob.host = (config.mongodb.host + ':' + config.mongodb.port);
             }
-            if (config.mongodb.serverOptions && config.mongodb.serverOptions.ssl) {
+            if (config.mongodb.serverOptions && config.mongodb.serverOptions.ssl && (config.mongodb.serverOptions.ssl === true || config.mongodb.serverOptions.ssl === "true")) {
                 ob.ssl = "";
                 ob.sslAllowInvalidCertificates = "";
                 ob.sslAllowInvalidHostnames = "";
             }
+            if (config.mongodb.serverOptions && config.mongodb.serverOptions.tls && (config.mongodb.serverOptions.tls === true || config.mongodb.serverOptions.tls === "true")) {
+                ob.tls = "";
+                ob.tlsAllowInvalidCertificates = "";
+                ob.tlsAllowInvalidHostnames = "";
+                ob.tlsInsecure = "";
+            }
             if (config.mongodb.username && config.mongodb.password) {
                 ob.username = config.mongodb.username;
                 ob.password = utils.decrypt(config.mongodb.password);
@@ -1156,13 +1164,12 @@ var pluginManager = function pluginManager() {
     * @returns {string} modified connection string
     **/
     this.replaceDatabaseString = function(str, db) {
-        var parts = str.split("?");
-        var i = parts[0].lastIndexOf('/countly');
-        var k = parts[0].lastIndexOf('/' + db);
+        var i = str.lastIndexOf('/countly');
+        var k = str.lastIndexOf('/' + db);
         if (i !== k && i !== -1 && db) {
-            return parts[0].substr(0, i) + "/" + db + parts[0].substr(i + ('/countly').length);
+            return str.substr(0, i) + "/" + db + str.substr(i + ('/countly').length);
         }
-        return parts.join("?");
+        return str;
     };
 
     this.connectToAllDatabases = async() => {
@@ -1222,11 +1229,7 @@ var pluginManager = function pluginManager() {
         }
 
         if (config && typeof config.mongodb === "string") {
-            config.mongodb = {uri: config.mongodb};
-        }
-
-        if (config.mongodb.uri) {
-            var urlParts = url.parse(config.mongodb.uri, true);
+            var urlParts = url.parse(config.mongodb, true);
             if (urlParts && urlParts.query && urlParts.query.maxPoolSize) {
                 maxPoolSize = urlParts.query.maxPoolSize;
             }
@@ -1249,8 +1252,8 @@ var pluginManager = function pluginManager() {
             useNewUrlParser: true,
             useUnifiedTopology: true
         };
-        if (config.mongodb.uri) {
-            dbName = this.replaceDatabaseString(config.mongodb.uri, db);
+        if (typeof config.mongodb === 'string') {
+            dbName = this.replaceDatabaseString(config.mongodb, db);
         }
         else {
             config.mongodb.db = db || config.mongodb.db || 'countly';
@@ -1275,15 +1278,9 @@ var pluginManager = function pluginManager() {
         }
 
         if (config.mongodb.username && config.mongodb.password) {
-            dbName = dbName.replace('mongodb://', '').replace('mongodb+srv://', '');
             dbName = encodeURIComponent(config.mongodb.username) + ":" + encodeURIComponent(utils.decrypt(config.mongodb.password)) + "@" + dbName;
         }
 
-        if (config.mongodb.username) {
-            dbName = dbName.replace('mongodb://', '').replace('mongodb+srv://', '');
-            dbName = encodeURIComponent(config.mongodb.username) + "@" + dbName;
-        }
-
         if (dbName.indexOf('mongodb://') !== 0 && dbName.indexOf('mongodb+srv://') !== 0) {
             dbName = 'mongodb://' + dbName;
         }
@@ -1322,6 +1319,11 @@ var pluginManager = function pluginManager() {
         }
         catch (ex) {
             logDbRead.e("Error connecting to database", ex);
+            logDbRead.e("With params %j", {
+                db: db_name,
+                connection: dbName,
+                options: dbOptions
+            });
             //exit to retry to reconnect on restart
             process.exit(1);
             return;
diff --git a/plugins/push/package-lock.json b/plugins/push/package-lock.json
diff --git a/plugins/push/package.json b/plugins/push/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "jsonwebtoken": "8.0.1",
     "node-forge": "1.3.1",
-    "xxhash-addon": "1.4.0"
+    "xxhash-addon": "1.5.0"
   },
   "private": true
 }
diff --git a/plugins/star-rating/frontend/public/templates/drawer.html b/plugins/star-rating/frontend/public/templates/drawer.html
@@ -14,7 +14,7 @@
 		v-bind="$props.controls">
     <template v-slot:sidecars="drawerScope">
 			<cly-content id="mainSidecar" role="sidecar" :always-active="true">
-				<div class="ratings-drawer__sidecar widget-preview">
+				<div class="ratings-drawer__sidecar widget-preview cly-vue-ratings-preview">
 					<div class="preview-stage" v-if="drawerScope.currentStepId === 'step1' || drawerScope.currentStepId === 'step2' || drawerScope.currentStepId === 'step3'" >
 						<div class="bu-is-size-7 ratings-drawer__stage-label">
 							{{ i18n('feedback.ratings-popup') }}
diff --git a/plugins/star-rating/frontend/public/templates/feedback-popup.html b/plugins/star-rating/frontend/public/templates/feedback-popup.html
@@ -15,7 +15,7 @@
     <meta content="width=device-width, initial-scale=1" name="viewport">
     </meta>
 </head>
-<body class="ratings-popup">
+<body class="ratings-popup cly-vue-ratings-preview">
 <div class="rating-loader-wrapper">
     <img src="../../star-rating/images/star-rating/loader.svg" class="rating-loader"/>
 </div>
diff --git a/test/2.api/00.read.config.js b/test/2.api/00.read.config.js

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"dependencies": {`
`23`	`23`	`"jsonwebtoken": "8.0.1",`
`24`	`24`	`"node-forge": "1.3.1",`
`25`		`- "xxhash-addon": "1.4.0"`
	`25`	`+ "xxhash-addon": "1.5.0"`
`26`	`26`	`},`
`27`	`27`	`"private": true`
`28`	`28`	`}`