pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-20 03:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ validate env and add remote fossorial API as an env variable

Browse Source
This commit is contained in:
Fred KISSIE
2025-11-05 06:54:56 +01:00
parent 03e0e8d9c2
commit a26a441d56
7 changed files with 176 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/lib/config.ts
View File

@@ -6,6 +6,7 @@ import { eq } from "drizzle-orm";
import { configSchema, readConfigFile } from "./readConfigFile";
import { fromError } from "zod-validation-error";
import { build } from "@server/build";
import { pullEnv } from "@app/lib/pullEnv";
export class Config {
private rawConfig!: z.infer<typeof configSchema>;
@@ -149,6 +150,7 @@ export class Config {
public async checkSupporterKey() {
const [key] = await db.select().from(supporterKey).limit(1);
const env = pullEnv();
if (!key) {
return;
@@ -158,7 +160,7 @@ export class Config {
try {
const response = await fetch(
"https://api.fossorial.io/api/v1/license/validate",
`${env.app.fossorialRemoteAPIBaseUrl}/api/v1/license/validate`,
{
method: "POST",
headers: {

6
server/private/routers/generatedLicense/generateNewLicense.ts
View File

@@ -18,11 +18,13 @@ import logger from "@server/logger";
import { response as sendResponse } from "@server/lib/response";
import privateConfig from "#private/lib/config";
import { GenerateNewLicenseResponse } from "@server/routers/generatedLicense/types";
import { pullEnv } from "@app/lib/pullEnv";
async function createNewLicense(orgId: string, licenseData: any): Promise<any> {
try {
const env = pullEnv();
const response = await fetch(
`https://api.fossorial.io/api/v1/license-internal/enterprise/${orgId}/create`,
`${env.app.fossorialRemoteAPIBaseUrl}/api/v1/license-internal/enterprise/${orgId}/create`,
{
method: "PUT",
headers: {
@@ -37,7 +39,7 @@ async function createNewLicense(orgId: string, licenseData: any): Promise<any> {
const data = await response.json();
logger.debug("Fossorial API response:", {data});
logger.debug("Fossorial API response:", { data });
return data;
} catch (error) {
console.error("Error creating new license:", error);

9
server/private/routers/generatedLicense/listGeneratedLicenses.ts
View File

@@ -17,12 +17,17 @@ import createHttpError from "http-errors";
import logger from "@server/logger";
import { response as sendResponse } from "@server/lib/response";
import privateConfig from "#private/lib/config";
import { GeneratedLicenseKey, ListGeneratedLicenseKeysResponse } from "@server/routers/generatedLicense/types";
import {
GeneratedLicenseKey,
ListGeneratedLicenseKeysResponse
} from "@server/routers/generatedLicense/types";
import { pullEnv } from "@app/lib/pullEnv";
async function fetchLicenseKeys(orgId: string): Promise<any> {
try {
const env = pullEnv();
const response = await fetch(
`https://api.fossorial.io/api/v1/license-internal/enterprise/${orgId}/list`,
`${env.app.fossorialRemoteAPIBaseUrl}/api/v1/license-internal/enterprise/${orgId}/list`,
{
method: "GET",
headers: {

4
server/routers/supporterKey/validateSupporterKey.ts
View File

@@ -10,6 +10,7 @@ import { supporterKey } from "@server/db";
import { db } from "@server/db";
import { eq } from "drizzle-orm";
import config from "@server/lib/config";
import { pullEnv } from "@app/lib/pullEnv";
const validateSupporterKeySchema = z
.object({
@@ -31,6 +32,7 @@ export async function validateSupporterKey(
next: NextFunction
): Promise<any> {
try {
const env = pullEnv();
const parsedBody = validateSupporterKeySchema.safeParse(req.body);
if (!parsedBody.success) {
return next(
@@ -44,7 +46,7 @@ export async function validateSupporterKey(
const { githubUsername, key } = parsedBody.data;
const response = await fetch(
"https://api.fossorial.io/api/v1/license/validate",
`${env.app.fossorialRemoteAPIBaseUrl}/api/v1/license/validate`,
{
method: "POST",
headers: {