Merge pull request #123 from binaryoverload/dev

src/config-manager.ts

@@ -56,7 +56,9 @@ export const config: Config = {
 	s3: {
 		endpoint: process.env.PN_ACT_CONFIG_S3_ENDPOINT || '',
 		key: process.env.PN_ACT_CONFIG_S3_ACCESS_KEY || '',
-		secret: process.env.PN_ACT_CONFIG_S3_ACCESS_SECRET || ''
+		secret: process.env.PN_ACT_CONFIG_S3_ACCESS_SECRET || '',
+		region: process.env.PN_ACT_CONFIG_S3_REGION || '',
+		forcePathStyle: process.env.PN_ACT_CONFIG_S3_FORCE_PATH_STYLE === 'true'
 	},
 	hcaptcha: {
 		secret: process.env.PN_ACT_CONFIG_HCAPTCHA_SECRET || ''
@@ -195,6 +197,11 @@ if (!config.s3.secret) {
 	disabledFeatures.s3 = true;
 }
 
+if (!config.s3.region) {
+	LOG_WARN('Failed to find S3 region config. Disabling feature. To enable feature set the PN_ACT_CONFIG_S3_REGION environment variable');
+	disabledFeatures.s3 = true;
+}
+
 if (!config.server_environment) {
 	LOG_WARN('Failed to find server environment. To change the environment, set the PN_ACT_CONFIG_SERVER_ENVIRONMENT environment variable. Defaulting to prod');
 	config.server_environment = 'prod';

src/services/api/routes/v1/register.ts

@@ -345,15 +345,16 @@ router.post('/', async (request: express.Request, response: express.Response): P
 		await pnid.save({ session });
 
 		await session.commitTransaction();
-	} catch (error) {
+	} catch (error: any) {
 		LOG_ERROR('[POST] /v1/register: ' + error);
+		if (error.stack) console.error(error.stack);
 
 		await session.abortTransaction();
 
-		response.status(400).json({
+		response.status(500).json({
 			app: 'api',
-			status: 400,
-			error: 'Password must have combination of letters, numbers, and/or punctuation characters'
+			status: 500,
+			error: 'Internal server error'
 		});
 
 		return;

src/types/common/config.ts

@@ -30,6 +30,8 @@ export interface Config {
 		endpoint: string;
 		key: string;
 		secret: string;
+		region: string;
+		forcePathStyle: boolean;
 	};
 	hcaptcha: {
 		secret: string;

src/util.ts

@@ -20,6 +20,8 @@ let s3: S3;
 if (!disabledFeatures.s3) {
 	s3 = new S3({
 		endpoint: config.s3.endpoint,
+		forcePathStyle: config.s3.forcePathStyle,
+		region: config.s3.region,
 
 		credentials: {
 			accessKeyId: config.s3.key,