-
Notifications
You must be signed in to change notification settings - Fork 42
updates and cleanup #164
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
R44VC0RP
wants to merge
2
commits into
main
Choose a base branch
from
cleanup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
updates and cleanup #164
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { SendEmailCommand } from "@aws-sdk/client-sesv2"; | ||
| import type { TenantSendingInfo } from "@/lib/aws-ses/identity-arn-helper"; | ||
| import { extractEmailAddress } from "@/lib/utils/email-utils"; | ||
|
|
||
| /** | ||
| * Build a SendEmailCommand for SES with tenant-level tracking. | ||
| * Shared between handleScheduledEmail and handleBatchEmail. | ||
| */ | ||
| export function buildSesCommand(params: { | ||
| fromAddress: string; | ||
| toAddresses: string[]; | ||
| ccAddresses: string[]; | ||
| bccAddresses: string[]; | ||
| rawMessage: string; | ||
| tenantSendingInfo: TenantSendingInfo; | ||
| }): SendEmailCommand { | ||
| return new SendEmailCommand({ | ||
| FromEmailAddress: params.fromAddress, | ||
| ...(params.tenantSendingInfo.identityArn && { | ||
| FromEmailAddressIdentityArn: params.tenantSendingInfo.identityArn, | ||
| }), | ||
| Destination: { | ||
| ToAddresses: params.toAddresses.map(extractEmailAddress), | ||
| CcAddresses: | ||
| params.ccAddresses.length > 0 | ||
| ? params.ccAddresses.map(extractEmailAddress) | ||
| : undefined, | ||
| BccAddresses: | ||
| params.bccAddresses.length > 0 | ||
| ? params.bccAddresses.map(extractEmailAddress) | ||
| : undefined, | ||
| }, | ||
| Content: { | ||
| Raw: { | ||
| Data: Buffer.from(params.rawMessage), | ||
| }, | ||
| }, | ||
| ...(params.tenantSendingInfo.configurationSetName && { | ||
| ConfigurationSetName: params.tenantSendingInfo.configurationSetName, | ||
| }), | ||
| ...(params.tenantSendingInfo.tenantName && { | ||
| TenantName: params.tenantSendingInfo.tenantName, | ||
| }), | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import { | ||
| getAgentIdentityArn, | ||
| getTenantSendingInfoForDomainOrParent, | ||
| type TenantSendingInfo, | ||
| } from "@/lib/aws-ses/identity-arn-helper"; | ||
| import { getRootDomain, isSubdomain } from "@/lib/domains-and-dns/domain-utils"; | ||
|
|
||
| /** | ||
| * Resolve tenant sending info (identity ARN, configuration set, tenant name) | ||
| * for a given user/domain/agent combination. Shared between handleScheduledEmail | ||
| * and handleBatchEmail. | ||
| */ | ||
| export async function resolveTenantInfo( | ||
| userId: string, | ||
| fromDomain: string, | ||
| isAgentEmail: boolean, | ||
| label: string, | ||
| ): Promise<TenantSendingInfo> { | ||
| let tenantSendingInfo: TenantSendingInfo = { | ||
| identityArn: null, | ||
| configurationSetName: null, | ||
| tenantName: null, | ||
| }; | ||
|
|
||
| if (isAgentEmail) { | ||
| tenantSendingInfo = { | ||
| identityArn: getAgentIdentityArn(), | ||
| configurationSetName: null, | ||
| tenantName: null, | ||
| }; | ||
| } else { | ||
| const parentDomain = isSubdomain(fromDomain) | ||
| ? getRootDomain(fromDomain) | ||
| : undefined; | ||
| tenantSendingInfo = await getTenantSendingInfoForDomainOrParent( | ||
| userId, | ||
| fromDomain, | ||
| parentDomain || undefined, | ||
| ); | ||
| } | ||
|
|
||
| if (tenantSendingInfo.identityArn) { | ||
| console.log( | ||
| `🏢 Using SourceArn for ${label} tenant tracking: ${tenantSendingInfo.identityArn}`, | ||
| ); | ||
| } else { | ||
| console.warn( | ||
| `⚠️ No SourceArn available - ${label} will not be tracked at tenant level`, | ||
| ); | ||
| } | ||
|
|
||
| if (tenantSendingInfo.configurationSetName) { | ||
| console.log( | ||
| `📋 Using ConfigurationSet for ${label} tenant tracking: ${tenantSendingInfo.configurationSetName}`, | ||
| ); | ||
| } else { | ||
| console.warn( | ||
| `⚠️ No ConfigurationSet available - ${label} metrics may not be tracked correctly`, | ||
| ); | ||
| } | ||
|
|
||
| if (tenantSendingInfo.tenantName) { | ||
| console.log( | ||
| `🏠 Using TenantName for ${label} AWS SES tracking: ${tenantSendingInfo.tenantName}`, | ||
| ); | ||
| } else { | ||
| console.warn( | ||
| `⚠️ No TenantName available - ${label} will NOT appear in tenant dashboard!`, | ||
| ); | ||
| } | ||
|
|
||
| return tenantSendingInfo; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Incomplete
userIdtoreferenceIdmigration breaks API authHigh Severity
The migration from
better-auth/pluginsto@better-auth/api-key@^1.5.0renameskey.userIdtokey.referenceIdin theverifyApiKeyresponse. Two auth files were updated, butapp/api/e2/helper/main.ts(line 77–80) still readsapiKeyResult.key.userId, which will now beundefined. This causes thevalidateRequestfunction (used byapp/api/internal/search/route.ts) to silently reject all valid API key authentications with a 401 "Unauthorized" error.Additional Locations (2)
lib/auth/v2-auth.ts#L164-L166package.json#L58-L59