Skip to content

Commit 10a4716

Browse files
authored
format fix
1 parent 07900a1 commit 10a4716

File tree

3 files changed

+51
-29
lines changed

3 files changed

+51
-29
lines changed

config/config.ts

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,48 @@ import {
2121
} from "../src/constants/variables";
2222
import { config as configFromDotEnv } from "dotenv";
2323

24-
export function loadEnv (
25-
env: env,
26-
fromWorkerEnv: boolean
27-
): env {
28-
const Env:env = {
24+
export function loadEnv(env: env, fromWorkerEnv: boolean): env {
25+
const Env: env = {
2926
//if `fromWokerEnv` is true, then load from the `env` passed as argument to the function,
30-
// else if `fromWokerEnv` is false, load from process.env
27+
// else if `fromWokerEnv` is false, load from process.env
3128
//(or set to '' if value from process.env is undefined) to avoid Error TS2322
32-
CURRENT_ENVIRONMENT: fromWorkerEnv ? env.CURRENT_ENVIRONMENT : process.env.CURRENT_ENVIRONMENT || '',
33-
DISCORD_APPLICATION_ID: fromWorkerEnv ? env.DISCORD_APPLICATION_ID : process.env.DISCORD_APPLICATION_ID || '',
34-
DISCORD_GUILD_ID: fromWorkerEnv ? env.DISCORD_GUILD_ID : process.env.DISCORD_GUILD_ID || '',
35-
DISCORD_TOKEN: fromWorkerEnv ? env.DISCORD_TOKEN : process.env.DISCORD_TOKEN || '',
36-
DISCORD_PUBLIC_KEY: fromWorkerEnv ? env.DISCORD_PUBLIC_KEY : process.env.DISCORD_PUBLIC_KEY || '',
37-
CLOUDFLARE_API_TOKEN: fromWorkerEnv ? env.CLOUDFLARE_API_TOKEN : process.env.CLOUDFLARE_API_TOKEN || '',
38-
CLOUDFLARE_ACCOUNT_ID: fromWorkerEnv ? env.CLOUDFLARE_ACCOUNT_ID : process.env.CLOUDFLARE_ACCOUNT_ID || '',
39-
BOT_PRIVATE_KEY: fromWorkerEnv ? env.BOT_PRIVATE_KEY : process.env.BOT_PRIVATE_KEY || '',
40-
RDS_SERVERLESS_PUBLIC_KEY: fromWorkerEnv ? env.RDS_SERVERLESS_PUBLIC_KEY : process.env.RDS_SERVERLESS_PUBLIC_KEY || '',
41-
CRON_JOBS_PUBLIC_KEY: fromWorkerEnv ? env.CRON_JOBS_PUBLIC_KEY : process.env.CRON_JOBS_PUBLIC_KEY || '',
42-
IDENTITY_SERVICE_PUBLIC_KEY: fromWorkerEnv ? env.IDENTITY_SERVICE_PUBLIC_KEY : process.env.IDENTITY_SERVICE_PUBLIC_KEY || ''
43-
}
29+
CURRENT_ENVIRONMENT: fromWorkerEnv
30+
? env.CURRENT_ENVIRONMENT
31+
: process.env.CURRENT_ENVIRONMENT || "",
32+
DISCORD_APPLICATION_ID: fromWorkerEnv
33+
? env.DISCORD_APPLICATION_ID
34+
: process.env.DISCORD_APPLICATION_ID || "",
35+
DISCORD_GUILD_ID: fromWorkerEnv
36+
? env.DISCORD_GUILD_ID
37+
: process.env.DISCORD_GUILD_ID || "",
38+
DISCORD_TOKEN: fromWorkerEnv
39+
? env.DISCORD_TOKEN
40+
: process.env.DISCORD_TOKEN || "",
41+
DISCORD_PUBLIC_KEY: fromWorkerEnv
42+
? env.DISCORD_PUBLIC_KEY
43+
: process.env.DISCORD_PUBLIC_KEY || "",
44+
CLOUDFLARE_API_TOKEN: fromWorkerEnv
45+
? env.CLOUDFLARE_API_TOKEN
46+
: process.env.CLOUDFLARE_API_TOKEN || "",
47+
CLOUDFLARE_ACCOUNT_ID: fromWorkerEnv
48+
? env.CLOUDFLARE_ACCOUNT_ID
49+
: process.env.CLOUDFLARE_ACCOUNT_ID || "",
50+
BOT_PRIVATE_KEY: fromWorkerEnv
51+
? env.BOT_PRIVATE_KEY
52+
: process.env.BOT_PRIVATE_KEY || "",
53+
RDS_SERVERLESS_PUBLIC_KEY: fromWorkerEnv
54+
? env.RDS_SERVERLESS_PUBLIC_KEY
55+
: process.env.RDS_SERVERLESS_PUBLIC_KEY || "",
56+
CRON_JOBS_PUBLIC_KEY: fromWorkerEnv
57+
? env.CRON_JOBS_PUBLIC_KEY
58+
: process.env.CRON_JOBS_PUBLIC_KEY || "",
59+
IDENTITY_SERVICE_PUBLIC_KEY: fromWorkerEnv
60+
? env.IDENTITY_SERVICE_PUBLIC_KEY
61+
: process.env.IDENTITY_SERVICE_PUBLIC_KEY || "",
62+
};
4463
return Env;
4564
}
4665

47-
4866
configFromDotEnv();
4967

5068
const config = (env: env) => {

config/envVarCheck.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@ validateEnv();
88
* else throw an error
99
* ---
1010
*/
11-
export function validateEnv (){
11+
export function validateEnv() {
1212
//pass empty object as env and fromWorkerEnv = false, since this method is should get executed in github actions and not in worker
1313
const envLoadedFromProcess: env = loadEnv({}, false);
14-
const missingEnvVars = Object.keys(envLoadedFromProcess).filter((key) => envLoadedFromProcess[key] == '');
14+
const missingEnvVars = Object.keys(envLoadedFromProcess).filter(
15+
(key) => envLoadedFromProcess[key] == "",
16+
);
1517

1618
// Logging missing environment variables and throw error if any are missing
1719
if (missingEnvVars.length > 0) {
18-
throw new Error(`Missing environment variables: ${missingEnvVars.join(', ')}`);
20+
throw new Error(
21+
`Missing environment variables: ${missingEnvVars.join(", ")}`,
22+
);
1923
} else {
20-
console.log('All required environment variables are set.');
21-
}
22-
}
24+
console.log("All required environment variables are set.");
25+
}
26+
}

src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default {
9797
async fetch(
9898
request: Request,
9999
env: env,
100-
ctx: ExecutionContext
100+
ctx: ExecutionContext,
101101
): Promise<Response> {
102102
const apiUrls = ["/invite", "/roles", "/profile/blocked", "/task/update"];
103103
const url = new URL(request.url);
@@ -107,12 +107,12 @@ export default {
107107
return new JSONResponse(response.BAD_SIGNATURE, { status: 401 });
108108
}
109109
}
110-
const envLoadedFromWorker: env = loadEnv(env,true);
110+
const envLoadedFromWorker: env = loadEnv(env, true);
111111
return router.handle(request, envLoadedFromWorker, ctx);
112112
},
113113

114114
async scheduled(req: Request, env: env, ctx: ExecutionContext) {
115-
const envLoadedFromWorker: env = loadEnv(env,true);
115+
const envLoadedFromWorker: env = loadEnv(env, true);
116116
ctx.waitUntil(send(envLoadedFromWorker));
117117
},
118-
};
118+
};

0 commit comments

Comments
 (0)