cleanup

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -862,14 +862,8 @@ export class DatabaseConnection {
                 if (exists2 != null) { throw new Error("Access denied, role '" + r.name + "' already exists"); }
             }
 
-
             span.setAttribute("collection", collectionname);
             span.setAttribute("username", user.username);
-
-
-            // const options:CollectionInsertOneOptions = {  writeConcern: { w: parseInt((w as any)), j: j } };
-            // const options: CollectionInsertOneOptions = { w: w, j: j };
-            //const options: CollectionInsertOneOptions = { w: "majority" };
             const options: CollectionInsertOneOptions = {};
             options.WriteConcern = {}; // new WriteConcern();
             options.WriteConcern.w = w;
@@ -1835,7 +1829,6 @@ export class DatabaseConnection {
             }
             const ot_end = Logger.otel.startTimer();
             const mongodbspan: Span = Logger.otel.startSubSpan("mongodb.insertOne", span);
-            // await this.db.collection(q.collectionname + '_hist').insertOne(updatehist);
             this.db.collection(q.collectionname + '_hist').insertOne(updatehist).then(() => {
                 Logger.otel.endSpan(mongodbspan);
                 Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insert, { collection: q.collectionname + '_hist' });
@@ -1939,7 +1932,6 @@ export class DatabaseConnection {
                     }
                     const ot_end = Logger.otel.startTimer();
                     const mongodbspan: Span = Logger.otel.startSubSpan("mongodb.insertOne", span);
-                    // await this.db.collection(collectionname + '_hist').insertOne(deltahist);
                     this.db.collection(collectionname + '_hist').insertOne(deltahist).then(() => {
                         Logger.otel.endSpan(mongodbspan);
                         Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insert, { collection: collectionname + '_hist' });
@@ -1967,7 +1959,6 @@ export class DatabaseConnection {
                 }
                 const ot_end = Logger.otel.startTimer();
                 const mongodbspan: Span = Logger.otel.startSubSpan("mongodb.insertOne", span);
-                // await this.db.collection(collectionname + '_hist').insertOne(fullhist);
                 this.db.collection(collectionname + '_hist').insertOne(fullhist).then(() => {
                     Logger.otel.endSpan(mongodbspan);
                     Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insert, { collection: collectionname + '_hist' });

OpenFlow/src/LoginProvider.ts

@@ -994,7 +994,9 @@ export class LoginProvider {
                         }
                         user = new User(); user.name = username; user.username = username;
                         await Crypt.SetPassword(user, password, span);
-                        user = await Config.db.InsertOne(user, "users", 0, false, Crypt.rootToken(), span);
+                        const jwt: string = Crypt.rootToken();
+                        user = await DBHelper.ensureUser(jwt, user.name, user.username, null, null, span);
+
                         const admins: Role = await DBHelper.FindRoleByName("admins", span);
                         admins.AddMember(user);
                         await DBHelper.Save(admins, Crypt.rootToken(), span)
@@ -1141,7 +1143,6 @@ export class LoginProvider {
                         (_user as any).mobile = profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/mobile"];
                     }
                     if (NoderedUtil.IsNullEmpty(_user.name)) { done("Cannot add new user, name is empty, please add displayname to claims", null); return; }
-                    // _user = await Config.db.InsertOne(_user, "users", 0, false, Crypt.rootToken());
                     const jwt: string = Crypt.rootToken();
                     _user = await DBHelper.ensureUser(jwt, _user.name, _user.username, null, null, span);
                 }