diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json
index b238add21..810415ffb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/helpers/timezones.json
@@ -86,7 +86,7 @@
"Riyadh (GMT+03:00)": "Asia/Riyadh",
"Nairobi (GMT+03:00)": "Africa/Nairobi",
"Baghdad (GMT+03:00)": "Asia/Baghdad",
- "Tehran (GMT+04:30)": "Asia/Tehran",
+ "Tehran (GMT+03:30)": "Asia/Tehran",
"Abu Dhabi (GMT+04:00)": "Asia/Muscat",
"Muscat (GMT+04:00)": "Asia/Muscat",
"Baku (GMT+04:00)": "Asia/Baku",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue
new file mode 100644
index 000000000..0ac35c9e2
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/Index.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlAttributeMap.vue b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlAttributeMap.vue
new file mode 100644
index 000000000..442b426df
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlAttributeMap.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ {{ t('SECURITY_SETTINGS.SAML.ATTRIBUTE_MAPPING.TITLE') }}
+
+
+
+
+
+
+ {{ t('SECURITY_SETTINGS.SAML.ATTRIBUTE_MAPPING.DESCRIPTION') }}
+
+
+
+ emailfirst_namelast_name
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlInfoSection.vue b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlInfoSection.vue
new file mode 100644
index 000000000..66820cafa
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlInfoSection.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+ {{ t('SECURITY_SETTINGS.SAML.INFO_SECTION.TITLE') }}
+
+
+
+
+
+
+ {{ item.label }}
+
+ {{ item.value }}
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlPaywall.vue b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlPaywall.vue
new file mode 100644
index 000000000..a08cce9e0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlPaywall.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlSettings.vue
new file mode 100644
index 000000000..dca12200b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/components/SamlSettings.vue
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/security/security.routes.js b/app/javascript/dashboard/routes/dashboard/settings/security/security.routes.js
new file mode 100644
index 000000000..f9058d6bc
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/security/security.routes.js
@@ -0,0 +1,41 @@
+import { frontendURL } from '../../../../helper/URLHelper';
+import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import SettingsWrapper from '../SettingsWrapper.vue';
+import Index from './Index.vue';
+
+export default {
+ routes: [
+ {
+ path: frontendURL('accounts/:accountId/settings/security'),
+ meta: {
+ permissions: ['administrator'],
+ installationTypes: [
+ INSTALLATION_TYPES.CLOUD,
+ INSTALLATION_TYPES.ENTERPRISE,
+ ],
+ },
+ component: SettingsWrapper,
+ props: {
+ headerTitle: 'SECURITY_SETTINGS.TITLE',
+ icon: 'i-lucide-shield',
+ showNewButton: false,
+ },
+ children: [
+ {
+ path: '',
+ name: 'security_settings_index',
+ component: Index,
+ meta: {
+ permissions: ['administrator'],
+ featureFlag: FEATURE_FLAGS.SAML,
+ installationTypes: [
+ INSTALLATION_TYPES.CLOUD,
+ INSTALLATION_TYPES.ENTERPRISE,
+ ],
+ },
+ },
+ ],
+ },
+ ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 967c6cd55..22173f66d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -23,6 +23,7 @@ import sla from './sla/sla.routes';
import teams from './teams/teams.routes';
import customRoles from './customRoles/customRole.routes';
import profile from './profile/profile.routes';
+import security from './security/security.routes';
export default {
routes: [
@@ -61,5 +62,6 @@ export default {
...teams.routes,
...customRoles.routes,
...profile.routes,
+ ...security.routes,
],
};
diff --git a/app/javascript/dashboard/store/modules/agentCapacityPolicies.js b/app/javascript/dashboard/store/modules/agentCapacityPolicies.js
index e1e766f2c..ea554448f 100644
--- a/app/javascript/dashboard/store/modules/agentCapacityPolicies.js
+++ b/app/javascript/dashboard/store/modules/agentCapacityPolicies.js
@@ -40,7 +40,10 @@ export const actions = {
commit(types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isFetching: true });
try {
const response = await AgentCapacityPoliciesAPI.get();
- commit(types.SET_AGENT_CAPACITY_POLICIES, camelcaseKeys(response.data));
+ commit(
+ types.SET_AGENT_CAPACITY_POLICIES,
+ camelcaseKeys(response.data, { deep: true })
+ );
} catch (error) {
throwErrorMessage(error);
} finally {
@@ -52,7 +55,7 @@ export const actions = {
commit(types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isFetchingItem: true });
try {
const response = await AgentCapacityPoliciesAPI.show(policyId);
- const policy = camelcaseKeys(response.data);
+ const policy = camelcaseKeys(response.data, { deep: true });
commit(types.SET_AGENT_CAPACITY_POLICY, policy);
} catch (error) {
throwErrorMessage(error);
@@ -69,7 +72,10 @@ export const actions = {
const response = await AgentCapacityPoliciesAPI.create(
snakecaseKeys(policyObj)
);
- commit(types.ADD_AGENT_CAPACITY_POLICY, camelcaseKeys(response.data));
+ commit(
+ types.ADD_AGENT_CAPACITY_POLICY,
+ camelcaseKeys(response.data, { deep: true })
+ );
return response.data;
} catch (error) {
throwErrorMessage(error);
@@ -86,7 +92,10 @@ export const actions = {
id,
snakecaseKeys(policyParams)
);
- commit(types.EDIT_AGENT_CAPACITY_POLICY, camelcaseKeys(response.data));
+ commit(
+ types.EDIT_AGENT_CAPACITY_POLICY,
+ camelcaseKeys(response.data, { deep: true })
+ );
return response.data;
} catch (error) {
throwErrorMessage(error);
@@ -129,6 +138,97 @@ export const actions = {
});
}
},
+
+ addUser: async function addUser({ commit }, { policyId, userData }) {
+ try {
+ const response = await AgentCapacityPoliciesAPI.addUser(
+ policyId,
+ userData
+ );
+ commit(types.ADD_AGENT_CAPACITY_POLICIES_USERS, {
+ policyId,
+ user: camelcaseKeys(response.data),
+ });
+ return response.data;
+ } catch (error) {
+ throwErrorMessage(error);
+ throw error;
+ }
+ },
+
+ removeUser: async function removeUser({ commit }, { policyId, userId }) {
+ commit(types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG, {
+ isDeleting: true,
+ });
+ try {
+ await AgentCapacityPoliciesAPI.removeUser(policyId, userId);
+ commit(types.DELETE_AGENT_CAPACITY_POLICIES_USERS, { policyId, userId });
+ } catch (error) {
+ throwErrorMessage(error);
+ throw error;
+ } finally {
+ commit(types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG, {
+ isDeleting: false,
+ });
+ }
+ },
+
+ createInboxLimit: async function createInboxLimit(
+ { commit },
+ { policyId, limitData }
+ ) {
+ try {
+ const response = await AgentCapacityPoliciesAPI.createInboxLimit(
+ policyId,
+ limitData
+ );
+ commit(
+ types.SET_AGENT_CAPACITY_POLICIES_INBOXES,
+ camelcaseKeys(response.data)
+ );
+ return response.data;
+ } catch (error) {
+ throwErrorMessage(error);
+ throw error;
+ }
+ },
+
+ updateInboxLimit: async function updateInboxLimit(
+ { commit },
+ { policyId, limitId, limitData }
+ ) {
+ try {
+ const response = await AgentCapacityPoliciesAPI.updateInboxLimit(
+ policyId,
+ limitId,
+ limitData
+ );
+ commit(
+ types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES,
+ camelcaseKeys(response.data)
+ );
+ return response.data;
+ } catch (error) {
+ throwErrorMessage(error);
+ throw error;
+ }
+ },
+
+ deleteInboxLimit: async function deleteInboxLimit(
+ { commit },
+ { policyId, limitId }
+ ) {
+ try {
+ await AgentCapacityPoliciesAPI.deleteInboxLimit(policyId, limitId);
+ commit(types.DELETE_AGENT_CAPACITY_POLICIES_INBOXES, {
+ policyId,
+ limitId,
+ });
+ } catch (error) {
+ throwErrorMessage(error);
+ throw error;
+ }
+ },
};
export const mutations = {
@@ -157,6 +257,54 @@ export const mutations = {
policy.users = users;
}
},
+ [types.ADD_AGENT_CAPACITY_POLICIES_USERS](_state, { policyId, user }) {
+ const policy = _state.records.find(p => p.id === policyId);
+ if (policy) {
+ policy.users = policy.users || [];
+ policy.users.push(user);
+ policy.assignedAgentCount = policy.users.length;
+ }
+ },
+ [types.DELETE_AGENT_CAPACITY_POLICIES_USERS](_state, { policyId, userId }) {
+ const policy = _state.records.find(p => p.id === policyId);
+ if (policy) {
+ policy.users = (policy.users || []).filter(user => user.id !== userId);
+ policy.assignedAgentCount = policy.users.length;
+ }
+ },
+
+ [types.SET_AGENT_CAPACITY_POLICIES_INBOXES](_state, data) {
+ const policy = _state.records.find(
+ p => p.id === data.agentCapacityPolicyId
+ );
+ policy?.inboxCapacityLimits.push({
+ id: data.id,
+ inboxId: data.inboxId,
+ conversationLimit: data.conversationLimit,
+ });
+ },
+ [types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES](_state, data) {
+ const policy = _state.records.find(
+ p => p.id === data.agentCapacityPolicyId
+ );
+ const limit = policy?.inboxCapacityLimits.find(l => l.id === data.id);
+ if (limit) {
+ Object.assign(limit, {
+ conversationLimit: data.conversationLimit,
+ });
+ }
+ },
+ [types.DELETE_AGENT_CAPACITY_POLICIES_INBOXES](
+ _state,
+ { policyId, limitId }
+ ) {
+ const policy = _state.records.find(p => p.id === policyId);
+ if (policy) {
+ policy.inboxCapacityLimits = policy.inboxCapacityLimits.filter(
+ limit => limit.id !== limitId
+ );
+ }
+ },
};
export default {
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
index 3f1c32059..3d627e3ef 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
@@ -64,11 +64,13 @@ const getValueFromConversation = (conversation, attributeKey) => {
switch (attributeKey) {
case 'status':
case 'priority':
- case 'display_id':
case 'labels':
case 'created_at':
case 'last_activity_at':
return conversation[attributeKey];
+ case 'display_id':
+ // Frontend uses 'id' but backend expects 'display_id'
+ return conversation.display_id || conversation.id;
case 'assignee_id':
return conversation.meta?.assignee?.id;
case 'inbox_id':
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
index b36128819..096481c69 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
@@ -247,7 +247,7 @@ describe('filterHelpers', () => {
// Text search tests - display_id
it('should match conversation with equal_to operator for display_id', () => {
- const conversation = { display_id: '12345' };
+ const conversation = { id: '12345' };
const filters = [
{
attribute_key: 'display_id',
@@ -260,7 +260,7 @@ describe('filterHelpers', () => {
});
it('should match conversation with contains operator for display_id', () => {
- const conversation = { display_id: '12345' };
+ const conversation = { id: '12345' };
const filters = [
{
attribute_key: 'display_id',
@@ -273,7 +273,7 @@ describe('filterHelpers', () => {
});
it('should not match conversation with does_not_contain operator for display_id', () => {
- const conversation = { display_id: '12345' };
+ const conversation = { id: '12345' };
const filters = [
{
attribute_key: 'display_id',
@@ -286,7 +286,7 @@ describe('filterHelpers', () => {
});
it('should match conversation with does_not_contain operator when value is not present', () => {
- const conversation = { display_id: '12345' };
+ const conversation = { id: '12345' };
const filters = [
{
attribute_key: 'display_id',
@@ -989,7 +989,7 @@ describe('filterHelpers', () => {
it('should handle empty string values in conversation', () => {
const conversation = {
- display_id: '',
+ id: '',
};
const filters = [
{
diff --git a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/actions.spec.js b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/actions.spec.js
index 0b5ece591..3414a2086 100644
--- a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/actions.spec.js
@@ -1,7 +1,12 @@
import axios from 'axios';
import { actions } from '../../agentCapacityPolicies';
import types from '../../../mutation-types';
-import agentCapacityPoliciesList, { camelCaseFixtures } from './fixtures';
+import agentCapacityPoliciesList, {
+ camelCaseFixtures,
+ mockUsers,
+ mockInboxLimits,
+ camelCaseMockInboxLimits,
+} from './fixtures';
import camelcaseKeys from 'camelcase-keys';
import snakecaseKeys from 'snakecase-keys';
@@ -25,7 +30,9 @@ describe('#actions', () => {
await actions.get({ commit });
- expect(camelcaseKeys).toHaveBeenCalledWith(agentCapacityPoliciesList);
+ expect(camelcaseKeys).toHaveBeenCalledWith(agentCapacityPoliciesList, {
+ deep: true,
+ });
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isFetching: true }],
[types.SET_AGENT_CAPACITY_POLICIES, camelCaseFixtures],
@@ -55,7 +62,9 @@ describe('#actions', () => {
await actions.show({ commit }, 1);
- expect(camelcaseKeys).toHaveBeenCalledWith(policyData);
+ expect(camelcaseKeys).toHaveBeenCalledWith(policyData, {
+ deep: true,
+ });
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isFetchingItem: true }],
[types.SET_AGENT_CAPACITY_POLICY, camelCasedPolicy],
@@ -88,7 +97,9 @@ describe('#actions', () => {
const result = await actions.create({ commit }, newPolicy);
expect(snakecaseKeys).toHaveBeenCalledWith(newPolicy);
- expect(camelcaseKeys).toHaveBeenCalledWith(newPolicy);
+ expect(camelcaseKeys).toHaveBeenCalledWith(newPolicy, {
+ deep: true,
+ });
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isCreating: true }],
[types.ADD_AGENT_CAPACITY_POLICY, camelCasedData],
@@ -129,7 +140,9 @@ describe('#actions', () => {
const result = await actions.update({ commit }, updateParams);
expect(snakecaseKeys).toHaveBeenCalledWith({ name: 'Updated Policy' });
- expect(camelcaseKeys).toHaveBeenCalledWith(responseData);
+ expect(camelcaseKeys).toHaveBeenCalledWith(responseData, {
+ deep: true,
+ });
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_CAPACITY_POLICIES_UI_FLAG, { isUpdating: true }],
[types.EDIT_AGENT_CAPACITY_POLICY, camelCasedData],
@@ -224,4 +237,172 @@ describe('#actions', () => {
]);
});
});
+
+ describe('#addUser', () => {
+ it('sends correct actions if API is success', async () => {
+ const policyId = 1;
+ const userData = { user_id: 3, capacity: 12 };
+ const responseData = mockUsers[2];
+ const camelCasedUser = mockUsers[2];
+
+ axios.post.mockResolvedValue({ data: responseData });
+ camelcaseKeys.mockReturnValue(camelCasedUser);
+
+ const result = await actions.addUser({ commit }, { policyId, userData });
+
+ expect(camelcaseKeys).toHaveBeenCalledWith(responseData);
+ expect(commit.mock.calls).toEqual([
+ [
+ types.ADD_AGENT_CAPACITY_POLICIES_USERS,
+ { policyId, user: camelCasedUser },
+ ],
+ ]);
+ expect(result).toEqual(responseData);
+ });
+
+ it('sends correct actions if API is error', async () => {
+ axios.post.mockRejectedValue(new Error('Validation error'));
+
+ await expect(
+ actions.addUser({ commit }, { policyId: 1, userData: {} })
+ ).rejects.toThrow(Error);
+
+ expect(commit).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('#removeUser', () => {
+ it('sends correct actions if API is success', async () => {
+ const policyId = 1;
+ const userId = 2;
+ axios.delete.mockResolvedValue({});
+
+ await actions.removeUser({ commit }, { policyId, userId });
+
+ expect(commit.mock.calls).toEqual([
+ [types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG, { isDeleting: true }],
+ [types.DELETE_AGENT_CAPACITY_POLICIES_USERS, { policyId, userId }],
+ [
+ types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG,
+ { isDeleting: false },
+ ],
+ ]);
+ });
+
+ it('sends correct actions if API is error', async () => {
+ axios.delete.mockRejectedValue(new Error('Not found'));
+
+ await expect(
+ actions.removeUser({ commit }, { policyId: 1, userId: 2 })
+ ).rejects.toThrow(Error);
+
+ expect(commit.mock.calls).toEqual([
+ [types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG, { isDeleting: true }],
+ [
+ types.SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG,
+ { isDeleting: false },
+ ],
+ ]);
+ });
+ });
+
+ describe('#createInboxLimit', () => {
+ it('sends correct actions if API is success', async () => {
+ const policyId = 1;
+ const limitData = { inbox_id: 3, conversation_limit: 20 };
+ const responseData = mockInboxLimits[2];
+ const camelCasedData = camelCaseMockInboxLimits[2];
+
+ axios.post.mockResolvedValue({ data: responseData });
+ camelcaseKeys.mockReturnValue(camelCasedData);
+
+ const result = await actions.createInboxLimit(
+ { commit },
+ { policyId, limitData }
+ );
+
+ expect(camelcaseKeys).toHaveBeenCalledWith(responseData);
+ expect(commit.mock.calls).toEqual([
+ [types.SET_AGENT_CAPACITY_POLICIES_INBOXES, camelCasedData],
+ ]);
+ expect(result).toEqual(responseData);
+ });
+
+ it('sends correct actions if API is error', async () => {
+ axios.post.mockRejectedValue(new Error('Validation error'));
+
+ await expect(
+ actions.createInboxLimit({ commit }, { policyId: 1, limitData: {} })
+ ).rejects.toThrow(Error);
+
+ expect(commit).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('#updateInboxLimit', () => {
+ it('sends correct actions if API is success', async () => {
+ const policyId = 1;
+ const limitId = 1;
+ const limitData = { conversation_limit: 25 };
+ const responseData = {
+ ...mockInboxLimits[0],
+ conversation_limit: 25,
+ };
+ const camelCasedData = {
+ ...camelCaseMockInboxLimits[0],
+ conversationLimit: 25,
+ };
+
+ axios.put.mockResolvedValue({ data: responseData });
+ camelcaseKeys.mockReturnValue(camelCasedData);
+
+ const result = await actions.updateInboxLimit(
+ { commit },
+ { policyId, limitId, limitData }
+ );
+
+ expect(camelcaseKeys).toHaveBeenCalledWith(responseData);
+ expect(commit.mock.calls).toEqual([
+ [types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES, camelCasedData],
+ ]);
+ expect(result).toEqual(responseData);
+ });
+
+ it('sends correct actions if API is error', async () => {
+ axios.put.mockRejectedValue(new Error('Validation error'));
+
+ await expect(
+ actions.updateInboxLimit(
+ { commit },
+ { policyId: 1, limitId: 1, limitData: {} }
+ )
+ ).rejects.toThrow(Error);
+
+ expect(commit).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('#deleteInboxLimit', () => {
+ it('sends correct actions if API is success', async () => {
+ const policyId = 1;
+ const limitId = 1;
+ axios.delete.mockResolvedValue({});
+
+ await actions.deleteInboxLimit({ commit }, { policyId, limitId });
+
+ expect(commit.mock.calls).toEqual([
+ [types.DELETE_AGENT_CAPACITY_POLICIES_INBOXES, { policyId, limitId }],
+ ]);
+ });
+
+ it('sends correct actions if API is error', async () => {
+ axios.delete.mockRejectedValue(new Error('Not found'));
+
+ await expect(
+ actions.deleteInboxLimit({ commit }, { policyId: 1, limitId: 1 })
+ ).rejects.toThrow(Error);
+
+ expect(commit).not.toHaveBeenCalled();
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/fixtures.js b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/fixtures.js
index 594d5848c..c79597919 100644
--- a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/fixtures.js
@@ -10,6 +10,20 @@ export default [
created_at: '2024-01-01T10:00:00.000Z',
updated_at: '2024-01-01T10:00:00.000Z',
users: [],
+ inbox_capacity_limits: [
+ {
+ id: 1,
+ inbox_id: 1,
+ conversation_limit: 15,
+ agent_capacity_policy_id: 1,
+ },
+ {
+ id: 2,
+ inbox_id: 2,
+ conversation_limit: 8,
+ agent_capacity_policy_id: 1,
+ },
+ ],
},
{
id: 2,
@@ -21,7 +35,21 @@ export default [
assigned_agent_count: 5,
created_at: '2024-01-01T11:00:00.000Z',
updated_at: '2024-01-01T11:00:00.000Z',
- users: [],
+ users: [
+ {
+ id: 1,
+ name: 'Agent Smith',
+ email: 'agent.smith@example.com',
+ capacity: 25,
+ },
+ {
+ id: 2,
+ name: 'Agent Johnson',
+ email: 'agent.johnson@example.com',
+ capacity: 18,
+ },
+ ],
+ inbox_capacity_limits: [],
},
{
id: 3,
@@ -34,6 +62,7 @@ export default [
created_at: '2024-01-01T12:00:00.000Z',
updated_at: '2024-01-01T12:00:00.000Z',
users: [],
+ inbox_capacity_limits: [],
},
];
@@ -49,6 +78,20 @@ export const camelCaseFixtures = [
createdAt: '2024-01-01T10:00:00.000Z',
updatedAt: '2024-01-01T10:00:00.000Z',
users: [],
+ inboxCapacityLimits: [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ agentCapacityPolicyId: 1,
+ },
+ {
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ agentCapacityPolicyId: 1,
+ },
+ ],
},
{
id: 2,
@@ -60,7 +103,21 @@ export const camelCaseFixtures = [
assignedAgentCount: 5,
createdAt: '2024-01-01T11:00:00.000Z',
updatedAt: '2024-01-01T11:00:00.000Z',
- users: [],
+ users: [
+ {
+ id: 1,
+ name: 'Agent Smith',
+ email: 'agent.smith@example.com',
+ capacity: 25,
+ },
+ {
+ id: 2,
+ name: 'Agent Johnson',
+ email: 'agent.johnson@example.com',
+ capacity: 18,
+ },
+ ],
+ inboxCapacityLimits: [],
},
{
id: 3,
@@ -73,5 +130,70 @@ export const camelCaseFixtures = [
createdAt: '2024-01-01T12:00:00.000Z',
updatedAt: '2024-01-01T12:00:00.000Z',
users: [],
+ inboxCapacityLimits: [],
+ },
+];
+
+// Additional test data for user and inbox limit operations
+export const mockUsers = [
+ {
+ id: 1,
+ name: 'Agent Smith',
+ email: 'agent.smith@example.com',
+ capacity: 25,
+ },
+ {
+ id: 2,
+ name: 'Agent Johnson',
+ email: 'agent.johnson@example.com',
+ capacity: 18,
+ },
+ {
+ id: 3,
+ name: 'Agent Brown',
+ email: 'agent.brown@example.com',
+ capacity: 12,
+ },
+];
+
+export const mockInboxLimits = [
+ {
+ id: 1,
+ inbox_id: 1,
+ conversation_limit: 15,
+ agent_capacity_policy_id: 1,
+ },
+ {
+ id: 2,
+ inbox_id: 2,
+ conversation_limit: 8,
+ agent_capacity_policy_id: 1,
+ },
+ {
+ id: 3,
+ inbox_id: 3,
+ conversation_limit: 20,
+ agent_capacity_policy_id: 2,
+ },
+];
+
+export const camelCaseMockInboxLimits = [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ agentCapacityPolicyId: 1,
+ },
+ {
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ agentCapacityPolicyId: 1,
+ },
+ {
+ id: 3,
+ inboxId: 3,
+ conversationLimit: 20,
+ agentCapacityPolicyId: 2,
},
];
diff --git a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/mutations.spec.js
index 0ab033953..f6cfba80d 100644
--- a/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agentCapacityPolicies/mutations.spec.js
@@ -1,6 +1,6 @@
import { mutations } from '../../agentCapacityPolicies';
import types from '../../../mutation-types';
-import agentCapacityPoliciesList from './fixtures';
+import agentCapacityPoliciesList, { mockUsers } from './fixtures';
describe('#mutations', () => {
describe('#SET_AGENT_CAPACITY_POLICIES_UI_FLAG', () => {
@@ -248,7 +248,7 @@ describe('#mutations', () => {
describe('#SET_AGENT_CAPACITY_POLICIES_USERS', () => {
it('sets users for existing policy', () => {
- const mockUsers = [
+ const testUsers = [
{ id: 1, name: 'Agent 1', email: 'agent1@example.com', capacity: 15 },
{ id: 2, name: 'Agent 2', email: 'agent2@example.com', capacity: 20 },
];
@@ -262,10 +262,10 @@ describe('#mutations', () => {
mutations[types.SET_AGENT_CAPACITY_POLICIES_USERS](state, {
policyId: 1,
- users: mockUsers,
+ users: testUsers,
});
- expect(state.records[0].users).toEqual(mockUsers);
+ expect(state.records[0].users).toEqual(testUsers);
expect(state.records[1].users).toEqual([]);
});
@@ -300,4 +300,320 @@ describe('#mutations', () => {
expect(state).toEqual(originalState);
});
});
+
+ describe('#ADD_AGENT_CAPACITY_POLICIES_USERS', () => {
+ it('adds user to existing policy', () => {
+ const state = {
+ records: [
+ { id: 1, name: 'Policy 1', users: [] },
+ { id: 2, name: 'Policy 2', users: [] },
+ ],
+ };
+
+ mutations[types.ADD_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ user: mockUsers[0],
+ });
+
+ expect(state.records[0].users).toEqual([mockUsers[0]]);
+ expect(state.records[1].users).toEqual([]);
+ });
+
+ it('adds user to policy with existing users', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1', users: [mockUsers[0]] }],
+ };
+
+ mutations[types.ADD_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ user: mockUsers[1],
+ });
+
+ expect(state.records[0].users).toEqual([mockUsers[0], mockUsers[1]]);
+ });
+
+ it('initializes users array if undefined', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1' }],
+ };
+
+ mutations[types.ADD_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ user: mockUsers[0],
+ });
+
+ expect(state.records[0].users).toEqual([mockUsers[0]]);
+ });
+
+ it('updates assigned agent count', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1', users: [] }],
+ };
+
+ mutations[types.ADD_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ user: mockUsers[0],
+ });
+
+ expect(state.records[0].assignedAgentCount).toEqual(1);
+ });
+ });
+
+ describe('#DELETE_AGENT_CAPACITY_POLICIES_USERS', () => {
+ it('removes user from policy', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ users: [mockUsers[0], mockUsers[1], mockUsers[2]],
+ },
+ ],
+ };
+
+ mutations[types.DELETE_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ userId: 2,
+ });
+
+ expect(state.records[0].users).toEqual([mockUsers[0], mockUsers[2]]);
+ });
+
+ it('handles removing non-existent user', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ users: [mockUsers[0]],
+ },
+ ],
+ };
+
+ mutations[types.DELETE_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ userId: 999,
+ });
+
+ expect(state.records[0].users).toEqual([mockUsers[0]]);
+ });
+
+ it('updates assigned agent count', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1', users: [mockUsers[0]] }],
+ };
+
+ mutations[types.DELETE_AGENT_CAPACITY_POLICIES_USERS](state, {
+ policyId: 1,
+ userId: 1,
+ });
+
+ expect(state.records[0].assignedAgentCount).toEqual(0);
+ });
+ });
+
+ describe('#SET_AGENT_CAPACITY_POLICIES_INBOXES', () => {
+ it('adds inbox limit to policy', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ inboxCapacityLimits: [],
+ },
+ ],
+ };
+
+ const inboxLimitData = {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ agentCapacityPolicyId: 1,
+ };
+
+ mutations[types.SET_AGENT_CAPACITY_POLICIES_INBOXES](
+ state,
+ inboxLimitData
+ );
+
+ expect(state.records[0].inboxCapacityLimits).toEqual([
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ },
+ ]);
+ });
+
+ it('does nothing if policy not found', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1', inboxCapacityLimits: [] }],
+ };
+
+ const originalState = JSON.parse(JSON.stringify(state));
+
+ mutations[types.SET_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ agentCapacityPolicyId: 999,
+ });
+
+ expect(state).toEqual(originalState);
+ });
+ });
+
+ describe('#EDIT_AGENT_CAPACITY_POLICIES_INBOXES', () => {
+ it('updates existing inbox limit', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ inboxCapacityLimits: [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ },
+ {
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ },
+ ],
+ },
+ ],
+ };
+
+ mutations[types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 25,
+ agentCapacityPolicyId: 1,
+ });
+
+ expect(state.records[0].inboxCapacityLimits[0]).toEqual({
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 25,
+ });
+ expect(state.records[0].inboxCapacityLimits[1]).toEqual({
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ });
+ });
+
+ it('does nothing if limit not found', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ inboxCapacityLimits: [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ },
+ ],
+ },
+ ],
+ };
+
+ const originalLimits = [...state.records[0].inboxCapacityLimits];
+
+ mutations[types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ id: 999,
+ inboxId: 1,
+ conversationLimit: 25,
+ agentCapacityPolicyId: 1,
+ });
+
+ expect(state.records[0].inboxCapacityLimits).toEqual(originalLimits);
+ });
+
+ it('does nothing if policy not found', () => {
+ const state = {
+ records: [{ id: 1, name: 'Policy 1', inboxCapacityLimits: [] }],
+ };
+
+ const originalState = JSON.parse(JSON.stringify(state));
+
+ mutations[types.EDIT_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 25,
+ agentCapacityPolicyId: 999,
+ });
+
+ expect(state).toEqual(originalState);
+ });
+ });
+
+ describe('#DELETE_AGENT_CAPACITY_POLICIES_INBOXES', () => {
+ it('removes inbox limit from policy', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ inboxCapacityLimits: [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ },
+ {
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ },
+ ],
+ },
+ ],
+ };
+
+ mutations[types.DELETE_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ policyId: 1,
+ limitId: 1,
+ });
+
+ expect(state.records[0].inboxCapacityLimits).toEqual([
+ {
+ id: 2,
+ inboxId: 2,
+ conversationLimit: 8,
+ },
+ ]);
+ });
+
+ it('handles removing non-existent limit', () => {
+ const state = {
+ records: [
+ {
+ id: 1,
+ name: 'Policy 1',
+ inboxCapacityLimits: [
+ {
+ id: 1,
+ inboxId: 1,
+ conversationLimit: 15,
+ },
+ ],
+ },
+ ],
+ };
+
+ const originalLimits = [...state.records[0].inboxCapacityLimits];
+
+ mutations[types.DELETE_AGENT_CAPACITY_POLICIES_INBOXES](state, {
+ policyId: 1,
+ limitId: 999,
+ });
+
+ expect(state.records[0].inboxCapacityLimits).toEqual(originalLimits);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 2a5948d14..4f361e140 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -372,4 +372,10 @@ export default {
SET_AGENT_CAPACITY_POLICIES_USERS: 'SET_AGENT_CAPACITY_POLICIES_USERS',
SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG:
'SET_AGENT_CAPACITY_POLICIES_USERS_UI_FLAG',
+ ADD_AGENT_CAPACITY_POLICIES_USERS: 'ADD_AGENT_CAPACITY_POLICIES_USERS',
+ DELETE_AGENT_CAPACITY_POLICIES_USERS: 'DELETE_AGENT_CAPACITY_POLICIES_USERS',
+ SET_AGENT_CAPACITY_POLICIES_INBOXES: 'SET_AGENT_CAPACITY_POLICIES_INBOXES',
+ EDIT_AGENT_CAPACITY_POLICIES_INBOXES: 'EDIT_AGENT_CAPACITY_POLICIES_INBOXES',
+ DELETE_AGENT_CAPACITY_POLICIES_INBOXES:
+ 'DELETE_AGENT_CAPACITY_POLICIES_INBOXES',
};
diff --git a/app/javascript/shared/helpers/specs/timeHelper.spec.js b/app/javascript/shared/helpers/specs/timeHelper.spec.js
index 13d04568f..e7a4e025f 100644
--- a/app/javascript/shared/helpers/specs/timeHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/timeHelper.spec.js
@@ -4,6 +4,8 @@ import {
dynamicTime,
dateFormat,
shortTimestamp,
+ getDayDifferenceFromNow,
+ hasOneDayPassed,
} from 'shared/helpers/timeHelper';
beforeEach(() => {
@@ -90,3 +92,148 @@ describe('#shortTimestamp', () => {
expect(shortTimestamp('4 years ago', true)).toEqual('4y ago');
});
});
+
+describe('#getDayDifferenceFromNow', () => {
+ it('returns 0 for timestamps from today', () => {
+ // Mock current date: May 5, 2023
+ const now = new Date(Date.UTC(2023, 4, 5, 12, 0, 0)); // 12:00 PM
+ const todayTimestamp = Math.floor(now.getTime() / 1000); // Same day
+
+ expect(getDayDifferenceFromNow(now, todayTimestamp)).toEqual(0);
+ });
+
+ it('returns 2 for timestamps from 2 days ago', () => {
+ const now = new Date(Date.UTC(2023, 4, 5, 12, 0, 0)); // May 5, 2023
+ const twoDaysAgoTimestamp = Math.floor(
+ new Date(Date.UTC(2023, 4, 3, 10, 0, 0)).getTime() / 1000
+ ); // May 3, 2023
+
+ expect(getDayDifferenceFromNow(now, twoDaysAgoTimestamp)).toEqual(2);
+ });
+
+ it('returns 7 for timestamps from a week ago', () => {
+ const now = new Date(Date.UTC(2023, 4, 5, 12, 0, 0)); // May 5, 2023
+ const weekAgoTimestamp = Math.floor(
+ new Date(Date.UTC(2023, 3, 28, 8, 0, 0)).getTime() / 1000
+ ); // April 28, 2023
+
+ expect(getDayDifferenceFromNow(now, weekAgoTimestamp)).toEqual(7);
+ });
+
+ it('returns 30 for timestamps from a month ago', () => {
+ const now = new Date(Date.UTC(2023, 4, 5, 12, 0, 0)); // May 5, 2023
+ const monthAgoTimestamp = Math.floor(
+ new Date(Date.UTC(2023, 3, 5, 12, 0, 0)).getTime() / 1000
+ ); // April 5, 2023
+
+ expect(getDayDifferenceFromNow(now, monthAgoTimestamp)).toEqual(30);
+ });
+
+ it('handles edge case with different times on same day', () => {
+ const now = new Date(Date.UTC(2023, 4, 5, 23, 59, 59)); // May 5, 2023 11:59:59 PM
+ const morningTimestamp = Math.floor(
+ new Date(Date.UTC(2023, 4, 5, 0, 0, 1)).getTime() / 1000
+ ); // May 5, 2023 12:00:01 AM
+
+ expect(getDayDifferenceFromNow(now, morningTimestamp)).toEqual(0);
+ });
+
+ it('handles cross-month boundaries correctly', () => {
+ const now = new Date(Date.UTC(2023, 4, 1, 12, 0, 0)); // May 1, 2023
+ const lastMonthTimestamp = Math.floor(
+ new Date(Date.UTC(2023, 3, 30, 12, 0, 0)).getTime() / 1000
+ ); // April 30, 2023
+
+ expect(getDayDifferenceFromNow(now, lastMonthTimestamp)).toEqual(1);
+ });
+
+ it('handles cross-year boundaries correctly', () => {
+ const now = new Date(Date.UTC(2023, 0, 2, 12, 0, 0)); // January 2, 2023
+ const lastYearTimestamp = Math.floor(
+ new Date(Date.UTC(2022, 11, 31, 12, 0, 0)).getTime() / 1000
+ ); // December 31, 2022
+
+ expect(getDayDifferenceFromNow(now, lastYearTimestamp)).toEqual(2);
+ });
+});
+
+describe('#hasOneDayPassed', () => {
+ beforeEach(() => {
+ // Mock current date: May 5, 2023, 12:00 PM UTC (1683288000)
+ const mockDate = new Date(1683288000 * 1000);
+ vi.setSystemTime(mockDate);
+ });
+
+ it('returns false for timestamps from today', () => {
+ // Same day, different time - May 5, 2023 8:00 AM UTC
+ const todayTimestamp = 1683273600;
+
+ expect(hasOneDayPassed(todayTimestamp)).toBe(false);
+ });
+
+ it('returns false for timestamps from yesterday (less than 24 hours)', () => {
+ // Yesterday but less than 24 hours ago - May 4, 2023 6:00 PM UTC (18 hours ago)
+ const yesterdayTimestamp = 1683230400;
+
+ expect(hasOneDayPassed(yesterdayTimestamp)).toBe(false);
+ });
+
+ it('returns true for timestamps from exactly 1 day ago', () => {
+ // Exactly 24 hours ago - May 4, 2023 12:00 PM UTC
+ const oneDayAgoTimestamp = 1683201600;
+
+ expect(hasOneDayPassed(oneDayAgoTimestamp)).toBe(true);
+ });
+
+ it('returns true for timestamps from more than 1 day ago', () => {
+ // 2 days ago - May 3, 2023 10:00 AM UTC
+ const twoDaysAgoTimestamp = 1683108000;
+
+ expect(hasOneDayPassed(twoDaysAgoTimestamp)).toBe(true);
+ });
+
+ it('returns true for timestamps from a week ago', () => {
+ // 7 days ago - April 28, 2023 8:00 AM UTC
+ const weekAgoTimestamp = 1682668800;
+
+ expect(hasOneDayPassed(weekAgoTimestamp)).toBe(true);
+ });
+
+ it('returns true for null timestamp (defensive check)', () => {
+ expect(hasOneDayPassed(null)).toBe(true);
+ });
+
+ it('returns true for undefined timestamp (defensive check)', () => {
+ expect(hasOneDayPassed(undefined)).toBe(true);
+ });
+
+ it('returns true for zero timestamp (defensive check)', () => {
+ expect(hasOneDayPassed(0)).toBe(true);
+ });
+
+ it('returns true for empty string timestamp (defensive check)', () => {
+ expect(hasOneDayPassed('')).toBe(true);
+ });
+
+ it('handles cross-month boundaries correctly', () => {
+ // Set current time to May 1, 2023 12:00 PM UTC (1682942400)
+ const mayFirst = new Date(1682942400 * 1000);
+ vi.setSystemTime(mayFirst);
+
+ // April 29, 2023 12:00 PM UTC (1682769600) - 2 days ago, crossing month boundary
+ const crossMonthTimestamp = 1682769600;
+
+ expect(hasOneDayPassed(crossMonthTimestamp)).toBe(true);
+ });
+
+ it('handles cross-year boundaries correctly', () => {
+ // Set current time to January 2, 2023 12:00 PM UTC (1672660800)
+ const newYear = new Date(1672660800 * 1000);
+ vi.setSystemTime(newYear);
+
+ // December 30, 2022 12:00 PM UTC (1672401600) - 3 days ago, crossing year boundary
+ const crossYearTimestamp = 1672401600;
+
+ expect(hasOneDayPassed(crossYearTimestamp)).toBe(true);
+ });
+});
diff --git a/app/javascript/shared/helpers/timeHelper.js b/app/javascript/shared/helpers/timeHelper.js
index 6e041c7ec..5347d2410 100644
--- a/app/javascript/shared/helpers/timeHelper.js
+++ b/app/javascript/shared/helpers/timeHelper.js
@@ -3,6 +3,7 @@ import {
isSameYear,
fromUnixTime,
formatDistanceToNow,
+ differenceInDays,
} from 'date-fns';
/**
@@ -91,3 +92,25 @@ export const shortTimestamp = (time, withAgo = false) => {
.replace(' years ago', `y${suffix}`);
return convertToShortTime;
};
+
+/**
+ * Calculates the difference in days between now and a given timestamp.
+ * @param {Date} now - Current date/time.
+ * @param {number} timestampInSeconds - Unix timestamp in seconds.
+ * @returns {number} Number of days difference.
+ */
+export const getDayDifferenceFromNow = (now, timestampInSeconds) => {
+ const date = new Date(timestampInSeconds * 1000);
+ return differenceInDays(now, date);
+};
+
+/**
+ * Checks if more than 24 hours have passed since a given timestamp.
+ * Useful for determining if retry/refresh actions should be disabled.
+ * @param {number} timestamp - Unix timestamp.
+ * @returns {boolean} True if more than 24 hours have passed.
+ */
+export const hasOneDayPassed = timestamp => {
+ if (!timestamp) return true; // Defensive check
+ return getDayDifferenceFromNow(new Date(), timestamp) >= 1;
+};
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 578d0217f..90275e02a 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -14,24 +14,24 @@
},
"THUMBNAIL": {
"AUTHOR": {
- "NOT_AVAILABLE": "Not available"
+ "NOT_AVAILABLE": "Non disponible"
}
},
"TEAM_AVAILABILITY": {
"ONLINE": "Nous sommes en ligne",
"OFFLINE": "Nous sommes absents pour le moment",
- "BACK_AS_SOON_AS_POSSIBLE": "We will be back as soon as possible"
+ "BACK_AS_SOON_AS_POSSIBLE": "Nous serons de retour dès que possible"
},
"REPLY_TIME": {
"IN_A_FEW_MINUTES": "Répond généralement en quelques minutes",
"IN_A_FEW_HOURS": "Répond généralement en quelques heures",
"IN_A_DAY": "Répond généralement dans la journée",
- "BACK_IN_HOURS": "We will be back online in {n} hour | We will be back online in {n} hours",
- "BACK_IN_MINUTES": "We will be back online in {time} minutes",
- "BACK_AT_TIME": "We will be back online at {time}",
- "BACK_ON_DAY": "We will be back online on {day}",
- "BACK_TOMORROW": "We will be back online tomorrow",
- "BACK_IN_SOME_TIME": "We will be back online in some time"
+ "BACK_IN_HOURS": "Nous serons de retour en ligne dans {n} heure | Nous serons de retour en ligne dans {n} heures",
+ "BACK_IN_MINUTES": "Nous serons de retour en ligne dans {time} minutes",
+ "BACK_AT_TIME": "Nous serons de retour en ligne à {time}",
+ "BACK_ON_DAY": "Nous serons de retour en ligne {day}",
+ "BACK_TOMORROW": "Nous serons de retour en ligne demain",
+ "BACK_IN_SOME_TIME": "Nous serons de retours en ligne dans quelques instants"
},
"DAY_NAMES": {
"SUNDAY": "Dimanche",
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index eda0f796c..124e9f8a9 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -20,13 +20,13 @@
"TEAM_AVAILABILITY": {
"ONLINE": "Estamos conectados",
"OFFLINE": "Estamos ausentes no momento",
- "BACK_AS_SOON_AS_POSSIBLE": "We will be back as soon as possible"
+ "BACK_AS_SOON_AS_POSSIBLE": "Estaremos de volta em breve"
},
"REPLY_TIME": {
"IN_A_FEW_MINUTES": "Normalmente responde em alguns minutos",
"IN_A_FEW_HOURS": "Normalmente responde em algumas horas",
"IN_A_DAY": "Normalmente responde em um dia",
- "BACK_IN_HOURS": "We will be back online in {n} hour | We will be back online in {n} hours",
+ "BACK_IN_HOURS": "Estaremos de volta em {n} hora | Estaremos de volta em {n} horas",
"BACK_IN_MINUTES": "We will be back online in {time} minutes",
"BACK_AT_TIME": "We will be back online at {time}",
"BACK_ON_DAY": "We will be back online on {day}",
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 9e3016eac..d4e9989c1 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -3,6 +3,7 @@
# Table name: channel_web_widgets
#
# id :integer not null, primary key
+# allowed_domains :text default("")
# continuity_via_email :boolean default(TRUE), not null
# feature_flags :integer default(7), not null
# hmac_mandatory :boolean default(FALSE)
@@ -31,7 +32,7 @@ class Channel::WebWidget < ApplicationRecord
self.table_name = 'channel_web_widgets'
EDITABLE_ATTRS = [:website_url, :widget_color, :welcome_title, :welcome_tagline, :reply_time, :pre_chat_form_enabled,
- :continuity_via_email, :hmac_mandatory,
+ :continuity_via_email, :hmac_mandatory, :allowed_domains,
{ pre_chat_form_options: [:pre_chat_message, :require_email,
{ pre_chat_fields:
[:field_type, :label, :placeholder, :name, :enabled, :type, :enabled, :required,
diff --git a/app/services/widget/token_service.rb b/app/services/widget/token_service.rb
index 5fb719e7b..4eebaab9e 100644
--- a/app/services/widget/token_service.rb
+++ b/app/services/widget/token_service.rb
@@ -1,8 +1,10 @@
class Widget::TokenService
+ DEFAULT_EXPIRY_DAYS = 180
+
pattr_initialize [:payload, :token]
def generate_token
- JWT.encode payload, secret_key, 'HS256'
+ JWT.encode payload_with_expiry, secret_key, 'HS256'
end
def decode_token
@@ -15,6 +17,24 @@ class Widget::TokenService
private
+ def payload_with_expiry
+ payload.merge(exp: exp, iat: iat)
+ end
+
+ def iat
+ Time.zone.now.to_i
+ end
+
+ def exp
+ iat + expire_in.days.to_i
+ end
+
+ def expire_in
+ # Value is stored in days, defaulting to 6 months (180 days)
+ token_expiry_value = InstallationConfig.find_by(name: 'WIDGET_TOKEN_EXPIRY')&.value
+ (token_expiry_value.presence || DEFAULT_EXPIRY_DAYS).to_i
+ end
+
def secret_key
Rails.application.secret_key_base
end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 1b2ab177b..d9134d563 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -33,6 +33,7 @@ end
json.tweets_enabled resource.channel.try(:tweets_enabled) if resource.twitter?
## WebWidget Attributes
+json.allowed_domains resource.channel.try(:allowed_domains)
json.widget_color resource.channel.try(:widget_color)
json.website_url resource.channel.try(:website_url)
json.hmac_mandatory resource.channel.try(:hmac_mandatory)
diff --git a/config/features.yml b/config/features.yml
index 9b2fc33c5..181284784 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -184,6 +184,7 @@
- name: whatsapp_embedded_signup
display_name: WhatsApp Embedded Signup
enabled: false
+ deprecated: true
- name: whatsapp_campaign
display_name: WhatsApp Campaign
enabled: false
diff --git a/config/installation_config.yml b/config/installation_config.yml
index caba80533..db907b7ad 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -439,3 +439,11 @@
locked: false
description: 'Zone ID for the Cloudflare domain'
## ------ End of Configs added for Cloudflare ------ ##
+
+## ------ Customizations for Customers ------ ##
+- name: WIDGET_TOKEN_EXPIRY
+ display_title: 'Widget Token Expiry'
+ value: 180
+ locked: false
+ description: 'Token expiry in days'
+## ------ End of Customizations for Customers ------ ##
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 3d5f20cda..cf9c1b339 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -26,6 +26,9 @@ am:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ am:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ am:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name}
'
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 82f06c370..f8455f918 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -26,6 +26,9 @@ ar:
messages:
reset_password_success: تم إرسال طلب إعادة تعيين كلمة المرور. يرجى مراجعة بريدك الإلكتروني للحصول على التعليمات.
reset_password_failure: المعذرة! لم نتمكن من العثور على أي مستخدم بعنوان البريد الإلكتروني المحدد.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: سيتم معالجة طلب حذف صندوق الوارد الخاص بك في بعض الوقت.
errors:
validations:
@@ -41,6 +44,8 @@ ar:
failed: فشلت عملية التسجيل
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: نوع البيانات غير صالح
@@ -209,6 +214,7 @@ ar:
reply:
email:
header:
+ notifications: 'الإشعارات'
from_with_name: '%{assignee_name} من %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} من %{inbox_name} <%{reply_email}>'
friendly_name: '%{sender_name} من %{business_name} <%{from_email}>'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 92f3d187e..e5a4cd524 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -26,6 +26,9 @@ az:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ az:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ az:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 689ca289e..b93a1ac98 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -26,6 +26,9 @@ bg:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ bg:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ bg:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9e3c47978..20d654e10 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -26,6 +26,9 @@ ca:
messages:
reset_password_success: Woot! S'ha restablert la contrasenya amb èxit. Revisa el correu per més instruccions.
reset_password_failure: Uh ho! No s'ha trobat cap compte amb aquest correu electrònic.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: La teva sol·licitud d'eliminació de la safata d'entrada es processarà d'aquí a un temps.
errors:
validations:
@@ -41,6 +44,8 @@ ca:
failed: El registre ha fallat
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tipus de dades no vàlid
@@ -209,6 +214,7 @@ ca:
reply:
email:
header:
+ notifications: 'Notificacions'
from_with_name: '%{assignee_name} des de %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} des de %{inbox_name} '
friendly_name: '%{sender_name} des de %{business_name} <%{from_email}>'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5a43d179c..ec6d727dd 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -26,6 +26,9 @@ cs:
messages:
reset_password_success: Woot! Žádost o obnovení hesla byla úspěšná. Zkontrolujte svůj e-mail pro pokyny.
reset_password_failure: Jejda! Nenašli jsme žádného uživatele se zadaným e-mailem.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ cs:
failed: Registrace se nezdařila
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ cs:
reply:
email:
header:
+ notifications: 'Oznámení'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 21df04d44..e1bfeed77 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -26,6 +26,9 @@ da:
messages:
reset_password_success: Woot! Anmodning om nulstilling af adgangskode er vellykket. Tjek din mail for instruktioner.
reset_password_failure: Åh nej! Vi kunne ikke finde nogen bruger med den angivne e-mail.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ da:
failed: Tilmelding mislykkedes
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Ugyldig datatype
@@ -209,6 +214,7 @@ da:
reply:
email:
header:
+ notifications: 'Notifikationer'
from_with_name: '%{assignee_name} fra %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} fra %{inbox_name} '
friendly_name: '%{sender_name} fra %{business_name} <%{from_email}>'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b9a930cd1..81ac38a98 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -26,6 +26,9 @@ de:
messages:
reset_password_success: Woot! Die Anforderung zum Zurücksetzen des Passworts ist erfolgreich. Überprüfen Sie Ihre E-Mails auf Anweisungen.
reset_password_failure: Uh ho! Wir konnten keinen Benutzer mit der angegebenen E-Mail-Adresse finden.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Die Löschanfrage Ihres Posteingangs wird in Kürze bearbeitet.
errors:
validations:
@@ -41,6 +44,8 @@ de:
failed: Anmeldung gescheitert
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Ungültiger Datentyp
@@ -209,6 +214,7 @@ de:
reply:
email:
header:
+ notifications: 'Push-Benachrichtigungen'
from_with_name: '%{assignee_name} von %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} von %{inbox_name} '
friendly_name: '%{sender_name} von %{business_name} <%{from_email}>'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 74dd457d5..0c4486581 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -26,6 +26,9 @@ el:
messages:
reset_password_success: Woot! Το αίτημά σας για επαναφορά κωδικού ενεργοποιήθηκε. Ελέξτε το email σας για οδηγίες.
reset_password_failure: Ωχ όχι! Δεν υπάρχει κάποιος χρήστης με το συγκεκριμένο email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ el:
failed: Η εγγραφή απέτυχε
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Μη έγκυρος τύπος δεδομένων
@@ -209,6 +214,7 @@ el:
reply:
email:
header:
+ notifications: 'Ειδοποιήσεις'
from_with_name: '%{assignee_name} από %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} από %{inbox_name} '
friendly_name: '%{sender_name} από %{business_name} <%{from_email}>'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e958c63b9..d5345a411 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -103,6 +103,8 @@ en:
invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
custom_attribute_definition:
key_conflict: The provided key is not allowed as it might conflict with default attributes.
+ account_saml_settings:
+ invalid_certificate: must be a valid X.509 certificate in PEM format
reports:
period: Reporting period %{since} to %{until}
utc_warning: The report generated is in UTC timezone
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 435f49f72..975cd8abe 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -26,6 +26,9 @@ es:
messages:
reset_password_success: '¡Genial! La solicitud de restablecimiento de contraseña ha sido exitosa. Revisa tu correo para ver las instrucciones.'
reset_password_failure: '¡Uh ho! No hemos podido encontrar ningún usuario con el correo electrónico especificado.'
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Su solicitud de eliminación de la bandeja de entrada será procesada en algún tiempo.
errors:
validations:
@@ -41,6 +44,8 @@ es:
failed: Registro fallido
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tipo de datos no válido
@@ -209,6 +214,7 @@ es:
reply:
email:
header:
+ notifications: 'Notificaciones'
from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} de %{inbox_name} '
friendly_name: '%{sender_name} de %{business_name} <%{from_email}>'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a8fb95447..d1eff63bc 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -26,6 +26,9 @@ fa:
messages:
reset_password_success: سوت! درخواست ریست شدن رمز عبور با موفقیت ارسال شد. ایمیل خود را چک کنید
reset_password_failure: اوه نه! کاربری با چنین ایمیلی وجود ندارد
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: درخواست حذف صندوق ورودی شما پس از مدتی پردازش خواهد شد.
errors:
validations:
@@ -41,6 +44,8 @@ fa:
failed: ثبت نام ناموفق بود
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: نوع داده نامعتبر است
@@ -209,6 +214,7 @@ fa:
reply:
email:
header:
+ notifications: 'اعلان ها'
from_with_name: '%{assignee_name} از %{inbox_name} «%{from_email}»'
reply_with_name: '%{assignee_name} از %{inbox_name} '
friendly_name: '%{sender_name} از %{business_name} «%{from_email}»'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0f9b6941b..c3849159a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -26,6 +26,9 @@ fi:
messages:
reset_password_success: Woot! Salasanan nollauspyyntö onnistui. Tarkista sähköpostisi saadaksesi ohjeita.
reset_password_failure: Hö! Emme löytäneet yhtään käyttäjää määritellyllä sähköpostilla.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ fi:
failed: Rekisteröityminen epäonnistui
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ fi:
reply:
email:
header:
+ notifications: 'Ilmoitukset'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 25d8cbf39..ad66cff99 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -26,6 +26,9 @@ fr:
messages:
reset_password_success: Super ! La demande de réinitialisation du mot de passe a réussi. Consultez vos e-mails pour obtenir des instructions.
reset_password_failure: Oh oh ! Nous n'avons trouvé aucun utilisateur avec le courriel spécifié.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Votre demande de suppression de la boîte de réception sera traitée dans un certain délai.
errors:
validations:
@@ -41,6 +44,8 @@ fr:
failed: L'inscription a échoué
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Type de données incorrect
@@ -209,6 +214,7 @@ fr:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} de %{inbox_name} '
friendly_name: '%{sender_name} de %{business_name} <%{from_email}>'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index c79d541c2..5d3ef2570 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -26,6 +26,9 @@ he:
messages:
reset_password_success: יאס! בקשה לאיפוס ססמה נשלחה בהצלחה. בדוק תיבת מייל להוראות.
reset_password_failure: אופס! לא מצאנו משתמש עם המייל שצוין.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ he:
failed: הרשמה נכשלה
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ he:
reply:
email:
header:
+ notifications: 'התראות'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d1a691607..a1edd3152 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -26,6 +26,9 @@ hi:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ hi:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ hi:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d9d46eab6..2c8387045 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -26,6 +26,9 @@ hr:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ hr:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ hr:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} iz %{business_name} <%{from_email}>'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 160c47c81..2e6c10162 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -26,6 +26,9 @@ hu:
messages:
reset_password_success: Mi?! A jelszóvisszaállítási kérésed sikeres volt. Nézd meg az e-mailed a részletekért.
reset_password_failure: Jajj ne! Nem találtunk felhasználót ezzel az e-mailcímmel.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: A beérkező üzeneteid törlésére vonatkozó kérésed nem sokára feldolgozásra kerül.
errors:
validations:
@@ -41,6 +44,8 @@ hu:
failed: Feliratkozás sikertelen
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Hibás adattípus
@@ -209,6 +214,7 @@ hu:
reply:
email:
header:
+ notifications: 'Értesítések'
from_with_name: '%{assignee_name} innen %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} innen %{inbox_name} '
friendly_name: '%{sender_name} innen %{business_name} <%{from_email}>'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index c366c0e20..9963a2d41 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -26,6 +26,9 @@ hy:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ hy:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ hy:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 09930bebb..b316c9841 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -26,6 +26,9 @@ id:
messages:
reset_password_success: Woot! Permintaan pengaturan ulang kata sandi berhasil. Periksa email Anda untuk mendapatkan petunjuk.
reset_password_failure: Aduh! Kami tidak dapat menemukan pengguna dengan email yang dimasukkan.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Permintaan penghapusan kotak masuk Anda akan diproses dalam beberapa waktu.
errors:
validations:
@@ -41,6 +44,8 @@ id:
failed: Pendaftaran gagal
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Jenis data tidak valid
@@ -209,6 +214,7 @@ id:
reply:
email:
header:
+ notifications: 'Notifikasi'
from_with_name: '%{assignee_name} dari %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} dari %{inbox_name} '
friendly_name: '%{sender_name} dari %{business_name} <%{from_email}>'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index c225123f6..f411abfeb 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -26,6 +26,9 @@ is:
messages:
reset_password_success: Woot! Beiðni um endurstillingu lykilorðs tókst. Skoðaðu póstinn þinn til að fá leiðbeiningar.
reset_password_failure: Uh ó! Við fundum engan notanda með tilgreint netfang.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ is:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ is:
reply:
email:
header:
+ notifications: 'Skilaboð'
from_with_name: '%{assignee_name} frá %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} frá %{inbox_name} '
friendly_name: '%{sender_name} frá %{business_name} <%{from_email}>'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 86b74c8f1..cb07d9d11 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -26,6 +26,9 @@ it:
messages:
reset_password_success: Woot! Richiesta di reimpostazione della password riuscita. Controlla la tua mail per le istruzioni.
reset_password_failure: Uh ho! Non siamo riusciti a trovare alcun utente con l'email specificata.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ it:
failed: Registrazione non riuscita
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tipo di dato non valido
@@ -209,6 +214,7 @@ it:
reply:
email:
header:
+ notifications: 'Notifiche'
from_with_name: '%{assignee_name} da %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} da %{inbox_name} '
friendly_name: '%{sender_name} da %{business_name} <%{from_email}>'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3f297acac..42cb77d8f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -26,6 +26,9 @@ ja:
messages:
reset_password_success: やりましたね! パスワードのリセットリクエストが成功しました。手順についてはメールを確認してください。
reset_password_failure: メールアドレスが見つかりませんでした。
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: 受信トレイの削除リクエストは、しばらくしてから処理されます。
errors:
validations:
@@ -41,6 +44,8 @@ ja:
failed: サインアップに失敗しました
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: 無効なデータ型。
@@ -209,6 +214,7 @@ ja:
reply:
email:
header:
+ notifications: '通知'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index a8a3334c6..f96ddb9c4 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -26,6 +26,9 @@ ka:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ka:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ka:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 913a381d3..efe46dad5 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -26,6 +26,9 @@ ko:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ko:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ko:
reply:
email:
header:
+ notifications: '알림'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a2b58cbd4..e7abb2965 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -26,6 +26,9 @@ lt:
messages:
reset_password_success: Kietai! Slaptažodžio nustatymo iš naujo užklausa įvykdyta. Instrukcijų ieškokite savo pašte.
reset_password_failure: Oho! Nepavyko rasti vartotojo su nurodytu el. pašto adresu.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Jūsų gautųj laiškų aplanko ištrynimo užklausa bus apdorota po kurio laiko.
errors:
validations:
@@ -41,6 +44,8 @@ lt:
failed: Prisijungimas nesėkmingas
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Neteisingas duomenų tipas
@@ -209,6 +214,7 @@ lt:
reply:
email:
header:
+ notifications: 'Perspėjimai'
from_with_name: '%{assignee_name} nuo %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} nuo %{inbox_name} '
friendly_name: '%{sender_name} nuo %{business_name} <%{from_email}>'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 8068359ee..cacbf8632 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -26,6 +26,9 @@ lv:
messages:
reset_password_success: Urā! Paroles atiestatīšanas pieprasījums ir veiksmīgs. Pārbaudiet savu e-pastu, lai iegūtu norādījumus.
reset_password_failure: Ak, vai! Mēs nevarējām atrast nevienu lietotāju ar norādīto e -pastu.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Jūsu iesūtnes dzēšanas pieprasījums pēc kāda laika tiks apstrādāts.
errors:
validations:
@@ -41,6 +44,8 @@ lv:
failed: Reģistrēšanās neizdevās
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Nederīgs datu tips
@@ -209,6 +214,7 @@ lv:
reply:
email:
header:
+ notifications: 'Paziņojumi'
from_with_name: '%{assignee_name} no %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} no %{inbox_name} '
friendly_name: '%{sender_name} no %{business_name} <%{from_email}>'
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index e9bd0c29a..f78201f22 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -26,6 +26,9 @@ ml:
messages:
reset_password_success: Woot! പാസ്വേഡ് പുനസജ്ജീകരണത്തിനുള്ള അഭ്യർത്ഥന വിജയകരമാണ്. നിർദ്ദേശങ്ങൾക്കായി നിങ്ങളുടെ മെയിൽ പരിശോധിക്കുക.
reset_password_failure: ക്ഷമിക്കണം! നിർദ്ദിഷ്ട ഇമെയിൽ ഉള്ള ഒരു ഉപയോക്താവിനെയും ഞങ്ങൾക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ml:
failed: സൈനപ്പ് പരാജയപ്പെട്ടു
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ml:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 886bf0a16..76a8cb2f2 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -26,6 +26,9 @@ ms:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ms:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ms:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index b3e62a14f..fe079fb3a 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -26,6 +26,9 @@ ne:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ne:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ne:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 0df3d02ca..b25a2acba 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -26,6 +26,9 @@ nl:
messages:
reset_password_success: Woot! Verzoek om wachtwoord te resetten is gelukt. Controleer je e-mail voor instructies.
reset_password_failure: Oh ho! We konden geen gebruiker vinden met het opgegeven e-mailadres.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Uw verzoek tot verwijdering binnen de inbox zal binnen enige tijd worden verwerkt.
errors:
validations:
@@ -41,6 +44,8 @@ nl:
failed: Aanmelden mislukt
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Ongeldig datatype
@@ -209,6 +214,7 @@ nl:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 2f3b003a1..3e61be54e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -26,6 +26,9 @@
messages:
reset_password_success: Woot! Forespørsel om tilbakestilling av passord er vellykket. Sjekk innboksen for instruksjoner.
reset_password_failure: Uff da! Vi fant ingen bruker med den angitte eposten.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Innboksen din slettingsforespørsel vil bli behandlet i løpet av en periode.
errors:
validations:
@@ -41,6 +44,8 @@
failed: Registrering mislyktes
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Ugyldig datatype
@@ -209,6 +214,7 @@
reply:
email:
header:
+ notifications: 'Varsler'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6080e1cd6..ead5d7bfd 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -26,6 +26,9 @@ pl:
messages:
reset_password_success: Woot! Prośba o zresetowanie hasła zakończona pomyślnie. Sprawdź swoją pocztę, aby uzyskać instrukcje.
reset_password_failure: Ups! Nie mogliśmy znaleźć żadnego użytkownika z podanym adresem e-mail.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Żądanie usunięcia skrzynki odbiorczej zostanie rozpatrzone za jakiś czas.
errors:
validations:
@@ -41,6 +44,8 @@ pl:
failed: Rejestracja nie powiodła się
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Nieprawidłowy typ danych
@@ -209,6 +214,7 @@ pl:
reply:
email:
header:
+ notifications: 'Powiadomienia'
from_with_name: '%{assignee_name} z %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} z %{inbox_name} '
friendly_name: '%{sender_name} z %{business_name} <%{from_email}>'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index aae43f973..d020a35d2 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -26,6 +26,9 @@ pt:
messages:
reset_password_success: Legal! Pedido de redefinição de senha bem sucedido. Verifique o seu e-mail para obter instruções.
reset_password_failure: Uh ho! Não conseguimos encontrar nenhum uutilizador com o e-mail especificado.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: O seu pedido de eliminação de caixa de entrada será processado mais tarde.
errors:
validations:
@@ -41,6 +44,8 @@ pt:
failed: Falha na inscrição
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tipo de dados inválido
@@ -209,6 +214,7 @@ pt:
reply:
email:
header:
+ notifications: 'Notificações'
from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} de %{inbox_name} '
friendly_name: '%{sender_name} de %{business_name} <%{from_email}>'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index e75d40e5d..2f5c5db13 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -26,6 +26,9 @@ pt_BR:
messages:
reset_password_success: Legal! A solicitação de alteração de senha foi bem sucedida. Verifique seu e-mail para obter instruções.
reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Seu pedido de exclusão da caixa de entrada será processado dentro de algum tempo.
errors:
validations:
@@ -41,6 +44,8 @@ pt_BR:
failed: Registro falhou
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tipo de dado inválido
@@ -209,6 +214,7 @@ pt_BR:
reply:
email:
header:
+ notifications: 'Notificações'
from_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} de %{inbox_name} '
friendly_name: '%{sender_name} de %{business_name} <%{from_email}>'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 954898ba1..c1333508d 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -26,6 +26,9 @@ ro:
messages:
reset_password_success: Woot! Cererea de resetare a parolei a reusit. Verifica emailul pentru instructiuni.
reset_password_failure: Nu am putut găsi niciun utilizator cu e-mailul specificat.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Solicitarea de ștergere a inboxului va fi procesată într-un anumit timp.
errors:
validations:
@@ -41,6 +44,8 @@ ro:
failed: Înregistrare eșuată
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Tip de date nevalid
@@ -209,6 +214,7 @@ ro:
reply:
email:
header:
+ notifications: 'Notificări'
from_with_name: '%{assignee_name} din %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} din %{inbox_name} '
friendly_name: '%{sender_name} din %{business_name} <%{from_email}>'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ffb2e706c..f313fd987 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -26,6 +26,9 @@ ru:
messages:
reset_password_success: Круто! Запрос на сброс пароля удался. Проверьте почту для получения инструкций.
reset_password_failure: Ой! Мы не смогли найти пользователя с указанным email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Ваш запрос на удаление входящих сообщений будет обработан через некоторое время.
errors:
validations:
@@ -41,6 +44,8 @@ ru:
failed: Ошибка регистрации
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Недопустимый тип данных
@@ -209,6 +214,7 @@ ru:
reply:
email:
header:
+ notifications: 'Уведомления'
from_with_name: '%{assignee_name} от %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} от %{inbox_name} <%{reply_email}>'
friendly_name: '%{sender_name} из %{business_name} <%{from_email}>'
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 0fdcc16ec..6e24bab5f 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -26,6 +26,9 @@ sh:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ sh:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ sh:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index dd237792d..7733bc83a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -26,6 +26,9 @@ sk:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ sk:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ sk:
reply:
email:
header:
+ notifications: 'Upozornenia'
from_with_name: '%{assignee_name} z %{inbox_name} '
reply_with_name: '%{assignee_name} z %{inbox_name} '
friendly_name: '%{sender_name} z %{business_name} '
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b855ec0e0..a05f4b0a0 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -26,6 +26,9 @@ sl:
messages:
reset_password_success: Juhu! Zahteva za ponastavitev gesla je bila uspešna. Preverite svojo e-pošto za navodila.
reset_password_failure: O ne! Nismo mogli najti nobenega uporabnika z navedenim e-poštnim naslovom.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Vaša zahteva za izbris predala bo obdelana čez nekaj časa.
errors:
validations:
@@ -41,6 +44,8 @@ sl:
failed: Registracija neuspešna
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Nepravilen podatkovni tip
@@ -209,6 +214,7 @@ sl:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} iz %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} iz %{inbox_name} '
friendly_name: '%{sender_name} iz %{business_name} <%{from_email}>'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 51e5c946f..6d460febc 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -26,6 +26,9 @@ sq:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ sq:
failed: Signup failed
assignment_policy:
not_found: Nuk u gjet politika e caktimit
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ sq:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 7bd84f3ff..ce2f15c61 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -26,6 +26,9 @@ sr-Latn:
messages:
reset_password_success: Opa! Zahtev za resetovanjem lozinke je uspešan. Proverite vašu e-poštu za uputstvo.
reset_password_failure: O ne! Nismo mogli da pronađemo nijednog korisnika sa navedenom e-poštom.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ sr-Latn:
failed: Registracija nije uspela
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Neispravan tip podatka
@@ -209,6 +214,7 @@ sr-Latn:
reply:
email:
header:
+ notifications: 'Obaveštenja'
from_with_name: '%{assignee_name} iz %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} iz %{inbox_name} '
friendly_name: '%{sender_name} iz %{business_name} <%{from_email}>'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 73a5d6d55..c17071f5e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -26,6 +26,9 @@ sv:
messages:
reset_password_success: Woot! Begäran om återställning av lösenord lyckades. Kontrollera din e-post för instruktioner.
reset_password_failure: Oj då! Vi kunde inte hitta någon användare med den angivna e-postadressen.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ sv:
failed: Registrering misslyckades
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ sv:
reply:
email:
header:
+ notifications: 'Aviseringar'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 4ffbef1e7..19641b16c 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -26,6 +26,9 @@ ta:
messages:
reset_password_success: வூட்! பாஸ்வேர்டை மீட்டமைப்பிற்கான கோரிக்கை வெற்றிகரமாக அனுப்பப்பட்டுள்ளது. வழிமுறைகளுக்கு உங்கள் ஈ-மெயிலைப் பார்க்கவும்.
reset_password_failure: மன்னிக்கவும்! குறிப்பிட்ட ஈ-மெயிலுடன் எந்த பயனரையும் எங்களால் கண்டுபிடிக்க முடியவில்லை.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ta:
failed: உள்நுழையும் முயறிசி தோல்வி அடைந்துள்ளது
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ta:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 1d468302a..9f19f5ce9 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -26,6 +26,9 @@ th:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ th:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ th:
reply:
email:
header:
+ notifications: 'การแจ้งเตือน'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index cfbbc1d0a..12895d79d 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -26,6 +26,9 @@ tl:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ tl:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ tl:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index fb67279bc..def97adec 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -26,6 +26,9 @@ tr:
messages:
reset_password_success: Parola sıfırlama isteği başarılı. Talimatlar için postanızı kontrol edin.
reset_password_failure: Belirtilen e-postaya sahip herhangi bir kullanıcı bulamadık.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Gelen kutusu silme isteğiniz bir süre sonra işleme alınacaktır.
errors:
validations:
@@ -41,6 +44,8 @@ tr:
failed: Kayıt başarısız oldu
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Hatalı veri türü
@@ -209,6 +214,7 @@ tr:
reply:
email:
header:
+ notifications: 'Bildirimler'
from_with_name: '"%{inbox_name} <%{from_email}> adresinden %{assignee_name}''e gönderildi,'
reply_with_name: '%{assignee_name} tarafından %{inbox_name} '
friendly_name: '%{sender_name} tarafından %{business_name} <%{from_email}>'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4f38c4e05..b81ad0117 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -26,6 +26,9 @@ uk:
messages:
reset_password_success: Круто! Запит на скидання пароля виконано успішно. Перевірте вашу пошту за подальшими інструкціями.
reset_password_failure: Ой-ой! Ми не змогли знайти жодного користувача з цією адресою електронної пошти.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Ваш запит на видалення буде оброблений протягом деякого часу.
errors:
validations:
@@ -41,6 +44,8 @@ uk:
failed: Помилка реєстрації
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Некоректний тип даних
@@ -209,6 +214,7 @@ uk:
reply:
email:
header:
+ notifications: 'Сповіщення'
from_with_name: '%{assignee_name} з %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} від %{inbox_name} '
friendly_name: '%{sender_name} з %{business_name} <%{from_email}>'
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index cb46599db..989147236 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -26,6 +26,9 @@ ur:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ur:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ur:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 7a376dbf7..6b6f03c42 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -26,6 +26,9 @@ ur:
messages:
reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Your inbox deletion request will be processed in some time.
errors:
validations:
@@ -41,6 +44,8 @@ ur:
failed: Signup failed
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ ur:
reply:
email:
header:
+ notifications: 'Notifications'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 81475add3..d2a55b176 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -26,6 +26,9 @@ vi:
messages:
reset_password_success: Chà! Yêu cầu đặt lại mật khẩu thành công. Kiểm tra thư của bạn để biết hướng dẫn.
reset_password_failure: Uh ho! Chúng tôi không thể tìm thấy bất kỳ người dùng nào có email được chỉ định.
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: Yêu cầu xoá hộp thư của bạn sẽ được xử lý.
errors:
validations:
@@ -41,6 +44,8 @@ vi:
failed: Đăng ký thât bại
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Kiểu dữ liệu không hợp lệ
@@ -209,6 +214,7 @@ vi:
reply:
email:
header:
+ notifications: 'Thông báo'
from_with_name: '%{assignee_name} từ %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} từ %{inbox_name} '
friendly_name: '%{sender_name} từ %{business_name} <%{from_email}>'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 915ec3eae..3c2dfe351 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -26,6 +26,9 @@ zh_CN:
messages:
reset_password_success: 哇！密码重置请求成功。请检查您的邮件获取说明。
reset_password_failure: 哎呀！我们找不到指定电子邮件的任何用户。
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: 您的收件箱删除请求将在一段时间内处理。
errors:
validations:
@@ -41,6 +44,8 @@ zh_CN:
failed: 注册失败
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: 错误的数据类型
@@ -209,6 +214,7 @@ zh_CN:
reply:
email:
header:
+ notifications: '消息通知'
from_with_name: '%{assignee_name} 来自 %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} 来自 %{inbox_name} '
friendly_name: '%{sender_name} 来自 %{business_name} <%{from_email}>'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 5ef823b2b..951eb57fc 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -26,6 +26,9 @@ zh_TW:
messages:
reset_password_success: 密碼重設成功，請確認您的信箱有收到重設信件。
reset_password_failure: 我們找不到用戶指定的電子郵件。
+ reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
+ login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
+ saml_not_available: SAML authentication is not available in this installation.
inbox_deletetion_response: 您的收件匣刪除請求將在一段時間後處理。
errors:
validations:
@@ -41,6 +44,8 @@ zh_TW:
failed: 註冊失敗。
assignment_policy:
not_found: Assignment policy not found
+ saml:
+ feature_not_enabled: SAML feature not enabled for this account
data_import:
data_type:
invalid: Invalid data type
@@ -209,6 +214,7 @@ zh_TW:
reply:
email:
header:
+ notifications: '通知'
from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
reply_with_name: '%{assignee_name} from %{inbox_name} '
friendly_name: '%{sender_name} from %{business_name} <%{from_email}>'
diff --git a/db/migrate/20250916024703_add_allowed_domains_to_channel_widgets.rb b/db/migrate/20250916024703_add_allowed_domains_to_channel_widgets.rb
new file mode 100644
index 000000000..b0df78df6
--- /dev/null
+++ b/db/migrate/20250916024703_add_allowed_domains_to_channel_widgets.rb
@@ -0,0 +1,5 @@
+class AddAllowedDomainsToChannelWidgets < ActiveRecord::Migration[7.1]
+ def change
+ add_column :channel_web_widgets, :allowed_domains, :text, default: ''
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b762891a3..36a532e86 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2025_08_26_000000) do
+ActiveRecord::Schema[7.1].define(version: 2025_09_16_024703) do
# These extensions should be enabled to support this database
enable_extension "pg_stat_statements"
enable_extension "pg_trgm"
@@ -533,6 +533,7 @@ ActiveRecord::Schema[7.1].define(version: 2025_08_26_000000) do
t.jsonb "pre_chat_form_options", default: {}
t.boolean "hmac_mandatory", default: false
t.boolean "continuity_via_email", default: true, null: false
+ t.text "allowed_domains", default: ""
t.index ["hmac_token"], name: "index_channel_web_widgets_on_hmac_token", unique: true
t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
end
diff --git a/enterprise/app/builders/enterprise/agent_builder.rb b/enterprise/app/builders/enterprise/agent_builder.rb
new file mode 100644
index 000000000..3007dbb61
--- /dev/null
+++ b/enterprise/app/builders/enterprise/agent_builder.rb
@@ -0,0 +1,13 @@
+module Enterprise::AgentBuilder
+ def perform
+ super.tap do |user|
+ convert_to_saml_provider(user) if user.persisted? && account.saml_enabled?
+ end
+ end
+
+ private
+
+ def convert_to_saml_provider(user)
+ user.update!(provider: 'saml') unless user.provider == 'saml'
+ end
+end
diff --git a/enterprise/app/builders/saml_user_builder.rb b/enterprise/app/builders/saml_user_builder.rb
index bd0059d07..97a287462 100644
--- a/enterprise/app/builders/saml_user_builder.rb
+++ b/enterprise/app/builders/saml_user_builder.rb
@@ -17,6 +17,7 @@ class SamlUserBuilder
user = User.from_email(auth_attribute('email'))
if user
+ confirm_user_if_required(user)
convert_existing_user_to_saml(user)
return user
end
@@ -24,6 +25,13 @@ class SamlUserBuilder
create_user
end
+ def confirm_user_if_required(user)
+ return if user.confirmed?
+
+ user.skip_confirmation!
+ user.save!
+ end
+
def convert_existing_user_to_saml(user)
return if user.provider == 'saml'
diff --git a/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb b/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
index efeb61a2f..9f00138cb 100644
--- a/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/saml_settings_controller.rb
@@ -7,11 +7,19 @@ class Api::V1::Accounts::SamlSettingsController < Api::V1::Accounts::BaseControl
def create
@saml_settings = Current.account.build_saml_settings(saml_settings_params)
- @saml_settings.save!
+ if @saml_settings.save
+ render :show
+ else
+ render json: { errors: @saml_settings.errors.full_messages }, status: :unprocessable_entity
+ end
end
def update
- @saml_settings.update!(saml_settings_params)
+ if @saml_settings.update(saml_settings_params)
+ render :show
+ else
+ render json: { errors: @saml_settings.errors.full_messages }, status: :unprocessable_entity
+ end
end
def destroy
diff --git a/enterprise/app/controllers/enterprise/devise_overrides/passwords_controller.rb b/enterprise/app/controllers/enterprise/devise_overrides/passwords_controller.rb
index bd4daee2a..3a20e0d71 100644
--- a/enterprise/app/controllers/enterprise/devise_overrides/passwords_controller.rb
+++ b/enterprise/app/controllers/enterprise/devise_overrides/passwords_controller.rb
@@ -5,6 +5,7 @@ module Enterprise::DeviseOverrides::PasswordsController
if saml_user_attempting_password_auth?(params[:email])
render json: {
success: false,
+ message: I18n.t('messages.reset_password_saml_user'),
errors: [I18n.t('messages.reset_password_saml_user')]
}, status: :forbidden
return
diff --git a/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb b/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
index ea456bdd1..adfc0413e 100644
--- a/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
+++ b/enterprise/app/controllers/enterprise/devise_overrides/sessions_controller.rb
@@ -5,6 +5,7 @@ module Enterprise::DeviseOverrides::SessionsController
if saml_user_attempting_password_auth?(params[:email], sso_auth_token: params[:sso_auth_token])
render json: {
success: false,
+ message: I18n.t('messages.login_saml_user'),
errors: [I18n.t('messages.login_saml_user')]
}, status: :unauthorized
return
diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
index 5466c86a4..5e70d2d79 100644
--- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
+++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
@@ -10,7 +10,7 @@ module Enterprise::SuperAdmin::AppConfigsController
when 'internal'
@allowed_configs = internal_config_options
when 'captain'
- @allowed_configs = %w[CAPTAIN_OPEN_AI_API_KEY CAPTAIN_OPEN_AI_MODEL CAPTAIN_OPEN_AI_ENDPOINT CAPTAIN_FIRECRAWL_API_KEY]
+ @allowed_configs = captain_config_options
else
super
end
@@ -36,4 +36,14 @@ module Enterprise::SuperAdmin::AppConfigsController
CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL CHATWOOT_INSTANCE_ADMIN_EMAIL
OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF CLOUDFLARE_API_KEY CLOUDFLARE_ZONE_ID]
end
+
+ def captain_config_options
+ %w[
+ CAPTAIN_OPEN_AI_API_KEY
+ CAPTAIN_OPEN_AI_MODEL
+ CAPTAIN_OPEN_AI_ENDPOINT
+ CAPTAIN_EMBEDDING_MODEL
+ CAPTAIN_FIRECRAWL_API_KEY
+ ]
+ end
end
diff --git a/enterprise/app/jobs/saml/update_account_users_provider_job.rb b/enterprise/app/jobs/saml/update_account_users_provider_job.rb
new file mode 100644
index 000000000..46f47829d
--- /dev/null
+++ b/enterprise/app/jobs/saml/update_account_users_provider_job.rb
@@ -0,0 +1,33 @@
+class Saml::UpdateAccountUsersProviderJob < ApplicationJob
+ queue_as :default
+
+ # Updates the authentication provider for users in an account
+ # This job is triggered when SAML settings are created or destroyed
+ def perform(account_id, provider)
+ account = Account.find(account_id)
+ account.users.find_each(batch_size: 1000) do |user|
+ next unless should_update_user_provider?(user, provider)
+
+ # rubocop:disable Rails/SkipsModelValidations
+ user.update_column(:provider, provider)
+ # rubocop:enable Rails/SkipsModelValidations
+ end
+ end
+
+ private
+
+ # Determines if a user's provider should be updated based on their multi-account status
+ # When resetting to 'email', only update users who don't have SAML enabled on other accounts
+ # This prevents breaking SAML authentication for users who belong to multiple accounts
+ def should_update_user_provider?(user, provider)
+ return !user_has_other_saml_accounts?(user) if provider == 'email'
+
+ true
+ end
+
+ # Checks if the user belongs to any other accounts that have SAML configured
+ # Used to preserve SAML authentication when one account disables SAML but others still use it
+ def user_has_other_saml_accounts?(user)
+ user.accounts.joins(:saml_settings).exists?
+ end
+end
diff --git a/enterprise/app/models/account_saml_settings.rb b/enterprise/app/models/account_saml_settings.rb
index 25e8aeffe..9e37f1c82 100644
--- a/enterprise/app/models/account_saml_settings.rb
+++ b/enterprise/app/models/account_saml_settings.rb
@@ -23,9 +23,13 @@ class AccountSamlSettings < ApplicationRecord
validates :sso_url, presence: true
validates :certificate, presence: true
validates :idp_entity_id, presence: true
+ validate :certificate_must_be_valid_x509
before_validation :set_sp_entity_id, if: :sp_entity_id_needs_generation?
+ after_create_commit :update_account_users_provider
+ after_destroy_commit :reset_account_users_provider
+
def saml_enabled?
sso_url.present? && certificate.present?
end
@@ -56,4 +60,20 @@ class AccountSamlSettings < ApplicationRecord
def installation_name
GlobalConfigService.load('INSTALLATION_NAME', 'Chatwoot')
end
+
+ def update_account_users_provider
+ Saml::UpdateAccountUsersProviderJob.perform_later(account_id, 'saml')
+ end
+
+ def reset_account_users_provider
+ Saml::UpdateAccountUsersProviderJob.perform_later(account_id, 'email')
+ end
+
+ def certificate_must_be_valid_x509
+ return if certificate.blank?
+
+ OpenSSL::X509::Certificate.new(certificate)
+ rescue OpenSSL::X509::CertificateError
+ errors.add(:certificate, I18n.t('errors.account_saml_settings.invalid_certificate'))
+ end
end
diff --git a/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb b/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb
new file mode 100644
index 000000000..91837f980
--- /dev/null
+++ b/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,45 @@
+Hi <%= @resource.name %>,
+
+<% account_user = @resource&.account_users&.first %>
+<% is_saml_account = account_user&.account&.saml_enabled? %>
+
+<% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
+ <% if is_saml_account %>
+ <%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to access <%= global_config['BRAND_NAME'] || 'Chatwoot' %> via Single Sign-On (SSO).
+ Your organization uses SSO for secure authentication. You will not need a password to access your account.
+ <% else %>
+ <%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.
+ <% end %>
+<% end %>
+
+<% if @resource.confirmed? %>
+ You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:
+<% else %>
+ <% if account_user&.inviter.blank? %>
+
+ Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
+
+ <% end %>
+ <% unless is_saml_account %>
+ Please take a moment and click the link below and activate your account.
+ <% end %>
+<% end %>
+
+
+<% if @resource.unconfirmed_email.present? %>
+ <%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %>
+<% elsif @resource.confirmed? %>
+ <% if is_saml_account %>
+ You can now access your account by logging in through your organization's SSO portal.
+ <% else %>
+ <%= link_to 'Login to my account', frontend_url('auth/sign_in') %>
+ <% end %>
+<% elsif account_user&.inviter.present? %>
+ <% if is_saml_account %>
+ You can access your account by logging in through your organization's SSO portal.
+ <% else %>
+ <%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %>
+ <% end %>
+<% else %>
+ <%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %>
+<% end %>
diff --git a/enterprise/lib/tasks.rb b/enterprise/lib/tasks.rb
deleted file mode 100644
index 139819bbb..000000000
--- a/enterprise/lib/tasks.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Load all rake tasks from the enterprise/lib/tasks directory
-module Tasks
- Dir.glob(File.join(File.dirname(__FILE__), 'tasks', '*.rake')).each { |r| load r }
-end
diff --git a/enterprise/lib/tasks/search.rake b/enterprise/lib/tasks/search.rake
index 03bad2c1b..4ec137434 100644
--- a/enterprise/lib/tasks/search.rake
+++ b/enterprise/lib/tasks/search.rake
@@ -1,22 +1,4 @@
-module Tasks::SearchTaskHelpers
- def check_opensearch_config
- if ENV['OPENSEARCH_URL'].blank?
- puts 'Skipping reindex as OPENSEARCH_URL is not configured'
- return false
- end
- true
- end
-
- def reindex_account(account)
- Messages::ReindexService.new(account: account).perform
- puts "Reindex task queued for account #{account.id}"
- end
-end
-
namespace :search do
- desc 'Reindex messages using searchkick'
- include Tasks::SearchTaskHelpers
-
desc 'Reindex messages for all accounts'
task all: :environment do
next unless check_opensearch_config
@@ -47,3 +29,16 @@ namespace :search do
reindex_account(account)
end
end
+
+def check_opensearch_config
+ if ENV['OPENSEARCH_URL'].blank?
+ puts 'Skipping reindex as OPENSEARCH_URL is not configured'
+ return false
+ end
+ true
+end
+
+def reindex_account(account)
+ Messages::ReindexService.new(account: account).perform
+ puts "Reindex task queued for account #{account.id}"
+end
diff --git a/enterprise/tasks_railtie.rb b/enterprise/tasks_railtie.rb
new file mode 100644
index 000000000..9a7d09360
--- /dev/null
+++ b/enterprise/tasks_railtie.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class TasksRailtie < Rails::Railtie
+ rake_tasks do
+ # Load all rake tasks from enterprise/lib/tasks
+ Dir.glob(Rails.root.join('enterprise/lib/tasks/**/*.rake')).each { |f| load f }
+ end
+end
diff --git a/lib/integrations/openai_base_service.rb b/lib/integrations/openai_base_service.rb
index f06baf5b5..7b4a93f95 100644
--- a/lib/integrations/openai_base_service.rb
+++ b/lib/integrations/openai_base_service.rb
@@ -81,7 +81,7 @@ class Integrations::OpenaiBaseService
end
def api_url
- endpoint = InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.value || 'https://api.openai.com/'
+ endpoint = InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_ENDPOINT')&.value.presence || 'https://api.openai.com/'
endpoint = endpoint.chomp('/')
"#{endpoint}/v1/chat/completions"
end
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index d0ea13e2b..f38660706 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -154,6 +154,25 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
portal.reload
expect(portal.archived).to be_truthy
end
+
+ it 'clears associated web widget when inbox selection is blank' do
+ web_widget_inbox = create(:inbox, account: account)
+ portal.update!(channel_web_widget: web_widget_inbox.channel)
+
+ expect(portal.channel_web_widget_id).to eq(web_widget_inbox.channel.id)
+
+ put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
+ params: {
+ portal: { name: portal.name },
+ inbox_id: ''
+ },
+ headers: admin.create_new_auth_token
+
+ expect(response).to have_http_status(:success)
+ portal.reload
+ expect(portal.channel_web_widget_id).to be_nil
+ expect(response.parsed_body['inbox']).to be_nil
+ end
end
end
diff --git a/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb b/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
index 2e74817a7..7beafb47b 100644
--- a/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
@@ -16,31 +16,7 @@ RSpec.describe 'WhatsApp Authorization API', type: :request do
let(:agent) { create(:user, account: account, role: :agent) }
let(:administrator) { create(:user, account: account, role: :administrator) }
- context 'when feature is not enabled' do
- before do
- account.disable_features!(:whatsapp_embedded_signup)
- end
-
- it 'returns forbidden' do
- post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
- params: {
- code: 'test_code',
- business_id: 'test_business_id',
- waba_id: 'test_waba_id'
- },
- headers: agent.create_new_auth_token,
- as: :json
-
- expect(response).to have_http_status(:forbidden)
- expect(response.parsed_body['error']).to eq('WhatsApp embedded signup is not enabled for this account')
- end
- end
-
- context 'when feature is enabled' do
- before do
- account.enable_features!(:whatsapp_embedded_signup)
- end
-
+ context 'when authenticated user makes request' do
it 'returns unprocessable entity when code is missing' do
post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
params: {
@@ -246,10 +222,6 @@ RSpec.describe 'WhatsApp Authorization API', type: :request do
context 'when user is not authorized for the account' do
let(:other_account) { create(:account) }
- before do
- account.enable_features!(:whatsapp_embedded_signup)
- end
-
it 'returns unauthorized' do
post "/api/v1/accounts/#{other_account.id}/whatsapp/authorization",
params: {
@@ -265,10 +237,6 @@ RSpec.describe 'WhatsApp Authorization API', type: :request do
end
context 'when user is an administrator' do
- before do
- account.enable_features!(:whatsapp_embedded_signup)
- end
-
it 'allows channel creation' do
embedded_signup_service = instance_double(Whatsapp::EmbeddedSignupService)
whatsapp_channel = create(:channel_whatsapp, account: account, validate_provider_config: false, sync_templates: false)
@@ -321,10 +289,6 @@ RSpec.describe 'WhatsApp Authorization API', type: :request do
context 'when user is an administrator' do
let(:administrator) { create(:user, account: account, role: :administrator) }
- before do
- account.enable_features!(:whatsapp_embedded_signup)
- end
-
context 'with valid parameters' do
let(:valid_params) do
{
@@ -489,7 +453,6 @@ RSpec.describe 'WhatsApp Authorization API', type: :request do
let(:agent) { create(:user, account: account, role: :agent) }
before do
- account.enable_features!(:whatsapp_embedded_signup)
create(:inbox_member, inbox: whatsapp_inbox, user: agent)
end
diff --git a/spec/enterprise/builders/agent_builder_spec.rb b/spec/enterprise/builders/agent_builder_spec.rb
new file mode 100644
index 000000000..8f0ae4c17
--- /dev/null
+++ b/spec/enterprise/builders/agent_builder_spec.rb
@@ -0,0 +1,139 @@
+require 'rails_helper'
+
+RSpec.describe AgentBuilder do
+ let(:email) { 'agent@example.com' }
+ let(:name) { 'Test Agent' }
+ let(:account) { create(:account) }
+ let!(:inviter) { create(:user, account: account, role: 'administrator') }
+ let(:builder) do
+ described_class.new(
+ email: email,
+ name: name,
+ account: account,
+ inviter: inviter
+ )
+ end
+
+ describe '#perform with SAML enabled' do
+ let(:saml_settings) do
+ create(:account_saml_settings, account: account)
+ end
+
+ before { saml_settings }
+
+ context 'when user does not exist' do
+ it 'creates a new user with SAML provider' do
+ expect { builder.perform }.to change(User, :count).by(1)
+
+ user = User.from_email(email)
+ expect(user.provider).to eq('saml')
+ end
+
+ it 'creates user with correct attributes' do
+ user = builder.perform
+
+ expect(user.email).to eq(email)
+ expect(user.name).to eq(name)
+ expect(user.provider).to eq('saml')
+ expect(user.encrypted_password).to be_present
+ end
+
+ it 'adds user to the account with correct role' do
+ user = builder.perform
+ account_user = AccountUser.find_by(user: user, account: account)
+
+ expect(account_user).to be_present
+ expect(account_user.role).to eq('agent')
+ expect(account_user.inviter).to eq(inviter)
+ end
+ end
+
+ context 'when user already exists with email provider' do
+ let!(:existing_user) { create(:user, email: email, provider: 'email') }
+
+ it 'does not create a new user' do
+ expect { builder.perform }.not_to change(User, :count)
+ end
+
+ it 'converts existing user to SAML provider' do
+ expect(existing_user.provider).to eq('email')
+
+ builder.perform
+
+ expect(existing_user.reload.provider).to eq('saml')
+ end
+
+ it 'adds existing user to the account' do
+ user = builder.perform
+ account_user = AccountUser.find_by(user: user, account: account)
+
+ expect(account_user).to be_present
+ expect(account_user.inviter).to eq(inviter)
+ end
+ end
+
+ context 'when user already exists with SAML provider' do
+ let!(:existing_user) { create(:user, email: email, provider: 'saml') }
+
+ it 'does not change the provider' do
+ expect { builder.perform }.not_to(change { existing_user.reload.provider })
+ end
+
+ it 'still adds user to the account' do
+ user = builder.perform
+ account_user = AccountUser.find_by(user: user, account: account)
+
+ expect(account_user).to be_present
+ end
+ end
+ end
+
+ describe '#perform without SAML' do
+ context 'when user does not exist' do
+ it 'creates a new user with email provider (default behavior)' do
+ expect { builder.perform }.to change(User, :count).by(1)
+
+ user = User.from_email(email)
+ expect(user.provider).to eq('email')
+ end
+ end
+
+ context 'when user already exists' do
+ let!(:existing_user) { create(:user, email: email, provider: 'email') }
+
+ it 'does not change the existing user provider' do
+ expect { builder.perform }.not_to(change { existing_user.reload.provider })
+ end
+ end
+ end
+
+ describe '#perform with different account configurations' do
+ context 'when account has no SAML settings' do
+ # No saml_settings created for this account
+
+ it 'treats account as non-SAML enabled' do
+ user = builder.perform
+ expect(user.provider).to eq('email')
+ end
+ end
+
+ context 'when SAML settings are deleted after user creation' do
+ let(:saml_settings) do
+ create(:account_saml_settings, account: account)
+ end
+ let(:existing_user) { create(:user, email: email, provider: 'saml') }
+
+ before do
+ saml_settings
+ existing_user
+ end
+
+ it 'does not affect existing SAML users when adding to account' do
+ saml_settings.destroy!
+
+ user = builder.perform
+ expect(user.provider).to eq('saml') # Unchanged
+ end
+ end
+ end
+end
diff --git a/spec/enterprise/builders/saml_user_builder_spec.rb b/spec/enterprise/builders/saml_user_builder_spec.rb
index 63fd65fd3..434beda16 100644
--- a/spec/enterprise/builders/saml_user_builder_spec.rb
+++ b/spec/enterprise/builders/saml_user_builder_spec.rb
@@ -109,6 +109,56 @@ RSpec.describe SamlUserBuilder do
expect { builder.perform }.not_to change(AccountUser, :count)
end
+
+ context 'when user is not confirmed' do
+ let(:unconfirmed_email) { 'unconfirmed_saml_user@example.com' }
+ let(:unconfirmed_auth_hash) do
+ {
+ 'provider' => 'saml',
+ 'uid' => 'saml-uid-123',
+ 'info' => {
+ 'email' => unconfirmed_email,
+ 'name' => 'SAML User',
+ 'first_name' => 'SAML',
+ 'last_name' => 'User'
+ },
+ 'extra' => {
+ 'raw_info' => {
+ 'groups' => %w[Administrators Users]
+ }
+ }
+ }
+ end
+ let(:unconfirmed_builder) { described_class.new(unconfirmed_auth_hash, account.id) }
+ let!(:existing_user) do
+ user = build(:user, email: unconfirmed_email)
+ user.confirmed_at = nil
+ user.save!(validate: false)
+ user
+ end
+
+ it 'confirms unconfirmed user after SAML authentication' do
+ expect(existing_user.confirmed?).to be false
+
+ unconfirmed_builder.perform
+
+ expect(existing_user.reload.confirmed?).to be true
+ end
+ end
+
+ context 'when user is already confirmed' do
+ let!(:existing_user) { create(:user, email: email, confirmed_at: Time.current) }
+
+ it 'keeps already confirmed user confirmed' do
+ expect(existing_user.confirmed?).to be true
+ original_confirmed_at = existing_user.confirmed_at
+
+ builder.perform
+
+ expect(existing_user.reload.confirmed?).to be true
+ expect(existing_user.reload.confirmed_at).to be_within(2.seconds).of(original_confirmed_at)
+ end
+ end
end
context 'with role mappings' do
diff --git a/spec/enterprise/jobs/saml/update_account_users_provider_job_spec.rb b/spec/enterprise/jobs/saml/update_account_users_provider_job_spec.rb
new file mode 100644
index 000000000..82bb6b015
--- /dev/null
+++ b/spec/enterprise/jobs/saml/update_account_users_provider_job_spec.rb
@@ -0,0 +1,65 @@
+require 'rails_helper'
+
+RSpec.describe Saml::UpdateAccountUsersProviderJob, type: :job do
+ let(:account) { create(:account) }
+ let!(:user1) { create(:user, accounts: [account], provider: 'email') }
+ let!(:user2) { create(:user, accounts: [account], provider: 'email') }
+ let!(:user3) { create(:user, accounts: [account], provider: 'google') }
+
+ describe '#perform' do
+ context 'when setting provider to saml' do
+ it 'updates all account users to saml provider' do
+ described_class.new.perform(account.id, 'saml')
+
+ expect(user1.reload.provider).to eq('saml')
+ expect(user2.reload.provider).to eq('saml')
+ expect(user3.reload.provider).to eq('saml')
+ end
+ end
+
+ context 'when resetting provider to email' do
+ before do
+ # rubocop:disable Rails/SkipsModelValidations
+ user1.update_column(:provider, 'saml')
+ user2.update_column(:provider, 'saml')
+ user3.update_column(:provider, 'saml')
+ # rubocop:enable Rails/SkipsModelValidations
+ end
+
+ context 'when users have no other SAML accounts' do
+ it 'updates all account users to email provider' do
+ described_class.new.perform(account.id, 'email')
+
+ expect(user1.reload.provider).to eq('email')
+ expect(user2.reload.provider).to eq('email')
+ expect(user3.reload.provider).to eq('email')
+ end
+ end
+
+ context 'when users belong to other accounts with SAML enabled' do
+ let(:other_account) { create(:account) }
+
+ before do
+ create(:account_saml_settings, account: other_account)
+ user1.account_users.create!(account: other_account, role: :agent)
+ end
+
+ it 'preserves SAML provider for users with other SAML accounts' do
+ described_class.new.perform(account.id, 'email')
+
+ expect(user1.reload.provider).to eq('saml')
+ expect(user2.reload.provider).to eq('email')
+ expect(user3.reload.provider).to eq('email')
+ end
+ end
+ end
+
+ context 'when account does not exist' do
+ it 'raises ActiveRecord::RecordNotFound' do
+ expect do
+ described_class.new.perform(999_999, 'saml')
+ end.to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
+ end
+end
diff --git a/spec/enterprise/mailers/devise_mailer_spec.rb b/spec/enterprise/mailers/devise_mailer_spec.rb
new file mode 100644
index 000000000..286e863f7
--- /dev/null
+++ b/spec/enterprise/mailers/devise_mailer_spec.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Devise::Mailer' do
+ describe 'confirmation_instructions with Enterprise features' do
+ let(:account) { create(:account) }
+ let!(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
+ let(:inviter_val) { nil }
+ let(:mail) { Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {}) }
+
+ before do
+ confirmable_user.update!(confirmed_at: nil)
+ confirmable_user.send(:generate_confirmation_token)
+ end
+
+ context 'with SAML enabled account' do
+ let(:saml_settings) { create(:account_saml_settings, account: account) }
+
+ before { saml_settings }
+
+ context 'when user has no inviter' do
+ it 'shows standard welcome message without SSO references' do
+ expect(mail.body).to match('We have a suite of powerful tools ready for you to explore.')
+ expect(mail.body).not_to match('via Single Sign-On')
+ end
+
+ it 'does not show activation instructions for SAML accounts' do
+ expect(mail.body).not_to match('Please take a moment and click the link below and activate your account')
+ end
+
+ it 'shows confirmation link' do
+ expect(mail.body).to include("app/auth/confirmation?confirmation_token=#{confirmable_user.confirmation_token}")
+ end
+ end
+
+ context 'when user has inviter and SAML is enabled' do
+ let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
+
+ it 'mentions SSO invitation' do
+ expect(mail.body).to match(
+ "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to access.*via Single Sign-On \\(SSO\\)"
+ )
+ end
+
+ it 'explains SSO authentication' do
+ expect(mail.body).to match('Your organization uses SSO for secure authentication')
+ expect(mail.body).to match('You will not need a password to access your account')
+ end
+
+ it 'does not show standard invitation message' do
+ expect(mail.body).not_to match('has invited you to try out')
+ end
+
+ it 'directs to SSO portal instead of password reset' do
+ expect(mail.body).to match('You can access your account by logging in through your organization\'s SSO portal')
+ expect(mail.body).not_to include('app/auth/password/edit')
+ end
+ end
+
+ context 'when user is already confirmed and has inviter' do
+ let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
+
+ before do
+ confirmable_user.confirm
+ end
+
+ it 'shows SSO login instructions' do
+ expect(mail.body).to match('You can now access your account by logging in through your organization\'s SSO portal')
+ expect(mail.body).not_to include('/auth/sign_in')
+ end
+ end
+
+ context 'when user updates email on SAML account' do
+ let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
+
+ before do
+ confirmable_user.update!(email: 'updated@example.com')
+ end
+
+ it 'still shows confirmation link for email verification' do
+ expect(mail.body).to include('app/auth/confirmation?confirmation_token')
+ expect(confirmable_user.unconfirmed_email.blank?).to be false
+ end
+ end
+
+ context 'when user is already confirmed with no inviter' do
+ before do
+ confirmable_user.confirm
+ end
+
+ it 'shows SSO login instructions instead of regular login' do
+ expect(mail.body).to match('You can now access your account by logging in through your organization\'s SSO portal')
+ expect(mail.body).not_to include('/auth/sign_in')
+ end
+ end
+ end
+
+ context 'when account does not have SAML enabled' do
+ context 'when user has inviter' do
+ let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
+
+ it 'shows standard invitation without SSO references' do
+ expect(mail.body).to match('has invited you to try out Chatwoot')
+ expect(mail.body).not_to match('via Single Sign-On')
+ expect(mail.body).not_to match('SSO portal')
+ end
+
+ it 'shows password reset link' do
+ expect(mail.body).to include('app/auth/password/edit')
+ end
+ end
+
+ context 'when user has no inviter' do
+ it 'shows standard welcome message and activation instructions' do
+ expect(mail.body).to match('We have a suite of powerful tools ready for you to explore')
+ expect(mail.body).to match('Please take a moment and click the link below and activate your account')
+ end
+
+ it 'shows confirmation link' do
+ expect(mail.body).to include("app/auth/confirmation?confirmation_token=#{confirmable_user.confirmation_token}")
+ end
+ end
+
+ context 'when user is already confirmed' do
+ let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
+
+ before do
+ confirmable_user.confirm
+ end
+
+ it 'shows regular login link' do
+ expect(mail.body).to include('/auth/sign_in')
+ expect(mail.body).not_to match('SSO portal')
+ end
+ end
+
+ context 'when user updates email' do
+ before do
+ confirmable_user.update!(email: 'updated@example.com')
+ end
+
+ it 'shows confirmation link for email verification' do
+ expect(mail.body).to include('app/auth/confirmation?confirmation_token')
+ expect(confirmable_user.unconfirmed_email.blank?).to be false
+ end
+ end
+ end
+ end
+end
diff --git a/spec/enterprise/models/account_saml_settings_spec.rb b/spec/enterprise/models/account_saml_settings_spec.rb
index 65d5119d7..ac35eb486 100644
--- a/spec/enterprise/models/account_saml_settings_spec.rb
+++ b/spec/enterprise/models/account_saml_settings_spec.rb
@@ -114,4 +114,21 @@ RSpec.describe AccountSamlSettings, type: :model do
expect(fingerprint.count(':')).to eq(19) # 20 bytes = 19 colons
end
end
+
+ describe 'callbacks' do
+ describe 'after_create_commit' do
+ it 'queues job to set account users to saml provider' do
+ expect(Saml::UpdateAccountUsersProviderJob).to receive(:perform_later).with(account.id, 'saml')
+ create(:account_saml_settings, account: account)
+ end
+ end
+
+ describe 'after_destroy_commit' do
+ it 'queues job to reset account users provider' do
+ settings = create(:account_saml_settings, account: account)
+ expect(Saml::UpdateAccountUsersProviderJob).to receive(:perform_later).with(account.id, 'email')
+ settings.destroy
+ end
+ end
+ end
end
diff --git a/spec/enterprise/models/inbox_spec.rb b/spec/enterprise/models/inbox_spec.rb
index b0e063600..6b0130c28 100644
--- a/spec/enterprise/models/inbox_spec.rb
+++ b/spec/enterprise/models/inbox_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Inbox do
it 'returns member ids with assignment capacity with inbox max_assignment_limit is configured' do
# agent 1 has 1 conversations, agent 2 has 2 conversations, agent 3 has 3 conversations and agent 4 with none
inbox.update(auto_assignment_config: { max_assignment_limit: 2 })
- expect(inbox.member_ids_with_assignment_capacity).to eq([inbox_member_1.user_id, inbox_member_4.user_id])
+ expect(inbox.member_ids_with_assignment_capacity).to contain_exactly(inbox_member_1.user_id, inbox_member_4.user_id)
end
it 'returns all member ids when inbox max_assignment_limit is not configured' do
diff --git a/spec/models/concerns/featurable_spec.rb b/spec/models/concerns/featurable_spec.rb
deleted file mode 100644
index 1cf0b87f2..000000000
--- a/spec/models/concerns/featurable_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Featurable do
- let(:account) { create(:account) }
-
- describe 'WhatsApp embedded signup feature' do
- it 'is disabled by default' do
- expect(account.feature_whatsapp_embedded_signup?).to be false
- expect(account.feature_enabled?('whatsapp_embedded_signup')).to be false
- end
-
- describe '#enable_features!' do
- it 'enables the whatsapp embedded signup feature' do
- account.enable_features!(:whatsapp_embedded_signup)
- expect(account.feature_whatsapp_embedded_signup?).to be true
- expect(account.feature_enabled?('whatsapp_embedded_signup')).to be true
- end
-
- it 'enables multiple features at once' do
- account.enable_features!(:whatsapp_embedded_signup, :help_center)
- expect(account.feature_whatsapp_embedded_signup?).to be true
- expect(account.feature_help_center?).to be true
- end
- end
-
- describe '#disable_features!' do
- before do
- account.enable_features!(:whatsapp_embedded_signup)
- end
-
- it 'disables the whatsapp embedded signup feature' do
- expect(account.feature_whatsapp_embedded_signup?).to be true
-
- account.disable_features!(:whatsapp_embedded_signup)
- expect(account.feature_whatsapp_embedded_signup?).to be false
- end
- end
-
- describe '#enabled_features' do
- it 'includes whatsapp_embedded_signup when enabled' do
- account.enable_features!(:whatsapp_embedded_signup)
- expect(account.enabled_features).to include('whatsapp_embedded_signup' => true)
- end
-
- it 'does not include whatsapp_embedded_signup when disabled' do
- account.disable_features!(:whatsapp_embedded_signup)
- expect(account.enabled_features).not_to include('whatsapp_embedded_signup' => true)
- end
- end
-
- describe '#all_features' do
- it 'includes whatsapp_embedded_signup in all features list' do
- expect(account.all_features).to have_key('whatsapp_embedded_signup')
- end
- end
- end
-end
diff --git a/spec/services/widget/token_service_expiry_spec.rb b/spec/services/widget/token_service_expiry_spec.rb
new file mode 100644
index 000000000..051a757a5
--- /dev/null
+++ b/spec/services/widget/token_service_expiry_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe Widget::TokenService, type: :service do
+ describe 'token expiry configuration' do
+ let(:service) { described_class.new(payload: {}) }
+
+ before do
+ # Clear any existing configs to ensure test isolation
+ InstallationConfig.where(name: 'WIDGET_TOKEN_EXPIRY').destroy_all
+ end
+
+ context 'with valid configuration' do
+ before do
+ create(:installation_config, name: 'WIDGET_TOKEN_EXPIRY', value: '30')
+ end
+
+ it 'uses the configured value for token expiry' do
+ freeze_time do
+ token = service.generate_token
+ decoded = JWT.decode(token, Rails.application.secret_key_base, true, algorithm: 'HS256').first
+ expect(decoded['iat']).to eq(Time.now.to_i)
+ expect(decoded['exp']).to eq(30.days.from_now.to_i)
+ end
+ end
+ end
+
+ context 'with empty configuration' do
+ before do
+ create(:installation_config, name: 'WIDGET_TOKEN_EXPIRY', value: '')
+ end
+
+ it 'uses the default expiry' do
+ freeze_time do
+ token = service.generate_token
+ decoded = JWT.decode(token, Rails.application.secret_key_base, true, algorithm: 'HS256').first
+ expect(decoded['iat']).to eq(Time.now.to_i)
+ expect(decoded['exp']).to eq(180.days.from_now.to_i)
+ end
+ end
+ end
+ end
+end