diff --git a/packages/emails/src/TrustCenterDocumentAccessRejected.tsx b/packages/emails/src/TrustCenterDocumentAccessRejected.tsx index e363b011f..e12811af5 100644 --- a/packages/emails/src/TrustCenterDocumentAccessRejected.tsx +++ b/packages/emails/src/TrustCenterDocumentAccessRejected.tsx @@ -4,7 +4,7 @@ import EmailLayout, { bodyText } from './components/EmailLayout'; export const TrustCenterDocumentAccessRejected = () => { return ( - + Your access request to the following files in {'{{.OrganizationName}}'}'s Trust Center has been rejected: diff --git a/packages/emails/src/components/EmailLayout.tsx b/packages/emails/src/components/EmailLayout.tsx index 38226df02..5ad4f1215 100644 --- a/packages/emails/src/components/EmailLayout.tsx +++ b/packages/emails/src/components/EmailLayout.tsx @@ -16,13 +16,11 @@ import { ProboLogo } from './ProboLogo'; interface EmailLayoutProps { subject: string; children: React.ReactNode; - organizationName?: string; } export const EmailLayout = ({ subject, children, - organizationName, }: EmailLayoutProps) => { return ( diff --git a/pkg/coredata/migrations/20251205T000000Z.sql b/pkg/coredata/migrations/20251205T000000Z.sql index 247315f37..5aa4cb648 100644 --- a/pkg/coredata/migrations/20251205T000000Z.sql +++ b/pkg/coredata/migrations/20251205T000000Z.sql @@ -25,3 +25,7 @@ ALTER COLUMN status SET NOT NULL; + +ALTER TABLE + trust_center_document_accesses DROP COLUMN active, + DROP COLUMN requested; diff --git a/pkg/coredata/trust_center_document_access.go b/pkg/coredata/trust_center_document_access.go index 88f356fac..ddc9618ce 100644 --- a/pkg/coredata/trust_center_document_access.go +++ b/pkg/coredata/trust_center_document_access.go @@ -393,7 +393,6 @@ FROM WHERE %s AND trust_center_access_id = @trust_center_access_id - AND requested = true AND status = 'REQUESTED'::trust_center_document_access_status ` diff --git a/pkg/server/api/trust/v1/slack_handler.go b/pkg/server/api/trust/v1/slack_handler.go index 2a6edecef..249d57441 100644 --- a/pkg/server/api/trust/v1/slack_handler.go +++ b/pkg/server/api/trust/v1/slack_handler.go @@ -176,9 +176,9 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo } if strings.HasPrefix(action.ActionID, "accept_") { - statusAction = "accept" + statusAction = StatusAccept } else { - statusAction = "reject" + statusAction = StatusReject } } else { var gID gid.GID @@ -256,7 +256,7 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo return } default: - logger.ErrorCtx(ctx, "unknown status action access", log.Error(err)) + logger.ErrorCtx(ctx, "unknown status action", log.String("status_action", statusAction)) httpserver.RenderJSON(w, http.StatusInternalServerError, SlackInteractiveResponse{Success: false, Message: "internal server error"}) return }