checkpoint

src/backend/Components/Guild/GuildManager.ts

@@ -0,0 +1,37 @@
+import { FrontworkAdmin } from "../../Admin/Admin";
+import { FrontworkComponent } from "../../Types/FrontworkComponent";
+import { _Rank } from "../../Types/Types";
+
+export class GuildManager
+implements FrontworkComponent<any>{
+
+    name = "GuildManager";    
+    admin: FrontworkAdmin
+
+    exportRPCs = () => [{
+        name: 'getGuildInfo',
+        call: async () => {
+
+            return await Promise.all(
+                ['ADMIN', ..._Rank].map(async r => {
+                    const res = await this.admin.knex
+                    .select('*')
+                    .from('users')
+                    .where('rank', '=', r)
+                    .first()
+                    .count()
+
+                    return {
+                        rank:  r,
+                        count: res['count(*)']
+                    }
+                })
+            )
+        }
+    }]
+
+    exportRPCFeatures = () => []
+    
+    getTableDefinitions = () => []
+
+}

src/backend/Components/Item/ItemManager.ts

@@ -21,7 +21,7 @@ export type Item = {
 }
 
 export class ItemManager
-implements FrontworkComponent<ItemManagerFeatureIfc>, TableDefinitionExporter{
+implements FrontworkComponent<any, any, ItemManagerFeatureIfc>, TableDefinitionExporter{
     
     admin:FrontworkAdmin    
     name = "ItemManager";    

src/backend/Components/Raid/RaidManager.ts

@@ -4,7 +4,7 @@ import { FrontworkComponent } from "../../Types/FrontworkComponent";
 
 
 export class RaidManager
-implements FrontworkComponent<RaidManagerFeatureIfc>{
+implements FrontworkComponent<any, any, RaidManagerFeatureIfc>{
     name = "RaidManager";    
     admin: FrontworkAdmin
 

src/backend/Components/User/UserManager.ts

@@ -1,13 +1,19 @@
 import { RPCServer } from "rpclibrary";
-import { TableDefiniton, AnyRPCExporter, User, RPCPermission, _Rank, Token, Auth, FrontcraftFeatureIfc, Rank } from "../../Types/Types";
+import { TableDefiniton, AnyRPCExporter, User, RPCPermission, _Rank, Token, Auth, FrontcraftFeatureIfc, Rank, LoginManagerFeatureIfc } from "../../Types/Types";
 import { FrontworkAdmin } from "../../Admin/Admin";
 import { PrivilegedRPCExporter } from "../../Types/PrivilegedRPCExporter";
 import { FrontworkComponent } from "../../Types/FrontworkComponent";
+import { getSpecTableData } from "../../Types/PlayerSpecs"
 const uuid = require('uuid/v4')
 
+export type LoginManagerIfc = {
+    Authenticator: {
+        login: (username:string, pwHash:string) => Promise<Token>
+    }
+}
 
 export class LoginManager
-implements FrontworkComponent{
+implements FrontworkComponent<LoginManagerFeatureIfc>{
     name = "Authenticator" as "Authenticator";   
     admin:FrontworkAdmin
     
@@ -59,7 +65,8 @@ implements FrontworkComponent{
                     table.string("name").notNullable().unique()
                     table.string("pwhash").notNullable()
                     table.string("rank").notNullable()
-                    table.string("class").notNullable()
+                    table.integer("specid").notNullable()
+                    table.foreign('specid').references('specs.id')
                     table.string("email").nullable().unique()
                 }
             },{
@@ -77,6 +84,13 @@ implements FrontworkComponent{
                     table.foreign('user_id').references('users')
                     table.dateTime('created').defaultTo(this.admin.knex.fn.now())
                 }
+            },{
+                name: 'specs',
+                tableBuilder: (table) => {
+                    table.increments('id').primary()
+                    table.string('class')
+                    table.string('name')
+                }
             }
         ,...this.exporters.flatMap(exp => exp['getTableDefinitions']?exp['getTableDefinitions']():undefined)]
     }
@@ -90,6 +104,10 @@ implements FrontworkComponent{
         })))
 
         await Promise.all(this.exporters.map(ex => ex['initialize']?ex['initialize']():undefined))
+
+        console.log(getSpecTableData())
+
+        await this.admin.knex('specs').insert(getSpecTableData()).catch(console.log)
     }
 
     async setPermission(permission: RPCPermission){
@@ -147,12 +165,12 @@ implements FrontworkComponent{
         if(typeof tokenValue !== 'string') tokenValue = tokenValue.value 
 
         const res : User[] = await this.admin.knex
-        .select('users.id', 'name', 'class', 'rank', 'email')
-        .from('tokens')
-        .join('users', function(){
-            this.on('users.id', '=', 'tokens.user_id')
-        })
-        .where({ value: tokenValue})
+            .select('users.id', 'name', 'specid', 'rank', 'email')
+            .from('tokens')
+            .join('users', function(){
+                this.on('users.id', '=', 'tokens.user_id')
+            })
+            .where({ value: tokenValue})
 
         if(res.length === 0)
             throw new Error('authentication failed')