From 8443380db3ce899a88325c98bb8e96d83edc2731 Mon Sep 17 00:00:00 2001
From: Jonathan Barrow <jonbarrow1998@gmail.com>
Date: Sat, 26 Aug 2023 02:07:25 -0400
Subject: [PATCH] grpc ListFiles now uses isValidCountryCode and
 isValidLanguage

---
 src/services/grpc/boss/list-files.ts | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/services/grpc/boss/list-files.ts b/src/services/grpc/boss/list-files.ts
index 5051f4f..8ad1bcb 100644
--- a/src/services/grpc/boss/list-files.ts
+++ b/src/services/grpc/boss/list-files.ts
@@ -1,17 +1,10 @@
 import { Status, ServerError } from 'nice-grpc';
 import { ListFilesRequest, ListFilesResponse } from '@pretendonetwork/grpc/boss/list_files';
+import { isValidCountryCode, isValidLanguage } from '@/util';
 import { getTaskFiles } from '@/database';
 
 const BOSS_APP_ID_FILTER_REGEX = /^[A-Za-z0-9]*$/;
 
-const VALID_COUNTRIES = [
-	'US', 'JP', 'CR'
-];
-
-const VALID_LANGUAGES = [
-	'en', 'ja'
-];
-
 export async function listFiles(request: ListFilesRequest): Promise<ListFilesResponse> {
 	const taskID = request.taskId.trim();
 	const bossAppID = request.bossAppId.trim();
@@ -34,11 +27,11 @@ export async function listFiles(request: ListFilesRequest): Promise<ListFilesRes
 		throw new ServerError(Status.INVALID_ARGUMENT, 'BOSS app ID must only contain letters and numbers');
 	}
 
-	if (country && !VALID_COUNTRIES.includes(country)) {
+	if (country && !isValidCountryCode(country)) {
 		throw new ServerError(Status.INVALID_ARGUMENT, `${country} is not a valid country`);
 	}
 
-	if (language && !VALID_LANGUAGES.includes(language)) {
+	if (language && !isValidLanguage(language)) {
 		throw new ServerError(Status.INVALID_ARGUMENT, `${language} is not a valid language`);
 	}