Typeorm: Use DataSource instead of Connection

app/gen-server/ApiServer.ts

@@ -76,7 +76,7 @@ export function addOrg(
     billing?: BillingOptions,
   }
 ): Promise<number> {
-  return dbManager.connection.transaction(async manager => {
+  return dbManager.dataSource.transaction(async manager => {
     const user = await manager.findOne(User, {where: {id: userId}});
     if (!user) { return handleDeletedUser(); }
     const query = await dbManager.addOrg(user, props, {
@@ -429,7 +429,7 @@ export class ApiServer {
         throw new ApiError('Name expected in the body', 400);
       }
       const name = req.body.name;
-      await this._dbManager.updateUserName(userId, name);
+      await this._dbManager.updateUser(userId, { name });
       res.sendStatus(200);
     }));
 
@@ -505,7 +505,7 @@ export class ApiServer {
     this._app.post('/api/profile/apikey', expressWrap(async (req, res) => {
       const userId = getAuthorizedUserId(req);
       const force = req.body ? req.body.force : false;
-      const manager = this._dbManager.connection.manager;
+      const manager = this._dbManager.dataSource.manager;
       let user = await manager.findOne(User, {where: {id: userId}});
       if (!user) { return handleDeletedUser(); }
       if (!user.apiKey || force) {
@@ -520,7 +520,7 @@ export class ApiServer {
     // Delete apiKey
     this._app.delete('/api/profile/apikey', expressWrap(async (req, res) => {
       const userId = getAuthorizedUserId(req);
-      await this._dbManager.connection.transaction(async manager => {
+      await this._dbManager.dataSource.transaction(async manager => {
         const user = await manager.findOne(User, {where: {id: userId}});
         if (!user) { return handleDeletedUser(); }
         user.apiKey = null;

app/gen-server/lib/Activations.ts

@@ -15,7 +15,7 @@ export class Activations {
   // It will be created with an empty key column, which will get
   // filled in once an activation key is presented.
   public current(): Promise<Activation> {
-    return this._db.connection.manager.transaction(async manager => {
+    return this._db.dataSource.manager.transaction(async manager => {
       let activation = await manager.findOne(Activation, {where: {}});
       if (!activation) {
         activation = manager.create(Activation);

app/gen-server/lib/Doom.ts

@@ -152,7 +152,7 @@ export class Doom {
       }
     }
     const candidate = sortBy(owners, ['email'])[0];
-    await scrubUserFromOrg(orgId, userId, candidate.id, this._dbManager.connection.manager);
+    await scrubUserFromOrg(orgId, userId, candidate.id, this._dbManager.dataSource.manager);
   }
 
   // List the sites a user has access to.

app/gen-server/lib/Housekeeper.ts

@@ -185,7 +185,7 @@ export class Housekeeper {
       log.warn("logMetrics siteUsage starting");
       // Avoid using a transaction since it may end up being held up for a while, and for no good
       // reason (atomicity matters for this reporting).
-      const manager = this._dbManager.connection.manager;
+      const manager = this._dbManager.dataSource.manager;
       const usageSummaries = await this._getOrgUsageSummaries(manager);
 
       // We sleep occasionally during this logging. We may log many MANY lines, which can hang up a
@@ -212,7 +212,7 @@ export class Housekeeper {
 
     if (this._telemetry.shouldLogEvent('siteMembership')) {
       log.warn("logMetrics siteMembership starting");
-      const manager = this._dbManager.connection.manager;
+      const manager = this._dbManager.dataSource.manager;
       const membershipSummaries = await this._getOrgMembershipSummaries(manager);
       await forEachWithBreaks("logMetrics siteMembership progress", membershipSummaries, summary => {
         this._telemetry.logEvent(null, 'siteMembership', {
@@ -297,7 +297,7 @@ export class Housekeeper {
   }
 
   private async _getDocsToDelete() {
-    const docs = await this._dbManager.connection.createQueryBuilder()
+    const docs = await this._dbManager.dataSource.createQueryBuilder()
       .select('docs')
       .from(Document, 'docs')
       .leftJoinAndSelect('docs.workspace', 'workspaces')
@@ -309,7 +309,7 @@ export class Housekeeper {
   }
 
   private async _getWorkspacesToDelete() {
-    const workspaces = await this._dbManager.connection.createQueryBuilder()
+    const workspaces = await this._dbManager.dataSource.createQueryBuilder()
       .select('workspaces')
       .from(Workspace, 'workspaces')
       .leftJoin('workspaces.docs', 'docs')
@@ -323,7 +323,7 @@ export class Housekeeper {
   }
 
   private async _getForksToDelete() {
-    const forks = await this._dbManager.connection.createQueryBuilder()
+    const forks = await this._dbManager.dataSource.createQueryBuilder()
       .select('forks')
       .from(Document, 'forks')
       .where('forks.trunk_id IS NOT NULL')
@@ -385,7 +385,7 @@ export class Housekeeper {
    * don't have to deal with its caprices.
    */
   private _getThreshold() {
-    return fromNow(this._dbManager.connection.driver.options.type, AGE_THRESHOLD_OFFSET);
+    return fromNow(this._dbManager.dataSource.driver.options.type, AGE_THRESHOLD_OFFSET);
   }
 
   // Call a document endpoint with a permit, cleaning up after the call.
@@ -475,7 +475,7 @@ export async function fixSiteProducts(options: {
   }
 
   // Find all billing accounts on teamFree product and change them to the Free.
-  return await db.connection.transaction(async (t) => {
+  return await db.dataSource.transaction(async (t) => {
     const freeProduct = await t.findOne(Product, {where: {name: 'Free'}});
     const freeTeamProduct = await t.findOne(Product, {where: {name: 'teamFree'}});
 

app/gen-server/lib/Usage.ts

@@ -43,7 +43,7 @@ export class Usage {
 
   private async _apply(): Promise<void> {
     try {
-      const manager = this._dbManager.connection.manager;
+      const manager = this._dbManager.dataSource.manager;
       // raw count of users
       const userCount = await manager.count(User);
       // users who have logged in at least once