@brimble/models 1.4.76 → 1.4.78

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
 yarn run v1.22.19
 $ tsc -p .
-Done in 1.80s.
+Done in 1.92s.

package/dist/index.d.ts

@@ -15,6 +15,8 @@ export { default as Tenancy } from "./tenancy";
 export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscriptionPlan, ICard } from "./types";
 export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES } from "./enum";
 import mongoose from "mongoose";
-export declare const connectToMongo: (mongoUrl: string, config?: mongoose.ConnectOptions) => Promise<void>;
+export declare const connectToMongo: (config: mongoose.ConnectOptions & {
+    host: string;
+}) => Promise<void>;
 export declare const db: mongoose.Connection;
 export declare const closeMongo: () => Promise<void>;

package/dist/index.js

@@ -55,12 +55,12 @@ Object.defineProperty(exports, "CARD_TYPES", { enumerable: true, get: function (
 const mongoose_1 = __importDefault(require("mongoose"));
 const utils_1 = require("@brimble/utils");
 // Connection to Mongo
-const connectToMongo = (mongoUrl, config) => __awaiter(void 0, void 0, void 0, function* () {
-    const options = Object.assign({ useNewUrlParser: true, useUnifiedTopology: true, poolSize: 10, socketTimeoutMS: 30000, reconnectTries: 10, reconnectInterval: 3000 }, config);
+const connectToMongo = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const options = Object.assign({ useNewUrlParser: true, useUnifiedTopology: true, poolSize: 10, socketTimeoutMS: 30000, reconnectTries: 10, reconnectInterval: 3000, checkServerIdentity: false, authMechanism: 'MONGODB-X509', authSource: '$external' }, config);
     mongoose_1.default.set("useFindAndModify", false);
     mongoose_1.default.set("useCreateIndex", true);
     // connect to mongo
-    mongoose_1.default.connect(mongoUrl, options).catch((err) => {
+    mongoose_1.default.connect(`mongodb+srv://${config.host}/?authMechanism=MONGODB-X509&authSource=%24external&tls=true&tlsCertificateKeyFile=${config.sslCert}`, options).catch((err) => {
         utils_1.log.error(`Unable to connect to mongo db, ${err}`);
     });
     // listen for connection

package/index.ts

@@ -49,8 +49,7 @@ import { log } from "@brimble/utils";
 
 // Connection to Mongo
 export const connectToMongo = async (
-  mongoUrl: string,
-  config?: mongoose.ConnectOptions
+  config: mongoose.ConnectOptions & { host: string}
 ): Promise<void> => {
   const options: mongoose.ConnectOptions = {
     useNewUrlParser: true,
@@ -59,13 +58,16 @@ export const connectToMongo = async (
     socketTimeoutMS: 30000,
     reconnectTries: 10,
     reconnectInterval: 3000,
+    checkServerIdentity: false,
+    authMechanism: 'MONGODB-X509',
+    authSource: '$external',
     ...config
   };
   mongoose.set("useFindAndModify", false);
   mongoose.set("useCreateIndex", true);
 
   // connect to mongo
-  mongoose.connect(mongoUrl, options).catch((err) => {
+  mongoose.connect(`mongodb+srv://${config.host}/?authMechanism=MONGODB-X509&authSource=%24external&tls=true&tlsCertificateKeyFile=${config.sslCert}`, options).catch((err) => {
     log.error(`Unable to connect to mongo db, ${err}`)
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.4.76",
+  "version": "1.4.78",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,5 +21,5 @@
     "ts-node": "^8.10.2",
     "typescript": "^4.9.4"
   },
-  "gitHead": "087bfd2e5628be17b9cf6d6c03239105217a4419"
+  "gitHead": "51b26cb5f0e96321c047c9ba4e8690bfd8f712f8"
 }