diff --git a/apps/metamigo-cli/src/config.ts b/apps/metamigo-cli/src/config.ts index b09250a..f5a8c26 100644 --- a/apps/metamigo-cli/src/config.ts +++ b/apps/metamigo-cli/src/config.ts @@ -2,7 +2,6 @@ import { generateConfig, printConfigOptions, } from "@digiresilience/metamigo-common"; -import { IAppConfig, IAppConvict } from "@digiresilience/metamigo-config"; import { loadConfigRaw } from "@digiresilience/metamigo-config"; export const genConf = async (): Promise => { diff --git a/apps/metamigo-cli/src/index.ts b/apps/metamigo-cli/src/index.ts index fbcc6f9..c4ee222 100644 --- a/apps/metamigo-cli/src/index.ts +++ b/apps/metamigo-cli/src/index.ts @@ -1,24 +1,13 @@ #!/usr/bin/env node import { Command } from "commander"; -import { startWithout } from "@digiresilience/montar"; import { migrateWrapper } from "@digiresilience/metamigo-db"; import { loadConfig } from "@digiresilience/metamigo-config"; import { genConf, listConfig } from "./config.js"; -import { createTokenForTesting, generateJwks } from "./jwks.js"; import { exportGraphqlSchema } from "./metamigo-postgraphile.js"; -import "@digiresilience/metamigo-api"; -import "@digiresilience/metamigo-worker"; const program = new Command(); -export async function runServer(): Promise { - await startWithout(["worker"]); -} - -export async function runWorker(): Promise { - await startWithout(["server"]); -} program .command("config-generate") @@ -30,16 +19,6 @@ program .description("Prints the entire convict config ") .action(listConfig); -program - .command("api") - .description("Run the application api server") - .action(runServer); - -program - .command("worker") - .description("Run the worker to process jobs") - .action(runWorker); - program .command("db ") .description("Run graphile-migrate commands with your app's config loaded.") @@ -48,16 +27,6 @@ program return migrateWrapper(args, config); }); -program - .command("gen-jwks") - .description("Generate the JWKS") - .action(generateJwks); - -program - .command("gen-testing-jwt") - .description("Generate a JWT for the test suite") - .action(createTokenForTesting); - program .command("export-graphql-schema") .description("Export the graphql schema") diff --git a/apps/metamigo-cli/src/jwks.ts b/apps/metamigo-cli/src/jwks.ts deleted file mode 100644 index e938ebd..0000000 --- a/apps/metamigo-cli/src/jwks.ts +++ /dev/null @@ -1,67 +0,0 @@ -import jose from "node-jose"; -import * as jwt from "jsonwebtoken"; - -const generateKeystore = async () => { - const keystore = jose.JWK.createKeyStore(); - await keystore.generate("oct", 256, { - alg: "A256GCM", - use: "enc", - }); - await keystore.generate("oct", 256, { - alg: "HS512", - use: "sig", - }); - return keystore; -}; - -const safeString = (input) => - Buffer.from(JSON.stringify(input)).toString("base64"); - -const stringify = (v) => JSON.stringify(v, undefined, 2); - -const _generateJwks = async () => { - const keystore = await generateKeystore(); - const encryption = keystore.all({ use: "enc" })[0].toJSON(true); - const signing = keystore.all({ use: "sig" })[0].toJSON(true); - - return { - nextAuth: { - signingKeyB64: safeString(signing), - encryptionKeyB64: safeString(encryption), - }, - }; -}; - -export const generateJwks = async (): Promise => { - console.log(stringify(await _generateJwks())); -}; - -export const createTokenForTesting = async (): Promise => { - const keys = await _generateJwks(); - const signingKey = Buffer.from( - JSON.parse( - Buffer.from(keys.nextAuth.signingKeyB64, "base64").toString("utf-8") - ).k, - "base64" - ); - - const token = jwt.sign( - { - iss: "Test Env", - iat: 1606893960, - aud: "metamigo", - sub: "abel@guardianproject.info", - name: "Abel Luck", - email: "abel@guardianproject.info", - userRole: "admin", - }, - signingKey, - { expiresIn: "100y", algorithm: "HS512" } - ); - console.log("CONFIG"); - console.log(stringify(keys)); - console.log(); - console.log("TOKEN"); - console.log(token); - console.log(); -};