Use custom domains in emails (invites, alerts, reports) and public UR…

…Ls (#5515)
rilldata · Aug 26, 2024 · 284a905 · 284a905
1 parent a8e33f3
commit 284a905
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/admin/server/alerts.go b/admin/server/alerts.go
@@ -82,8 +82,8 @@ func (s *Server) GetAlertMeta(ctx context.Context, req *adminv1.GetAlertMetaRequ
 	}
 
 	return &adminv1.GetAlertMetaResponse{
-		OpenUrl:            s.admin.URLs.AlertOpen(org.Name, proj.Name, req.Alert),
-		EditUrl:            s.admin.URLs.AlertEdit(org.Name, proj.Name, req.Alert),
+		OpenUrl:            s.admin.URLs.WithCustomDomain(org.CustomDomain).AlertOpen(org.Name, proj.Name, req.Alert),
+		EditUrl:            s.admin.URLs.WithCustomDomain(org.CustomDomain).AlertEdit(org.Name, proj.Name, req.Alert),
 		QueryForAttributes: attrPB,
 	}, nil
 }

diff --git a/admin/server/magic_tokens.go b/admin/server/magic_tokens.go
@@ -37,6 +37,11 @@ func (s *Server) IssueMagicAuthToken(ctx context.Context, req *adminv1.IssueMagi
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
+	org, err := s.admin.DB.FindOrganization(ctx, proj.OrganizationID)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to find organization for project: %v", err.Error())
+	}
+
 	claims := auth.GetClaims(ctx)
 	projPerms := claims.ProjectPermissions(ctx, proj.OrganizationID, proj.ID)
 	if !projPerms.CreateMagicAuthTokens {
@@ -92,7 +97,7 @@ func (s *Server) IssueMagicAuthToken(ctx context.Context, req *adminv1.IssueMagi
 	tokenStr := token.Token().String()
 	return &adminv1.IssueMagicAuthTokenResponse{
 		Token: tokenStr,
-		Url:   s.admin.URLs.MagicAuthTokenOpen(req.Organization, req.Project, tokenStr),
+		Url:   s.admin.URLs.WithCustomDomain(org.CustomDomain).MagicAuthTokenOpen(req.Organization, req.Project, tokenStr),
 	}, nil
 }
 

diff --git a/admin/server/organizations.go b/admin/server/organizations.go
@@ -552,7 +552,7 @@ func (s *Server) AddOrganizationMemberUser(ctx context.Context, req *adminv1.Add
 		err = s.admin.Email.SendOrganizationInvite(&email.OrganizationInvite{
 			ToEmail:       req.Email,
 			ToName:        "",
-			AcceptURL:     s.admin.URLs.OrganizationInviteAccept(org.Name),
+			AcceptURL:     s.admin.URLs.WithCustomDomain(org.CustomDomain).OrganizationInviteAccept(org.Name),
 			OrgName:       org.Name,
 			RoleName:      role.Name,
 			InvitedByName: invitedByName,
@@ -601,7 +601,7 @@ func (s *Server) AddOrganizationMemberUser(ctx context.Context, req *adminv1.Add
 	err = s.admin.Email.SendOrganizationAddition(&email.OrganizationAddition{
 		ToEmail:       req.Email,
 		ToName:        "",
-		OpenURL:       s.admin.URLs.Organization(org.Name),
+		OpenURL:       s.admin.URLs.WithCustomDomain(org.CustomDomain).Organization(org.Name),
 		OrgName:       org.Name,
 		RoleName:      role.Name,
 		InvitedByName: invitedByName,

diff --git a/admin/server/projects.go b/admin/server/projects.go
@@ -801,7 +801,7 @@ func (s *Server) AddProjectMemberUser(ctx context.Context, req *adminv1.AddProje
 		err = s.admin.Email.SendProjectInvite(&email.ProjectInvite{
 			ToEmail:       req.Email,
 			ToName:        "",
-			AcceptURL:     s.admin.URLs.ProjectInviteAccept(org.Name, proj.Name),
+			AcceptURL:     s.admin.URLs.WithCustomDomain(org.CustomDomain).ProjectInviteAccept(org.Name, proj.Name),
 			OrgName:       org.Name,
 			ProjectName:   proj.Name,
 			RoleName:      role.Name,
@@ -825,7 +825,7 @@ func (s *Server) AddProjectMemberUser(ctx context.Context, req *adminv1.AddProje
 	err = s.admin.Email.SendProjectAddition(&email.ProjectAddition{
 		ToEmail:       req.Email,
 		ToName:        "",
-		OpenURL:       s.admin.URLs.Project(org.Name, proj.Name),
+		OpenURL:       s.admin.URLs.WithCustomDomain(org.CustomDomain).Project(org.Name, proj.Name),
 		OrgName:       org.Name,
 		ProjectName:   proj.Name,
 		RoleName:      role.Name,
@@ -1049,8 +1049,8 @@ func (s *Server) RequestProjectAccess(ctx context.Context, req *adminv1.RequestP
 			Email:       user.Email,
 			OrgName:     org.Name,
 			ProjectName: proj.Name,
-			ApproveLink: s.admin.URLs.ApproveProjectAccess(org.Name, proj.Name, accessReq.ID),
-			DenyLink:    s.admin.URLs.DenyProjectAccess(org.Name, proj.Name, accessReq.ID),
+			ApproveLink: s.admin.URLs.WithCustomDomain(org.CustomDomain).ApproveProjectAccess(org.Name, proj.Name, accessReq.ID),
+			DenyLink:    s.admin.URLs.WithCustomDomain(org.CustomDomain).DenyProjectAccess(org.Name, proj.Name, accessReq.ID),
 		})
 		if err != nil {
 			return nil, status.Error(codes.Internal, err.Error())
@@ -1139,7 +1139,7 @@ func (s *Server) ApproveProjectAccess(ctx context.Context, req *adminv1.ApproveP
 	err = s.admin.Email.SendProjectAccessGranted(&email.ProjectAccessGranted{
 		ToEmail:     user.Email,
 		ToName:      user.DisplayName,
-		OpenURL:     s.admin.URLs.Project(org.Name, proj.Name),
+		OpenURL:     s.admin.URLs.WithCustomDomain(org.CustomDomain).Project(org.Name, proj.Name),
 		OrgName:     org.Name,
 		ProjectName: proj.Name,
 	})

diff --git a/admin/server/reports.go b/admin/server/reports.go
@@ -57,9 +57,9 @@ func (s *Server) GetReportMeta(ctx context.Context, req *adminv1.GetReportMetaRe
 	}
 
 	return &adminv1.GetReportMetaResponse{
-		OpenUrl:   s.admin.URLs.ReportOpen(org.Name, proj.Name, req.Report, req.ExecutionTime.AsTime()),
-		ExportUrl: s.admin.URLs.ReportExport(org.Name, proj.Name, req.Report),
-		EditUrl:   s.admin.URLs.ReportEdit(org.Name, proj.Name, req.Report),
+		OpenUrl:   s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportOpen(org.Name, proj.Name, req.Report, req.ExecutionTime.AsTime()),
+		ExportUrl: s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportExport(org.Name, proj.Name, req.Report),
+		EditUrl:   s.admin.URLs.WithCustomDomain(org.CustomDomain).ReportEdit(org.Name, proj.Name, req.Report),
 	}, nil
 }
 

diff --git a/proto/rill/admin/v1/api.proto b/proto/rill/admin/v1/api.proto
@@ -2067,7 +2067,7 @@ message Project {
   string prod_olap_dsn = 11;
   int64 prod_slots = 12;
   string prod_deployment_id = 13;
-  string frontend_url = 16;
+  string frontend_url = 16; // Note: Does NOT incorporate the parent org's custom domain.
   int64 prod_ttl_seconds = 18;
   map<string, string> annotations = 20;
   string prod_version = 21;