From 05c6cd6c3da21db22b9cefc49237c91cf94dfad6 Mon Sep 17 00:00:00 2001
From: KernelDeimos <eric.alex.dube@gmail.com>
Date: Mon, 1 Apr 2024 17:24:01 -0400
Subject: [PATCH] Separate default user into SelfhostedModule

---
 packages/backend/exports.js                          |  4 +++-
 packages/backend/src/CoreModule.js                   |  3 ---
 packages/backend/src/SelfhostedModule.js             | 12 ++++++++++++
 packages/backend/src/services/DefaultUserService.js  |  8 --------
 .../backend/src/services/sla/MonthlyUsageService.js  |  7 +++++++
 run-selfhosted.js                                    |  2 ++
 6 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 packages/backend/src/SelfhostedModule.js

diff --git a/packages/backend/exports.js b/packages/backend/exports.js
index d2ae1386..fec5b824 100644
--- a/packages/backend/exports.js
+++ b/packages/backend/exports.js
@@ -18,8 +18,9 @@
  */
 const CoreModule = require("./src/CoreModule.js");
 const { Kernel } = require("./src/Kernel.js");
-const LocalDiskStorageModule = require("./src/LocalDiskStorageModule.js");
 const DatabaseModule = require("./src/DatabaseModule.js");
+const LocalDiskStorageModule = require("./src/LocalDiskStorageModule.js");
+const SelfhostedModule = require("./src/SelfhostedModule.js");
 const PuterDriversModule = require("./src/PuterDriversModule.js");
 const { testlaunch } = require("./src/index.js");
 const BaseService = require("./src/services/BaseService.js");
@@ -44,4 +45,5 @@ module.exports = {
     DatabaseModule,
     PuterDriversModule,
     LocalDiskStorageModule,
+    SelfhostedModule,
 };
diff --git a/packages/backend/src/CoreModule.js b/packages/backend/src/CoreModule.js
index 105edb5e..5357b3e8 100644
--- a/packages/backend/src/CoreModule.js
+++ b/packages/backend/src/CoreModule.js
@@ -182,9 +182,6 @@ const install = async ({ services, app }) => {
     const { EventService } = require('./services/EventService');
     services.registerService('event', EventService);
 
-    const DefaultUserService = require('./services/DefaultUserService');
-    services.registerService('__default-user', DefaultUserService);
-
 }
 
 const install_legacy = async ({ services }) => {
diff --git a/packages/backend/src/SelfhostedModule.js b/packages/backend/src/SelfhostedModule.js
new file mode 100644
index 00000000..de6bf0fd
--- /dev/null
+++ b/packages/backend/src/SelfhostedModule.js
@@ -0,0 +1,12 @@
+const { AdvancedBase } = require("puter-js-common");
+
+class SelfhostedModule extends AdvancedBase {
+    async install (context) {
+        const services = context.get('services');
+
+        const DefaultUserService = require('./services/DefaultUserService');
+        services.registerService('__default-user', DefaultUserService);
+    }
+}
+
+module.exports = SelfhostedModule;
diff --git a/packages/backend/src/services/DefaultUserService.js b/packages/backend/src/services/DefaultUserService.js
index 424795b3..fe4f2f37 100644
--- a/packages/backend/src/services/DefaultUserService.js
+++ b/packages/backend/src/services/DefaultUserService.js
@@ -24,14 +24,7 @@ class DefaultUserService extends BaseService {
         // check if user named `default-user` is using default password
         const require = this.require;
         const tmp_password = await this.get_tmp_password_(user);
-        console.log(`second input [${tmp_password}]`);
         const bcrypt = require('bcrypt');
-        console.log(...[
-            'THESE ARE THE ARGS',
-            tmp_password,
-            // password_hashed,
-            user.password
-        ].map(l => l + '\n'));
         const is_default_password = await bcrypt.compare(
             tmp_password,
             user.password
@@ -86,7 +79,6 @@ class DefaultUserService extends BaseService {
         );
         const user = await get_user({ username: USERNAME });
         const tmp_password = await this.get_tmp_password_(user);
-        console.log(`first input [${tmp_password}]`);
         const bcrypt = require('bcrypt');
         const password_hashed = await bcrypt.hash(tmp_password, 8);
         await db.write(
diff --git a/packages/backend/src/services/sla/MonthlyUsageService.js b/packages/backend/src/services/sla/MonthlyUsageService.js
index 015c685b..a50a7059 100644
--- a/packages/backend/src/services/sla/MonthlyUsageService.js
+++ b/packages/backend/src/services/sla/MonthlyUsageService.js
@@ -38,6 +38,13 @@ class MonthlyUsageService extends BaseService {
             return;
         }
 
+        const vals =
+                [
+                    year, month, key, actor.type.user.id, maybe_app_id, JSON.stringify(extra),
+                    ...this.db.case({ mysql: [JSON.stringify(extra)], otherwise: [] }),
+                ]
+        console.log('VALS', vals);
+
         // UPSERT increment count
         try {
             await this.db.write(
diff --git a/run-selfhosted.js b/run-selfhosted.js
index af37f022..05b4d231 100644
--- a/run-selfhosted.js
+++ b/run-selfhosted.js
@@ -6,6 +6,7 @@ const {
     DatabaseModule,
     PuterDriversModule,
     LocalDiskStorageModule,
+    SelfhostedModule,
 } = backend;
 
 const k = new Kernel();
@@ -13,4 +14,5 @@ k.add_module(new CoreModule());
 k.add_module(new DatabaseModule());
 k.add_module(new PuterDriversModule());
 k.add_module(new LocalDiskStorageModule());
+k.add_module(new SelfhostedModule()),
 k.boot();