rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source 
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
Émile Ré
2025-12-11 15:43:58 +01:00
parent 5c41a5bdb1
commit df9a425452
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/emails/src/TrustCenterDocumentAccessRejected.tsx
View File

@@ -4,7 +4,7 @@ import EmailLayout, { bodyText } from './components/EmailLayout';
export const TrustCenterDocumentAccessRejected = () => { export const TrustCenterDocumentAccessRejected = () => {
return ( return (
<EmailLayout subject={`Trust Center Access Invitation - ${'{{.OrganizationName}}'}`} organizationName={'{{.OrganizationName}}'}> <EmailLayout subject={`Trust Center Document Access Rejected - ${'{{.OrganizationName}}'}`}>
<Text style={bodyText}> <Text style={bodyText}>
Your access request to the following files in <strong>{'{{.OrganizationName}}'}</strong>'s Trust Center has been rejected: Your access request to the following files in <strong>{'{{.OrganizationName}}'}</strong>'s Trust Center has been rejected:
</Text> </Text>

2
packages/emails/src/components/EmailLayout.tsx
View File

@@ -16,13 +16,11 @@ import { ProboLogo } from './ProboLogo';
interface EmailLayoutProps { interface EmailLayoutProps {
subject: string; subject: string;
children: React.ReactNode; children: React.ReactNode;
organizationName?: string;
} }
export const EmailLayout = ({ export const EmailLayout = ({
subject, subject,
children, children,
organizationName,
}: EmailLayoutProps) => { }: EmailLayoutProps) => {
return ( return (
<Html lang="en"> <Html lang="en">

4
pkg/coredata/migrations/20251205T000000Z.sql
View File

@@ -25,3 +25,7 @@ ALTER COLUMN
status status
SET SET
NOT NULL; NOT NULL;
ALTER TABLE
trust_center_document_accesses DROP COLUMN active,
DROP COLUMN requested;

1
pkg/coredata/trust_center_document_access.go
View File

@@ -393,7 +393,6 @@ FROM
WHERE WHERE
%s %s
AND trust_center_access_id = @trust_center_access_id AND trust_center_access_id = @trust_center_access_id
AND requested = true
AND status = 'REQUESTED'::trust_center_document_access_status AND status = 'REQUESTED'::trust_center_document_access_status
` `

6
pkg/server/api/trust/v1/slack_handler.go
View File

@@ -176,9 +176,9 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo
} }
if strings.HasPrefix(action.ActionID, "accept_") { if strings.HasPrefix(action.ActionID, "accept_") {
statusAction = "accept" statusAction = StatusAccept
} else { } else {
statusAction = "reject" statusAction = StatusReject
} }
} else { } else {
var gID gid.GID var gID gid.GID
@@ -256,7 +256,7 @@ func slackHandler(trustSvc *trust.Service, slackSigningSecret string, logger *lo
return return
} }
default: 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"}) httpserver.RenderJSON(w, http.StatusInternalServerError, SlackInteractiveResponse{Success: false, Message: "internal server error"})
return return
} }