diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java index 404a7b94..7c3570ac 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java @@ -258,14 +258,14 @@ public static void main(String[] args) throws Exception { OrgMessageSender sender = new OrgMessageSender(mdSupplier, sendMsg.get()); Optional togaKeyStr = GetEnv("TOGA_CLIENT_KEYS"); - List jurisdictions = + List tylerJurisdictions = GetEnv("TYLER_JURISDICTIONS") .map(j -> Stream.of(j.split(" "))) .orElse(Stream.empty()) .map(Jurisdiction::parse) .toList(); List togaKeys = List.of(togaKeyStr.orElse("").split(" ")); - if (jurisdictions.size() > 0 && jurisdictions.size() != togaKeys.size()) { + if (tylerJurisdictions.size() > 0 && tylerJurisdictions.size() != togaKeys.size()) { log.error("TOGA_CLIENT_KEYS list should be same size as TYLER_JURISDICTIONS list."); throw new RuntimeException("TOGA_CLIENT_KEYS and TYLER_JURISDICTION mismatch"); } @@ -276,8 +276,8 @@ public static void main(String[] args) throws Exception { codesUpdateTime = LocalTime.parse(time); List modules = new ArrayList<>(); - for (int idx = 0; idx < jurisdictions.size(); idx++) { - var jurisdiction = jurisdictions.get(idx); + for (int idx = 0; idx < tylerJurisdictions.size(); idx++) { + var jurisdiction = tylerJurisdictions.get(idx); TylerModuleSetup.create( jurisdiction, togaKeys.get(idx), @@ -308,6 +308,9 @@ public static void main(String[] args) throws Exception { } log.info("Starting Server with the following Filers: {}", modules); + List jurisdictions = new ArrayList<>(); + jurisdictions.addAll(tylerJurisdictions); + jurisdictions.addAll(tfJurisdictions); Supplier ldSupplier = () -> LoginDatabase.fromDS(userDs); SecurityHub security = new SecurityHub(ldSupplier, jurisdictions); EfspServer server = new EfspServer(codeDs, userDs, sender, modules, security, converterMap); diff --git a/scripts/fly_create_qa_api_key.sh b/scripts/fly_create_qa_api_key.sh new file mode 100755 index 00000000..9d773901 --- /dev/null +++ b/scripts/fly_create_qa_api_key.sh @@ -0,0 +1,3 @@ +echo "Who will be using this API key? This value will be stored in the server_name field (so no spaces)." +read server_name +fly console --config fly.qa.toml --debug --verbose --vm-size shared-cpu-2x --vm-memory 4096 --command "java -cp /app/efspserver-with-deps.jar edu.suffolk.litlab.efsp.db.LoginDatabase \"$server_name\" true"