@friggframework/devtools 2.0.0-next.26 → 2.0.0-next.28

package/infrastructure/serverless-template.js

@@ -292,6 +292,13 @@ const createVPCInfrastructure = (AppDefinition) => {
                         CidrIp: '0.0.0.0/0',
                         Description: 'HTTP outbound'
                     },
+                     {
+                         IpProtocol: 'tcp',
+                         FromPort: 27017,
+                         ToPort: 27017,
+                         CidrIp: '0.0.0.0/0',
+                         Description: 'MongoDB Atlas TLS outbound'
+                     },
                     {
                         IpProtocol: 'tcp',
                         FromPort: 53,
@@ -419,9 +426,9 @@ const composeServerlessDefinition = (AppDefinition) => {
             runtime: 'nodejs20.x',
             timeout: 30,
             region: 'us-east-1',
-            stage: '${opt:stage}',
+            stage: '${opt:stage, "dev"}',
             environment: {
-                STAGE: '${opt:stage}',
+                STAGE: '${opt:stage, "dev"}',
                 AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1,
             },
             iamRoleStatements: [
@@ -455,6 +462,17 @@ const composeServerlessDefinition = (AppDefinition) => {
                     ],
                 }
             ],
+            httpApi: {
+                payload: '2.0',
+                cors: {
+                    allowedOrigins: ['*'],
+                    allowedHeaders: ['*'],
+                    allowedMethods: ['*'],
+                    allowCredentials: false,
+                },
+                name: '${opt:stage, "dev"}-${self:service}',
+                disableDefaultEndpoint: false,
+            }
         },
         plugins: [
             'serverless-jetpack',
@@ -507,24 +525,21 @@ const composeServerlessDefinition = (AppDefinition) => {
                 handler: 'node_modules/@friggframework/core/handlers/routers/auth.handler',
                 events: [
                     {
-                        http: {
+                        httpApi: {
                             path: '/api/integrations',
                             method: 'ANY',
-                            cors: true,
                         },
                     },
                     {
-                        http: {
+                        httpApi: {
                             path: '/api/integrations/{proxy+}',
                             method: 'ANY',
-                            cors: true,
                         },
                     },
                     {
-                        http: {
+                        httpApi: {
                             path: '/api/authorize',
                             method: 'ANY',
-                            cors: true,
                         },
                     },
                 ],
@@ -533,10 +548,9 @@ const composeServerlessDefinition = (AppDefinition) => {
                 handler: 'node_modules/@friggframework/core/handlers/routers/user.handler',
                 events: [
                     {
-                        http: {
+                        httpApi: {
                             path: '/user/{proxy+}',
                             method: 'ANY',
-                            cors: true,
                         },
                     },
                 ],
@@ -545,17 +559,15 @@ const composeServerlessDefinition = (AppDefinition) => {
                 handler: 'node_modules/@friggframework/core/handlers/routers/health.handler',
                 events: [
                     {
-                        http: {
+                        httpApi: {
                             path: '/health',
                             method: 'GET',
-                            cors: true,
                         },
                     },
                     {
-                        http: {
+                        httpApi: {
                             path: '/health/{proxy+}',
                             method: 'GET',
-                            cors: true,
                         },
                     },
                 ],
@@ -633,16 +645,12 @@ const composeServerlessDefinition = (AppDefinition) => {
                         AlarmActions: [{ Ref: 'InternalErrorBridgeTopic' }],
                         Dimensions: [
                             {
-                                Name: 'ApiName',
-                                Value: {
-                                    'Fn::Join': [
-                                        '-',
-                                        [
-                                            '${self:provider.stage}',
-                                            '${self:service}',
-                                        ],
-                                    ],
-                                },
+                                Name: 'ApiId',
+                                Value: { Ref: 'HttpApi' },
+                            },
+                            {
+                                Name: 'Stage',
+                                Value: '${self:provider.stage}',
                             },
                         ],
                     },
@@ -651,28 +659,95 @@ const composeServerlessDefinition = (AppDefinition) => {
         },
     };
 
+    // Configure BASE_URL based on custom domain or API Gateway
+    if (process.env.CUSTOM_DOMAIN) {
+        
+        // Configure custom domain
+        definition.custom.customDomain = {
+            domainName: process.env.CUSTOM_DOMAIN,
+            basePath: process.env.CUSTOM_BASE_PATH || '',
+            stage: '${opt:stage, "dev"}',
+            createRoute53Record: process.env.CREATE_ROUTE53_RECORD !== 'false', // Default true
+            certificateName: process.env.CERTIFICATE_NAME || process.env.CUSTOM_DOMAIN,
+            endpointType: process.env.ENDPOINT_TYPE || 'edge', // edge, regional, or private
+            securityPolicy: process.env.SECURITY_POLICY || 'tls_1_2',
+            apiType: 'http',
+            autoDomain: process.env.AUTO_DOMAIN === 'true', // Auto create domain if it doesn't exist
+        };
+        
+        // Set BASE_URL to custom domain
+        definition.provider.environment.BASE_URL = `https://${process.env.CUSTOM_DOMAIN}`;
+    } else {
+        // Default BASE_URL using API Gateway generated URL
+        // For HTTP API, don't include stage as it uses $default behavior
+        definition.provider.environment.BASE_URL = {
+            'Fn::GetAtt': ['HttpApi', 'ApiEndpoint']
+        };
+    }
+    
+    // REDIRECT_PATH is required for OAuth integrations
+    if (!process.env.REDIRECT_PATH) {
+        throw new Error(
+            'REDIRECT_PATH environment variable is required. ' +
+            'Please set REDIRECT_PATH in your .env file (e.g., REDIRECT_PATH=/oauth/callback)'
+        );
+    }
+    
+    // Set REDIRECT_URI based on domain configuration
+    if (process.env.CUSTOM_DOMAIN) {
+        definition.provider.environment.REDIRECT_URI = `https://${process.env.CUSTOM_DOMAIN}${process.env.REDIRECT_PATH}`;
+    } else {
+        definition.provider.environment.REDIRECT_URI = {
+            'Fn::Join': [
+                '',
+                [
+                    { 'Fn::GetAtt': ['HttpApi', 'ApiEndpoint'] },
+                    process.env.REDIRECT_PATH,
+                ],
+            ],
+        };
+    }
+    
+    // Add REDIRECT_URI to CloudFormation outputs
+    definition.resources.Outputs = {
+        RedirectURI: {
+            Description: 'OAuth Redirect URI to register with providers',
+            Value: definition.provider.environment.REDIRECT_URI,
+        },
+    };
+
     // KMS Configuration based on App Definition
     if (AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption === true) {
-        // Add KMS IAM permissions
+        // Provision a dedicated KMS key and wire it automatically
+        definition.resources.Resources.FriggKMSKey = {
+            Type: 'AWS::KMS::Key',
+            Properties: {
+                EnableKeyRotation: true,
+                KeyPolicy: {
+                    Version: '2012-10-17',
+                    Statement: [
+                        {
+                            Sid: 'AllowRootAccountAdmin',
+                            Effect: 'Allow',
+                            Principal: { AWS: { 'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:root' } },
+                            Action: 'kms:*',
+                            Resource: '*'
+                        }
+                    ]
+                }
+            }
+        };
+
         definition.provider.iamRoleStatements.push({
             Effect: 'Allow',
-            Action: [
-                'kms:GenerateDataKey',
-                'kms:Decrypt'
-            ],
-            Resource: ['${self:custom.kmsGrants.kmsKeyId}']
+            Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
+            Resource: [{ 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }]
         });
 
-        // Add KMS_KEY_ARN environment variable for Frigg Encrypt module
-        definition.provider.environment.KMS_KEY_ARN = '${self:custom.kmsGrants.kmsKeyId}';
+        definition.provider.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
 
-        // Add serverless-kms-grants plugin
         definition.plugins.push('serverless-kms-grants');
-
-        // Configure KMS grants with default key
-        definition.custom.kmsGrants = {
-            kmsKeyId: '*'
-        };
+        definition.custom.kmsGrants = { kmsKeyId: { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] } };
     }
 
     // VPC Configuration based on App Definition
@@ -729,10 +804,9 @@ const composeServerlessDefinition = (AppDefinition) => {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             events: [
                 {
-                    http: {
+                    httpApi: {
                         path: `/api/${integrationName}-integration/{proxy+}`,
                         method: 'ANY',
-                        cors: true,
                     },
                 },
             ],
@@ -792,4 +866,4 @@ const composeServerlessDefinition = (AppDefinition) => {
     return definition;
 };
 
-module.exports = { composeServerlessDefinition };
+module.exports = { composeServerlessDefinition };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.26",
+  "version": "2.0.0-next.28",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0-next.26",
+    "@friggframework/test": "2.0.0-next.28",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -27,8 +27,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.26",
-    "@friggframework/prettier-config": "2.0.0-next.26",
+    "@friggframework/eslint-config": "2.0.0-next.28",
+    "@friggframework/prettier-config": "2.0.0-next.28",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9b9a6cf25e458ec0033c7f4e4ee1f2128b81599e"
+  "gitHead": "3c830c9e559a1ed9b8a2b2de885cd5984649e2fb"
 }