bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-06 00:03:34 +00:00
Code Issues Releases Wiki Activity

PM-23761 added greeting and salutations

Browse Source
This commit is contained in:
voommen-livefront
2025-09-11 10:01:43 -05:00
parent bd6c34b394
commit e2c5dcc91e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Billing/BillingSettings.cs
View File

@@ -36,7 +36,8 @@ public class BillingSettings
public virtual string OrgFieldName { get; set; }
public virtual bool RemoveNewlinesInReplies { get; set; } = false;
public virtual string AutoReplyFooter { get; set; } = string.Empty;
public virtual string AutoReplyGreeting { get; set; } = string.Empty;
public virtual string AutoReplySalutation { get; set; } = string.Empty;
}
public class OnyxSettings

4
src/Billing/Controllers/FreshdeskController.cs
View File

@@ -194,7 +194,7 @@ public class FreshdeskController : Controller
// eventually, we will merge both endpoints into one webhook for Freshdesk
// ensure that the key is from Freshdesk
if (!IsValidRequestFromFreshdesk(key))
if (!IsValidRequestFromFreshdesk(key) || !ModelState.IsValid)
{
return new BadRequestResult();
}
@@ -305,7 +305,7 @@ public class FreshdeskController : Controller
var replyBody = new FreshdeskReplyRequestModel
{
Body = $"{note}{_billingSettings.FreshDesk.AutoReplyFooter}",
Body = $"{_billingSettings.FreshDesk.AutoReplyGreeting}{note}{_billingSettings.FreshDesk.AutoReplySalutation}",
};
var replyRequest = new HttpRequestMessage(HttpMethod.Post,

3
src/Billing/appsettings.json
View File

@@ -74,7 +74,8 @@
"userFieldName": "cf_user",
"orgFieldName": "cf_org",
"removeNewlinesInReplies": true,
"autoReplyFooter": "<br /><small><i>2024 Bitwarden</i></small>"
"autoReplyGreeting": "Greetings,<br />",
"autoReplySalutation": "<br /><p>Regards,<br />CS Team</p>"
},
"onyx": {
"apiKey": "on_tenant_i-16a83ec44869babc4.aDffNn2k4UvtRt_9KdlV_3lfjiLFdOe4mdAiE3jJb4thWUGURVETwFg1Xrtg5rwLvfqfcw_F6U0V87arVkARd7qHQxmL5vaC4k8gPxh3hTKJKEE7Rkc3BJHOSAiT-leINjWvj44hpIuTRcWazz_zafZi-_D6123wplCb3PG6UtiGlyxcK8FJCZKp9IEM4UTTYXUHc7nWUVZuhiREGPd5J7T8LIWoenfkSJ1Vhi2PoLDI6msMOLfSGuLT_Ma_pJZl",