From b60dd15568be44693533e7a028ed9807b076fcea Mon Sep 17 00:00:00 2001
From: Marie <github@yuugi.dev>
Date: Thu, 29 Aug 2024 18:41:32 +0200
Subject: [PATCH] chore: make stripeAgeCheck not type undefined

---
 .config/docker_example.yml                             | 10 +++++-----
 .config/example.yml                                    | 10 +++++-----
 packages/backend/src/config.ts                         |  4 ++--
 packages/backend/src/server/ServerService.ts           |  2 +-
 packages/backend/src/server/StripeHookServerService.ts |  2 +-
 .../api/endpoints/stripe/create-verify-session.ts      |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index 99b0bb528c..3604361083 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -297,11 +297,11 @@ checkActivityPubGetSignature: false
 #  downloadTimeout: 30
 #  maxFileSize: 262144000
 
-# enable stripe identity for ID verification
-#stripeAgeCheck:
-#  enabled: true
-#  key: sk_
-#  hookKey: whsec_
+# Stripe identity for ID verification
+stripeAgeCheck:
+  enabled: false
+  key: sk_
+  hookKey: whsec_
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
diff --git a/.config/example.yml b/.config/example.yml
index 81b72938c0..b58cd53429 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -312,11 +312,11 @@ checkActivityPubGetSignature: false
 #  downloadTimeout: 30
 #  maxFileSize: 262144000
 
-# enable stripe identity for ID verification
-#stripeAgeCheck:
-#  enabled: true
-#  key: sk_
-#  hookKey: whsec_
+# Stripe identity for ID verification
+stripeAgeCheck:
+  enabled: false
+  key: sk_
+  hookKey: whsec_
 
 # PID File of master process
 #pidFile: /tmp/misskey.pid
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 8af2410314..79d707c884 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -108,7 +108,7 @@ type Source = {
 		maxFileSize: number;
 	};
 
-	stripeAgeCheck?: {
+	stripeAgeCheck: {
 		enabled: boolean;
 		key: string;
 		hookKey: string;
@@ -207,7 +207,7 @@ export type Config = {
 		enabled: boolean | undefined;
 		key: string;
 		hookKey: string;
-	} | undefined;
+	};
 
 	pidFile: string;
 };
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index ef60283f08..f2379b26c2 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -112,7 +112,7 @@ export class ServerService implements OnApplicationShutdown {
 		fastify.register(this.fileServerService.createServer);
 		fastify.register(this.activityPubServerService.createServer);
 		// only enable stripe webhook if verification is enabled
-		if (this.config.stripeAgeCheck?.enabled) fastify.register(this.stripeHookServerService.createServer, { prefix: '/stripe' });
+		if (this.config.stripeAgeCheck.enabled) fastify.register(this.stripeHookServerService.createServer, { prefix: '/stripe' });
 		fastify.register(this.nodeinfoServerService.createServer);
 		fastify.register(this.wellKnownServerService.createServer);
 		fastify.register(this.oauth2ProviderService.createServer, { prefix: '/oauth' });
diff --git a/packages/backend/src/server/StripeHookServerService.ts b/packages/backend/src/server/StripeHookServerService.ts
index 9f3afc29dc..f23c64bcd5 100644
--- a/packages/backend/src/server/StripeHookServerService.ts
+++ b/packages/backend/src/server/StripeHookServerService.ts
@@ -41,7 +41,7 @@ export class StripeHookServerService {
 		request: FastifyRequest,
 		reply: FastifyReply,
 	) {
-		if (!this.config.stripeAgeCheck) return reply.code(400);
+		if (!this.config.stripeAgeCheck.enabled) return reply.code(400);
 
 		const stripe = new Stripe(this.config.stripeAgeCheck.key);
 
diff --git a/packages/backend/src/server/api/endpoints/stripe/create-verify-session.ts b/packages/backend/src/server/api/endpoints/stripe/create-verify-session.ts
index de42a3cda5..624e136005 100644
--- a/packages/backend/src/server/api/endpoints/stripe/create-verify-session.ts
+++ b/packages/backend/src/server/api/endpoints/stripe/create-verify-session.ts
@@ -53,7 +53,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private config: Config,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			if (!this.config.stripeAgeCheck?.enabled) throw new ApiError(meta.errors.stripeIsDisabled);
+			if (!this.config.stripeAgeCheck.enabled) throw new ApiError(meta.errors.stripeIsDisabled);
 			
 			const userProfile = await this.usersRepository.findOne({
 				where: {