Merge main with paidevent

Author: EthM370

.devcontainer/devcontainer.json

@@ -6,9 +6,10 @@
 	"image": "mcr.microsoft.com/devcontainers/base:jammy",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {},
-    	"ghcr.io/devcontainers/features/aws-cli:1": {},
+    "ghcr.io/devcontainers/features/aws-cli:1": {},
 		"ghcr.io/jungaretti/features/make:1": {},
-    "ghcr.io/customink/codespaces-features/sam-cli:1": {}
+	  "ghcr.io/customink/codespaces-features/sam-cli:1": {},
+	  "ghcr.io/devcontainers/features/python:1": {}
 	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.

.github/workflows/deploy-dev.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -70,7 +70,7 @@ jobs:
 
   test-dev:
     runs-on: ubuntu-latest
-    name: Run Live Integration Tests
+    name: Run Live Tests
     needs:
       - deploy-dev
     concurrency:
@@ -80,13 +80,22 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
       - name: Set up Python 3.11 for testing
         uses: actions/setup-python@v5
         with:
           python-version: 3.11
+      - name: Run health check
+        run: make dev_health_check
       - name: Run live testing
         run: make test_live_integration
+        env:
+          JWT_KEY: ${{ secrets.JWT_KEY }}
+      - name: Run E2E testing
+        run: make test_e2e
+        env:
+          PLAYWRIGHT_USERNAME: ${{ secrets.PLAYWRIGHT_USERNAME }}
+          PLAYWRIGHT_PASSWORD: ${{ secrets.PLAYWRIGHT_PASSWORD }}

.github/workflows/deploy-prod.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -70,7 +70,7 @@ jobs:
 
   test-dev:
     runs-on: ubuntu-latest
-    name: Run Live Integration Tests
+    name: Run Live Tests
     needs:
       - deploy-dev
     concurrency:
@@ -80,7 +80,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -90,6 +90,13 @@ jobs:
           python-version: 3.11
       - name: Run live testing
         run: make test_live_integration
+        env:
+          JWT_KEY: ${{ secrets.JWT_KEY }}
+      - name: Run E2E testing
+        run: make test_e2e
+        env:
+          PLAYWRIGHT_USERNAME: ${{ secrets.PLAYWRIGHT_USERNAME }}
+          PLAYWRIGHT_PASSWORD: ${{ secrets.PLAYWRIGHT_PASSWORD }}
 
   deploy-prod:
     runs-on: ubuntu-latest
@@ -98,13 +105,13 @@ jobs:
       group: ${{ github.event.repository.name }}-prod
       cancel-in-progress: false
     needs:
-      - test
+      - test-dev
     environment: "AWS PROD"
     steps:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -147,7 +154,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"

.gitignore

@@ -137,3 +137,8 @@ dist_ui/
 
 *.pyc
 __pycache__
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+dist_devel/

.husky/pre-commit

@@ -1 +1,15 @@
-yarn lint --fix
+# Get all staged files
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACMR)
+
+if [ -n "$STAGED_FILES" ]; then
+  echo "Running lint with fix on staged files..."
+  # Run lint on all files (modifies files in the working directory)
+  yarn lint --fix
+  yarn prettier:write
+
+  echo "Re-adding originally staged files to the staging area..."
+  # Re-add only the originally staged files
+  echo "$STAGED_FILES" | xargs git add
+else
+  echo "No staged files to process."
+fi

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, ACM@UIUC
+Copyright (c) 2024-2025, ACM@UIUC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

Makefile

@@ -11,7 +11,7 @@ integration_test_directory_root = tests/live_integration/
 # CHANGE ME (as needed)
 application_key=infra-core-api
 application_name="InfraCoreApi"
-techlead="dsingh14@illinois.edu"
+techlead="tarasha2@illinois.edu"
 region="us-east-1"
 
 # DO NOT CHANGE
@@ -24,6 +24,8 @@ common_params = --no-confirm-changeset \
 				--s3-prefix $(application_key) \
 				--resolve-s3
 
+GIT_HASH := $(shell git rev-parse --short HEAD)
+
 .PHONY: build clean
 
 check_account_prod:
@@ -46,14 +48,17 @@ clean:
 	rm -rf src/ui/node_modules/
 	rm -rf dist/
 	rm -rf dist_ui/
+	rm -rf dist_devel/
 
 build: src/ cloudformation/ docs/
 	yarn -D
-	yarn build
+	VITE_BUILD_HASH=$(GIT_HASH) yarn build
+	cp -r src/api/resources/ dist/api/resources
+	rm -rf dist/lambda/sqs
 	sam build --template-file cloudformation/main.yml
 
 local:
-	yarn run dev
+	VITE_BUILD_HASH=$(GIT_HASH) yarn run dev
 
 deploy_prod: check_account_prod build
 	aws sts get-caller-identity --query Account --output text
@@ -62,18 +67,24 @@ deploy_prod: check_account_prod build
 deploy_dev: check_account_dev build
 	sam deploy $(common_params) --parameter-overrides $(run_env)=dev $(set_application_prefix)=$(application_key) $(set_application_name)="$(application_name)"
 
-install_test_deps:
+install:
 	yarn -D
+	pip install cfn-lint
 
-test_live_integration: install_test_deps
+test_live_integration: install
 	yarn test:live
 
-test_unit: install_test_deps
+test_unit: install
 	yarn typecheck
 	yarn lint
+	cfn-lint cloudformation/**/* --ignore-templates cloudformation/phony-swagger.yml
 	yarn prettier
 	yarn test:unit
 
+test_e2e: install
+	yarn playwright install
+	yarn test:e2e
+
 dev_health_check:
 	curl -f https://$(application_key).aws.qa.acmuiuc.org/api/v1/healthz && curl -f https://manage.qa.acmuiuc.org
 

README.md

@@ -1,5 +1,10 @@
 # ACM @ UIUC Core
-This repository is split into two:
+This repository is split into multiple parts:
 * `src/api/` for the API source code
 * `src/ui/` for the UI source code
-* `src/common/` for common modules between the two (such as types)
+* `src/common/` for common modules between the API and the UI (such as constants, types, errors, etc.)
+
+## Getting Started
+You will need node>=22 installed, as well as the AWS CLI and the AWS SAM CLI. The best way to work with all of this is to open the environment in a container within your IDE (VS Code should prompt you to do so: use "Clone in Container" for best performance). This container will have all needed software installed.
+
+Then, run `make install` to install all packages, and `make local` to start the UI and API servers! The UI will be accessible on `http://localhost:5173/` and the API on `http://localhost:8080/`.

cloudformation/custom-domain.yml

@@ -0,0 +1,50 @@
+Parameters:
+  GWCertArn:
+    Description: Certificate ARN
+    Type: String
+  GWBaseDomainName:
+    Description: Base domain name
+    Type: String
+  GWApiId:
+    Description: API ID
+    Type: String
+  GWHostedZoneId:
+    Description: Hosted Zone ID
+    Type: String
+  RunEnvironment:
+    Type: String
+    AllowedValues: [ 'dev', 'prod' ]
+  RecordName:
+    Type: String
+
+Conditions:
+  IsDev: !Equals [!Ref RunEnvironment, 'dev']
+
+Resources:
+  CustomDomainName:
+    Type: AWS::ApiGateway::DomainName
+    Properties:
+      RegionalCertificateArn: !Ref GWCertArn
+      EndpointConfiguration:
+        Types:
+          - REGIONAL
+      DomainName: !Sub "${RecordName}.${GWBaseDomainName}"
+      SecurityPolicy: TLS_1_2
+
+  CDApiMapping:
+    Type: 'AWS::ApiGatewayV2::ApiMapping'
+    Properties:
+      DomainName: !Ref CustomDomainName
+      ApiId: !Ref GWApiId
+      Stage: default
+
+  CDRoute53RecordSetDev:
+    Condition: IsDev
+    Type: AWS::Route53::RecordSet
+    Properties:
+      HostedZoneId: !Ref GWHostedZoneId
+      Name: !Sub "${RecordName}.${GWBaseDomainName}"
+      Type: A
+      AliasTarget:
+        DNSName: !GetAtt CustomDomainName.RegionalDomainName
+        HostedZoneId: !GetAtt CustomDomainName.RegionalHostedZoneId

cloudformation/iam.yml

@@ -10,10 +10,16 @@ Parameters:
   LambdaFunctionName:
     Type: String
     AllowedPattern: ^[a-zA-Z0-9]+[a-zA-Z0-9-]+[a-zA-Z0-9]+$
+  SesEmailDomain:
+    Type: String
+  SqsQueueArn:
+    Type: String
 Resources:
   ApiLambdaIAMRole:
     Type: AWS::IAM::Role
     Properties:
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole
       AssumeRolePolicyDocument:
         Version: '2012-10-17'
         Statement:
@@ -24,6 +30,29 @@ Resources:
             Service:
             - lambda.amazonaws.com
       Policies:
+      - PolicyDocument:
+          Version: '2012-10-17'
+          Statement:
+          - Action:
+            - ses:SendEmail
+            - ses:SendRawEmail
+            Effect: Allow
+            Resource: "*"
+            Condition:
+              StringEquals:
+                ses:FromAddress: !Sub "membership@${SesEmailDomain}"
+              ForAllValues:StringLike:
+                ses:Recipients:
+                  - "*@illinois.edu"
+        PolicyName: ses-membership
+      - PolicyDocument:
+          Version: '2012-10-17'
+          Statement:
+          - Action:
+            - sqs:SendMessage
+            Effect: Allow
+            Resource: !Ref SqsQueueArn
+        PolicyName: lambda-sqs
       - PolicyDocument:
           Version: '2012-10-17'
           Statement:
@@ -77,6 +106,8 @@ Resources:
                 - !Sub arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-iam-userroles/*
                 - !Sub arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-iam-grouproles
                 - !Sub arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-iam-grouproles/*
+                - !Sub arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-stripe-links
+                - !Sub arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/infra-core-api-stripe-links/*
 
         PolicyName: lambda-dynamo
 Outputs:
@@ -85,4 +116,4 @@ Outputs:
     Value:
       Fn::GetAtt:
       - ApiLambdaIAMRole
-      - Arn
+      - Arn