Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
977fe1afa5 | ||
|
|
bf29508e8c | ||
|
|
40e968fcee | ||
|
|
c45182a574 | ||
|
|
819d9b8ebb | ||
|
|
4491b681c5 | ||
|
|
dcd7718f8f | ||
|
|
c8c42e9086 | ||
|
|
004f88d5cd | ||
|
|
22c17d314d | ||
|
|
2b3e46ad53 | ||
|
|
43c5afd011 | ||
|
|
9432e4d86f | ||
|
|
de4106c093 | ||
|
|
ee30b14cba | ||
|
|
80c00149d2 | ||
|
|
a2a48771e1 | ||
|
|
7bd6cf2466 | ||
|
|
ac9247fecb | ||
|
|
8439a1d100 | ||
|
|
b709245b46 | ||
|
|
52e30336ad | ||
|
|
bee884c52f | ||
|
|
2ffa63d583 | ||
|
|
a0d08f8f88 | ||
|
|
09cc934fbd | ||
|
|
5a0ed5d36d | ||
|
|
dbbe188adc | ||
|
|
91bec23c48 | ||
|
|
90815f361a | ||
|
|
4f0abfed09 | ||
|
|
ad28e4acc5 |
@@ -40,7 +40,13 @@ Options:
|
||||
| `confirmationMessage` (optional) | Text to show to ask for agreement to continue | `Waiting for a facilitator to join the chat...` |
|
||||
| `exitMessage` (optional) | Text to show if the user rejects the Terms of Use. | `The chat is closed. You may close this window.` |
|
||||
| `anonymousDisplayName` (optional) | The display name for the chat user. | `Anonymous` |
|
||||
| `chatUnavailableMessage` (optional) | Text to show if no-one is available to respond | `The chat service is not available right now. Please try again later.` |
|
||||
| `chatUnavailableMessage` (optional) | Text to show on error or if the service is otherwise unavailable | `The chat service is not available right now. Please try again later.` |
|
||||
| `waitMessage` (optional) | Text to show if there is at least one facilitator online but they do not respond right away | `Please be patient, our online facilitators are currently responding to other support requests.` |
|
||||
| `chatOfflineMessage` (optional) | Text to show if there is no-one online respond | `All of the chat facilitators are currently offline.` |
|
||||
| `size` (optional) | The size of the start button. Can be 'small' or 'large' | `large` |
|
||||
| `position` (optional) | The position of the start button. Can be 'top left', 'top right', 'bottom left', 'bottom right'. | `bottom right` |
|
||||
| `waitInterval` (optional) | The interval (in ms) at which the bot sends the wait message | 120000 |
|
||||
|
||||
|
||||
## Feature list
|
||||
|
||||
|
||||
@@ -24,7 +24,13 @@ export const mockInitCrypto = jest.fn()
|
||||
export const mockStartClient = jest.fn(() => {
|
||||
return Promise.resolve('value');
|
||||
});
|
||||
export const mockOnce = jest.fn()
|
||||
export const mockOnce = jest
|
||||
.fn()
|
||||
.mockImplementation((event, callback) => {
|
||||
if (event === 'sync') {
|
||||
callback('PREPARED')
|
||||
}
|
||||
})
|
||||
export const mockStopClient = jest.fn(() => {
|
||||
return Promise.resolve('value');
|
||||
});
|
||||
|
||||
18
dist/bookmarklet.js
vendored
18
dist/bookmarklet.js
vendored
File diff suppressed because one or more lines are too long
18
dist/chatbox.js
vendored
18
dist/chatbox.js
vendored
File diff suppressed because one or more lines are too long
36
dist/component.js
vendored
Normal file
36
dist/component.js
vendored
Normal file
File diff suppressed because one or more lines are too long
17
dist/index.html
vendored
17
dist/index.html
vendored
@@ -13,21 +13,8 @@
|
||||
<script src="./chatbox.js"></script>
|
||||
<script>
|
||||
var config = {
|
||||
matrixServerUrl: 'https://matrix.rhok.space',
|
||||
botId: '@help-bot:rhok.space',
|
||||
roomName: 'Support Chat',
|
||||
termsUrl: 'https://tosdr.org/',
|
||||
introMessage: "This chat application does not collect any of your personal data or any data from your use of this service.",
|
||||
agreementMessage: 'Do you want to continue?',
|
||||
confirmationMessage: 'Waiting for a facilitator to join the chat...',
|
||||
exitMessage: 'The chat is closed. You may close this window.',
|
||||
chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
|
||||
anonymousDisplayName: 'Anonymous',
|
||||
position: 'bottom right',
|
||||
size: 'large',
|
||||
maxWaitTime: 6000*3,
|
||||
}
|
||||
|
||||
matrixServerUrl: 'https://matrix.safesupport.chat'
|
||||
};
|
||||
EmbeddableChatbox.mount(config);
|
||||
</script>
|
||||
|
||||
|
||||
15900
package-lock.json
generated
15900
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
11
package.json
11
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "private-safesupport-chatbox",
|
||||
"version": "1.2.1",
|
||||
"version": "2.3.2",
|
||||
"description": "A secure and private embeddable chatbox that connects to Riot",
|
||||
"main": "dist/chatbox.js",
|
||||
"scripts": {
|
||||
@@ -118,6 +118,8 @@
|
||||
"node-sass": "^4.13.1",
|
||||
"postcss-increase-specificity": "0.6.0",
|
||||
"postcss-loader": "3.0.0",
|
||||
"react": "^16.8.6",
|
||||
"react-dom": "^16.8.6",
|
||||
"sass-loader": "8.0.0",
|
||||
"style-loader": "1.1.2",
|
||||
"wait-for-expect": "^3.0.2",
|
||||
@@ -129,6 +131,7 @@
|
||||
"webpack-serve": "3.2.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"airtable": "^0.10.0",
|
||||
"browser-encrypt-attachment": "^0.3.0",
|
||||
"emoji-picker-react": "^3.1.3",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
@@ -137,11 +140,13 @@
|
||||
"node-localstorage": "^2.1.5",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
|
||||
"prop-types": "^15.6.2",
|
||||
"react": "^16.8.6",
|
||||
"react-dom": "^16.8.6",
|
||||
"react-onclickoutside": "^6.9.0",
|
||||
"react-test-renderer": "^16.13.0",
|
||||
"react-transition-group": "^4.0.0",
|
||||
"uuidv4": "^6.0.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.8.6",
|
||||
"react-dom": "^16.8.6"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,21 +13,8 @@
|
||||
<script src="./chatbox.js"></script>
|
||||
<script>
|
||||
var config = {
|
||||
matrixServerUrl: 'https://matrix.rhok.space',
|
||||
botId: '@help-bot:rhok.space',
|
||||
roomName: 'Support Chat',
|
||||
termsUrl: 'https://tosdr.org/',
|
||||
introMessage: "This chat application does not collect any of your personal data or any data from your use of this service.",
|
||||
agreementMessage: 'Do you want to continue?',
|
||||
confirmationMessage: 'Waiting for a facilitator to join the chat...',
|
||||
exitMessage: 'The chat is closed. You may close this window.',
|
||||
chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
|
||||
anonymousDisplayName: 'Anonymous',
|
||||
position: 'bottom right',
|
||||
size: 'large',
|
||||
maxWaitTime: 6000*3,
|
||||
}
|
||||
|
||||
matrixServerUrl: 'https://matrix.safesupport.chat'
|
||||
};
|
||||
EmbeddableChatbox.mount(config);
|
||||
</script>
|
||||
|
||||
|
||||
98
src/components/ChatboxWithSettings.js
Normal file
98
src/components/ChatboxWithSettings.js
Normal file
@@ -0,0 +1,98 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import Chatbox from './chatbox';
|
||||
import { DEFAULT_SETTINGS_ENDPOINT } from '../utils/constants';
|
||||
|
||||
const ChatboxWithSettings = ({ settingsEndpoint = null, matrixServerUrl, ...rest }) => {
|
||||
const [settings, setSettings] = useState({});
|
||||
const [shifts, setShifts] = useState();
|
||||
const [isAvailable, setAvailability] = useState(false);
|
||||
|
||||
const getSettings = async () => {
|
||||
const endpoint = settingsEndpoint || DEFAULT_SETTINGS_ENDPOINT;
|
||||
const url = `${endpoint}?homeserver=${encodeURIComponent(matrixServerUrl)}`;
|
||||
const res = await fetch(url);
|
||||
const data = await res.json();
|
||||
const { fields, schedule = [] } = data;
|
||||
|
||||
if (!fields) {
|
||||
const props = {
|
||||
...rest,
|
||||
enabled: true,
|
||||
isAvailable: true,
|
||||
};
|
||||
|
||||
return setSettings(props);
|
||||
}
|
||||
|
||||
const settingsObj = {};
|
||||
|
||||
setShifts(schedule);
|
||||
|
||||
Object.entries(fields).forEach(([k, v]) => {
|
||||
const [scope, key] = k.split('_');
|
||||
|
||||
if (scope === 'web') {
|
||||
settingsObj[key] = v;
|
||||
}
|
||||
});
|
||||
|
||||
if (!settingsObj.enabled) {
|
||||
settingsObj.enabled = false;
|
||||
}
|
||||
|
||||
return setSettings(settingsObj);
|
||||
};
|
||||
|
||||
const checkSchedule = () => {
|
||||
if (shifts.length === 0) {
|
||||
setAvailability(true);
|
||||
}
|
||||
|
||||
const weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
|
||||
|
||||
const now = new Date();
|
||||
const weekday = weekdays[now.getDay()];
|
||||
const hours = now.getHours();
|
||||
const minutes = now.getMinutes();
|
||||
|
||||
shifts.map(async (shift) => {
|
||||
const [startHours, startMinutes] = shift.start.split(':').map((t) => Number(t));
|
||||
const [endHours, endMinutes] = shift.end.split(':').map((t) => Number(t));
|
||||
if (
|
||||
shift.service === 'web'
|
||||
&& shift.weekday === weekday
|
||||
&& ((startHours < hours) || (startHours === hours && startMinutes <= minutes))
|
||||
&& ((endHours > hours) || (endHours === hours && endMinutes > minutes))
|
||||
) {
|
||||
setAvailability(true);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getSettings();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (shifts) {
|
||||
checkSchedule();
|
||||
}
|
||||
}, [shifts]);
|
||||
|
||||
return (
|
||||
/* eslint-disable react/jsx-props-no-spreading */
|
||||
<Chatbox matrixServerUrl={matrixServerUrl} isAvailable={isAvailable} {...settings} {...rest} />
|
||||
);
|
||||
};
|
||||
|
||||
ChatboxWithSettings.propTypes = {
|
||||
matrixServerUrl: PropTypes.string.isRequired,
|
||||
settingsEndpoint: PropTypes.string,
|
||||
};
|
||||
|
||||
ChatboxWithSettings.defaultProps = {
|
||||
settingsEndpoint: null,
|
||||
};
|
||||
|
||||
export default ChatboxWithSettings;
|
||||
@@ -34,16 +34,16 @@ const DEFAULT_INTRO_MESSAGE = "This chat application does not collect any of you
|
||||
const DEFAULT_AGREEMENT_MESSAGE = "Do you want to continue?"
|
||||
const DEFAULT_CONFIRMATION_MESSAGE = "Waiting for a facilitator to join the chat..."
|
||||
const DEFAULT_EXIT_MESSAGE = "The chat is closed. You may close this window."
|
||||
const DEFAULT_ANONYMOUS_DISPLAY_NAME="Anonymous"
|
||||
const DEFAULT_DISPLAY_NAME="Anonymous"
|
||||
const DEFAULT_CHAT_UNAVAILABLE_MESSAGE = "The chat service is not available right now. Please try again later."
|
||||
const DEFAULT_CHAT_OFFLINE_MESSAGE = "All of the chat facilitators are currently offline."
|
||||
const DEFAULT_WAIT_MESSAGE = "Please be patient, our online facilitators are currently responding to other support requests."
|
||||
const DEFAULT_ENCRYPTION_DISABLED = false
|
||||
const DEFAULT_POSITION = 'bottom right'
|
||||
const DEFAULT_SIZE = 'large'
|
||||
const DEFAULT_MAX_WAIT_MS = 600000 // 10 minutes
|
||||
const DEFAULT_WAIT_INTERVAL_MS = 120000 // 2 minutes
|
||||
|
||||
const DEFAULT_DOCK_LABEL = 'Start a new chat'
|
||||
const DEFAULT_ENABLED = false
|
||||
|
||||
class ChatBox extends React.Component {
|
||||
constructor(props) {
|
||||
@@ -151,25 +151,33 @@ class ChatBox extends React.Component {
|
||||
|
||||
exitChat = async (resetState=true) => {
|
||||
if (this.state.client) {
|
||||
await this.state.client.leave(this.state.roomId)
|
||||
try {
|
||||
await this.state.client.leave(this.state.roomId)
|
||||
|
||||
const auth = {
|
||||
type: 'm.login.password',
|
||||
user: this.state.userId,
|
||||
identifier: {
|
||||
type: "m.id.user",
|
||||
user: this.state.userId,
|
||||
},
|
||||
password: this.state.password,
|
||||
};
|
||||
const auth = {
|
||||
type: 'm.login.password',
|
||||
user: this.state.userId,
|
||||
identifier: {
|
||||
type: "m.id.user",
|
||||
user: this.state.userId,
|
||||
},
|
||||
password: this.state.password,
|
||||
};
|
||||
|
||||
await this.state.client.deactivateAccount(auth, true)
|
||||
await this.state.client.stopClient()
|
||||
await this.state.client.clearStores()
|
||||
this.setState({ client: null })
|
||||
await this.state.client.deactivateAccount(auth, true)
|
||||
await this.state.client.stopClient()
|
||||
await this.state.client.clearStores()
|
||||
} catch (err) {
|
||||
console.log("Error exiting chat", err)
|
||||
} finally {
|
||||
this.setState({ client: null, ready: true }) // no more loading animation
|
||||
window.clearInterval(this.state.waitIntervalId) // no more waiting messages
|
||||
}
|
||||
}
|
||||
|
||||
this.state.localStorage.clear()
|
||||
if (this.state.localStorage) {
|
||||
this.state.localStorage.clear()
|
||||
}
|
||||
|
||||
if (resetState) {
|
||||
this.setState(this.initialState)
|
||||
@@ -232,12 +240,6 @@ class ChatBox extends React.Component {
|
||||
this.setState({ ready: false })
|
||||
|
||||
const client = await this.createClientWithAccount()
|
||||
this.setState({
|
||||
client: client
|
||||
})
|
||||
client.setDisplayName(this.props.anonymousDisplayName)
|
||||
this.setMatrixListeners(client)
|
||||
|
||||
try {
|
||||
await client.initCrypto()
|
||||
} catch(err) {
|
||||
@@ -245,7 +247,15 @@ class ChatBox extends React.Component {
|
||||
}
|
||||
|
||||
await client.startClient()
|
||||
await this.createRoom(client)
|
||||
|
||||
client.once('sync', async (state, prevState, data) => {
|
||||
if (state === "PREPARED") {
|
||||
this.setState({ client })
|
||||
client.setDisplayName(this.props.displayName)
|
||||
this.setMatrixListeners(client)
|
||||
await this.createRoom(client)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
restartWithoutCrypto = async () => {
|
||||
@@ -277,35 +287,35 @@ class ChatBox extends React.Component {
|
||||
|
||||
let client;
|
||||
client = matrix.createClient(opts)
|
||||
this.setState({
|
||||
client: client,
|
||||
})
|
||||
await client.startClient()
|
||||
|
||||
try {
|
||||
this.setMatrixListeners(client)
|
||||
client.setDisplayName(this.props.anonymousDisplayName)
|
||||
await this.createRoom(client)
|
||||
await client.startClient()
|
||||
this.displayBotMessage({ body: UNENCRYPTION_NOTICE })
|
||||
} catch(err) {
|
||||
console.log("error", err)
|
||||
this.handleInitError(err)
|
||||
}
|
||||
client.once('sync', async (state, prevState, data) => {
|
||||
if (state === "PREPARED") {
|
||||
try {
|
||||
this.setState({ client })
|
||||
client.setDisplayName(this.props.displayName)
|
||||
this.setMatrixListeners(client)
|
||||
await this.createRoom(client)
|
||||
this.displayBotMessage({ body: UNENCRYPTION_NOTICE })
|
||||
} catch(err) {
|
||||
console.log("error", err)
|
||||
this.handleInitError(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
initializeUnencryptedChat = async () => {
|
||||
this.setState({ ready: false })
|
||||
|
||||
const client = await this.createClientWithAccount()
|
||||
this.setState({
|
||||
client: client
|
||||
})
|
||||
client.setDisplayName(this.props.anonymousDisplayName)
|
||||
this.setMatrixListeners(client)
|
||||
|
||||
await client.startClient()
|
||||
await this.createRoom(client)
|
||||
|
||||
client.once('sync', async (state, prevState, data) => {
|
||||
client.setDisplayName(this.props.displayName)
|
||||
this.setMatrixListeners(client)
|
||||
await this.createRoom(client)
|
||||
})
|
||||
}
|
||||
|
||||
handleInitError = (err) => {
|
||||
@@ -456,40 +466,15 @@ class ChatBox extends React.Component {
|
||||
const decryptionErrors = {...this.state.decryptionErrors}
|
||||
delete decryptionErrors[message.id]
|
||||
|
||||
const isOfflineNotice = message.content.msgtype === "m.notice" && message.content.body === CHAT_IS_OFFLINE_NOTICE
|
||||
|
||||
let newMessage = message
|
||||
|
||||
// when the bot sends a notice that the chat is offline
|
||||
// replace the message with the client-configured message
|
||||
// for now we're treating m.notice and m.text messages the same
|
||||
if (isOfflineNotice) {
|
||||
newMessage = {
|
||||
...message,
|
||||
content: {
|
||||
...message.content,
|
||||
body: this.props.chatOfflineMessage
|
||||
}
|
||||
}
|
||||
this.handleChatOffline()
|
||||
}
|
||||
|
||||
this.setState({
|
||||
messages: {
|
||||
...this.state.messages,
|
||||
[message.id]: newMessage,
|
||||
[message.id]: message,
|
||||
},
|
||||
decryptionErrors
|
||||
})
|
||||
}
|
||||
|
||||
handleChatOffline = () => {
|
||||
this.exitChat(false) // close the chat connection but keep chatbox state
|
||||
window.clearInterval(this.state.waitIntervalId) // no more waiting messages
|
||||
window.clearInterval(this.state.waitTimeoutId) // no more waiting messages
|
||||
this.setState({ ready: true }) // no more loading animation
|
||||
}
|
||||
|
||||
handleKeyDown = (e) => {
|
||||
switch (e.keyCode) {
|
||||
case 27:
|
||||
@@ -504,6 +489,21 @@ class ChatBox extends React.Component {
|
||||
}
|
||||
|
||||
setMatrixListeners = client => {
|
||||
client.on("sync", (state, prevState, data) => {
|
||||
switch (state) {
|
||||
case "ERROR":
|
||||
// update UI to say "Connection Lost"
|
||||
break;
|
||||
case "SYNCING":
|
||||
// update UI to remove any "Connection Lost" message
|
||||
break;
|
||||
case "PREPARED":
|
||||
// the client instance is ready to be queried.
|
||||
this.setState({ client: client })
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
client.on("Room.timeline", (event, room) => {
|
||||
const eventType = event.getType()
|
||||
const content = event.getContent()
|
||||
@@ -529,7 +529,6 @@ class ChatBox extends React.Component {
|
||||
this.verifyAllRoomDevices(client, room)
|
||||
this.setState({ facilitatorId: sender, ready: true })
|
||||
window.clearInterval(this.state.waitIntervalId)
|
||||
window.clearInterval(this.state.waitTimeoutId)
|
||||
}
|
||||
});
|
||||
|
||||
@@ -551,6 +550,26 @@ class ChatBox extends React.Component {
|
||||
this.setState({ typingStatus: null })
|
||||
}
|
||||
});
|
||||
|
||||
client.on("event", (event) => {
|
||||
const eventType = event.getType()
|
||||
const content = event.getContent()
|
||||
|
||||
if (eventType === 'm.bot.signal') {
|
||||
this.handleBotSignal(content.signal)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
handleBotSignal = (signal) => {
|
||||
switch (signal) {
|
||||
case 'END_CHAT':
|
||||
this.displayBotMessage({ body: this.props.exitMessage })
|
||||
return this.exitChat(false); // keep chat state
|
||||
case 'CHAT_OFFLINE':
|
||||
this.displayBotMessage({ body: this.props.chatOfflineMessage })
|
||||
return this.exitChat(false); // keep chat state
|
||||
}
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
@@ -572,14 +591,14 @@ class ChatBox extends React.Component {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
document.addEventListener("keydown", this.handleKeyDown, false);
|
||||
document.addEventListener("keydown", this.handleKeyDown, false)
|
||||
window.addEventListener('beforeunload', this.exitChat)
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
document.removeEventListener("keydown", this.handleKeyDown, false);
|
||||
document.removeEventListener("keydown", this.handleKeyDown, false)
|
||||
window.removeEventListener('beforeunload', this.exitChat)
|
||||
this.exitChat();
|
||||
this.exitChat()
|
||||
}
|
||||
|
||||
handleInputChange = e => {
|
||||
@@ -607,14 +626,7 @@ class ChatBox extends React.Component {
|
||||
}
|
||||
}, this.props.waitInterval)
|
||||
|
||||
const waitTimeoutId = window.setTimeout(() => {
|
||||
if (!this.state.facilitatorId && !this.state.ready) {
|
||||
this.displayBotMessage({ body: this.props.chatUnavailableMessage })
|
||||
this.handleChatOffline()
|
||||
}
|
||||
}, this.props.maxWaitTime)
|
||||
|
||||
this.setState({ waitIntervalId, waitTimeoutId })
|
||||
this.setState({ waitIntervalId })
|
||||
}
|
||||
|
||||
handleRejectTerms = () => {
|
||||
@@ -647,6 +659,10 @@ class ChatBox extends React.Component {
|
||||
}
|
||||
|
||||
render() {
|
||||
if (!this.props.enabled || !this.props.isAvailable) {
|
||||
return null
|
||||
}
|
||||
|
||||
const { ready, messages, messagesInFlight, inputValue, userId, roomId, typingStatus, opened, showDock, emojiSelectorOpen, isMobile, decryptionErrors } = this.state;
|
||||
const orderedMessages = Object.values(messages).sort((a,b) => a.timestamp - b.timestamp)
|
||||
const inputLabel = 'Send a message...'
|
||||
@@ -749,7 +765,7 @@ class ChatBox extends React.Component {
|
||||
)}
|
||||
}
|
||||
</Transition>
|
||||
{showDock && !roomId && <Dock handleToggleOpen={this.handleToggleOpen} size={this.props.size} />}
|
||||
{showDock && !roomId && <Dock handleToggleOpen={this.handleToggleOpen} size={this.props.size} label={this.props.dockLabel} />}
|
||||
{showDock && roomId && <Header handleToggleOpen={this.handleToggleOpen} opened={opened} handleExitChat={this.handleExitChat} />}
|
||||
</div>
|
||||
</div>
|
||||
@@ -767,14 +783,15 @@ ChatBox.propTypes = {
|
||||
confirmationMessage: PropTypes.string,
|
||||
exitMessage: PropTypes.string,
|
||||
chatUnavailableMessage: PropTypes.string,
|
||||
anonymousDisplayName: PropTypes.string,
|
||||
displayName: PropTypes.string,
|
||||
waitMessage: PropTypes.string,
|
||||
chatOfflineMessage: PropTypes.string,
|
||||
isEncryptionDisabled: PropTypes.bool,
|
||||
position: PropTypes.oneOf(['top left', 'top right', 'bottom left', 'bottom right']),
|
||||
size: PropTypes.oneOf(['small', 'large']),
|
||||
maxWaitTime: PropTypes.number,
|
||||
waitInterval: PropTypes.number,
|
||||
dockLabel: PropTypes.string,
|
||||
enabled: PropTypes.bool
|
||||
}
|
||||
|
||||
ChatBox.defaultProps = {
|
||||
@@ -786,15 +803,16 @@ ChatBox.defaultProps = {
|
||||
agreementMessage: DEFAULT_AGREEMENT_MESSAGE,
|
||||
confirmationMessage: DEFAULT_CONFIRMATION_MESSAGE,
|
||||
exitMessage: DEFAULT_EXIT_MESSAGE,
|
||||
anonymousDisplayName: DEFAULT_ANONYMOUS_DISPLAY_NAME,
|
||||
displayName: DEFAULT_DISPLAY_NAME,
|
||||
chatUnavailableMessage: DEFAULT_CHAT_UNAVAILABLE_MESSAGE,
|
||||
waitMessage: DEFAULT_WAIT_MESSAGE,
|
||||
chatOfflineMessage: DEFAULT_CHAT_OFFLINE_MESSAGE,
|
||||
isEncryptionDisabled: DEFAULT_ENCRYPTION_DISABLED,
|
||||
position: DEFAULT_POSITION,
|
||||
size: DEFAULT_SIZE,
|
||||
maxWaitTime: DEFAULT_MAX_WAIT_MS,
|
||||
waitInterval: DEFAULT_WAIT_INTERVAL_MS,
|
||||
dockLabel: DEFAULT_DOCK_LABEL,
|
||||
enabled: DEFAULT_ENABLED,
|
||||
}
|
||||
|
||||
export default ChatBox;
|
||||
|
||||
@@ -115,9 +115,7 @@ describe('Chatbox', () => {
|
||||
expect(createClient).toHaveBeenCalled()
|
||||
expect(mockInitCrypto).toHaveBeenCalled()
|
||||
expect(mockStartClient).toHaveBeenCalled()
|
||||
expect(mockCreateRoom).toHaveBeenCalled()
|
||||
expect(mockSetPowerLevel).toHaveBeenCalled()
|
||||
expect(mockOn).toHaveBeenCalled()
|
||||
expect(mockOnce).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('rejecting terms should not start chat', async () => {
|
||||
@@ -146,6 +144,10 @@ describe('Chatbox', () => {
|
||||
|
||||
acceptButton.simulate('click')
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockOnce).toHaveBeenCalled()
|
||||
});
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockCreateRoom).toHaveBeenCalled()
|
||||
});
|
||||
@@ -169,7 +171,7 @@ describe('Chatbox', () => {
|
||||
})
|
||||
|
||||
|
||||
test('decryption failure should lead to a new unencrypted chat', async () => {
|
||||
test('decryption failure should handle the message event and save the event ID in state', async () => {
|
||||
const chatbox = mount(<Chatbox {...testConfig} />)
|
||||
const dock = chatbox.find('button.dock')
|
||||
const instance = chatbox.instance()
|
||||
@@ -183,25 +185,25 @@ describe('Chatbox', () => {
|
||||
acceptButton.simulate('click')
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockCreateRoom).toHaveBeenCalled()
|
||||
expect(mockOnce).toHaveBeenCalled()
|
||||
});
|
||||
|
||||
jest.spyOn(instance, 'initializeUnencryptedChat')
|
||||
instance.handleDecryptionError()
|
||||
jest.spyOn(instance, 'handleMessageEvent')
|
||||
|
||||
instance.handleDecryptionError({
|
||||
getId: () => 'test_event_id',
|
||||
getType: () => 'm.message',
|
||||
getSender: () => 'sender',
|
||||
getRoomId: () => 'room id',
|
||||
getContent: () => ({ body: 'test msg' }),
|
||||
getTs: () => '123',
|
||||
})
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockLeave).toHaveBeenCalled()
|
||||
});
|
||||
expect(instance.handleMessageEvent).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockStopClient).toHaveBeenCalled()
|
||||
});
|
||||
|
||||
await waitForExpect(() => {
|
||||
expect(mockClearStores).toHaveBeenCalled()
|
||||
});
|
||||
|
||||
expect(instance.initializeUnencryptedChat).toHaveBeenCalled()
|
||||
expect(chatbox.state().decryptionErrors).toEqual({ 'test_event_id': true })
|
||||
})
|
||||
|
||||
test('creating an unencrypted chat', async () => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React, { Fragment } from "react"
|
||||
import PropTypes from "prop-types"
|
||||
|
||||
const Dock = ({ handleToggleOpen, size }) => {
|
||||
const Dock = ({ handleToggleOpen, size, label }) => {
|
||||
return(
|
||||
<button
|
||||
type="button"
|
||||
@@ -13,11 +13,11 @@ const Dock = ({ handleToggleOpen, size }) => {
|
||||
{
|
||||
size === 'small' ?
|
||||
<div id="open-chatbox-label">
|
||||
<span>Chat</span><span className="icon">+</span>
|
||||
<span>{label}</span><span className="icon">+</span>
|
||||
</div>
|
||||
:
|
||||
<Fragment>
|
||||
<div id="open-chatbox-label">Start a new chat</div>
|
||||
<div id="open-chatbox-label">{label}</div>
|
||||
<div className="label-icon">
|
||||
<div className={`btn-icon`} aria-label={`Open support chat window`}>+</div>
|
||||
</div>
|
||||
|
||||
3
src/outputs/component.js
Normal file
3
src/outputs/component.js
Normal file
@@ -0,0 +1,3 @@
|
||||
import Chatbox from '../components/chatbox';
|
||||
|
||||
export default Chatbox;
|
||||
@@ -1,13 +1,14 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import Chatbox from '../components/chatbox';
|
||||
import ChatboxWithSettings from '../components/ChatboxWithSettings';
|
||||
import '../../vendor/cleanslate.css';
|
||||
|
||||
export default class EmbeddableChatbox {
|
||||
static el;
|
||||
|
||||
static mount({ parentElement = null, ...props } = {}) {
|
||||
const component = <Chatbox {...props} />; // eslint-disable-line
|
||||
const component = <ChatboxWithSettings {...props} />; // eslint-disable-line
|
||||
|
||||
|
||||
function doRender() {
|
||||
if (EmbeddableChatbox.el) {
|
||||
|
||||
3
src/setupTests.js
Normal file
3
src/setupTests.js
Normal file
@@ -0,0 +1,3 @@
|
||||
import { configure } from 'enzyme';
|
||||
import Adapter from 'enzyme-adapter-react-16';
|
||||
configure({ adapter: new Adapter() });
|
||||
1
src/utils/constants.js
Normal file
1
src/utils/constants.js
Normal file
@@ -0,0 +1 @@
|
||||
export const DEFAULT_SETTINGS_ENDPOINT = 'https://admin.safesupport.chat/api/get-settings';
|
||||
@@ -94,4 +94,29 @@ module.exports = [{
|
||||
publicPath: '/',
|
||||
filename: 'bookmarklet.js',
|
||||
},
|
||||
}, {
|
||||
...defaultConfig,
|
||||
entry: './src/outputs/component.js',
|
||||
output: {
|
||||
path: distDir,
|
||||
publicPath: '/',
|
||||
filename: 'component.js',
|
||||
library: 'Chatbox',
|
||||
libraryExport: 'default',
|
||||
libraryTarget: 'commonjs2',
|
||||
},
|
||||
externals: {
|
||||
react: {
|
||||
commonjs: "react",
|
||||
commonjs2: "react",
|
||||
amd: "React",
|
||||
root: "React"
|
||||
},
|
||||
"react-dom": {
|
||||
commonjs: "react-dom",
|
||||
commonjs2: "react-dom",
|
||||
amd: "ReactDOM",
|
||||
root: "ReactDOM"
|
||||
}
|
||||
}
|
||||
}];
|
||||
|
||||
43
yarn.lock
43
yarn.lock
@@ -1786,6 +1786,11 @@
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
|
||||
integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
|
||||
|
||||
"@types/node@^14.0.14":
|
||||
version "14.14.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.0.tgz#f1091b6ad5de18e8e91bdbd43ec63f13de372538"
|
||||
integrity sha512-BfbIHP9IapdupGhq/hc+jT5dyiBVZ2DdeC5WwJWQWDb0GijQlzUFAeIQn/2GtvZcd2HVUU7An8felIICFTC2qg==
|
||||
|
||||
"@types/normalize-package-data@^2.4.0":
|
||||
version "2.4.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
|
||||
@@ -2017,6 +2022,18 @@ abbrev@1:
|
||||
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
|
||||
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
|
||||
|
||||
abort-controller@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
|
||||
integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
|
||||
dependencies:
|
||||
event-target-shim "^5.0.0"
|
||||
|
||||
abortcontroller-polyfill@^1.4.0:
|
||||
version "1.5.0"
|
||||
resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.5.0.tgz#2c562f530869abbcf88d949a2b60d1d402e87a7c"
|
||||
integrity sha512-O6Xk757Jb4o0LMzMOMdWvxpHWrQzruYBaUruFaIOfAQRnWFxfdXYobw12jrVHGtoXk6WiiyYzc0QWN9aL62HQA==
|
||||
|
||||
accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
|
||||
version "1.3.7"
|
||||
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
|
||||
@@ -2084,6 +2101,17 @@ airbnb-prop-types@^2.15.0:
|
||||
prop-types-exact "^1.2.0"
|
||||
react-is "^16.9.0"
|
||||
|
||||
airtable@^0.10.0:
|
||||
version "0.10.0"
|
||||
resolved "https://registry.yarnpkg.com/airtable/-/airtable-0.10.0.tgz#29f7f5fb209b898b72238fe847142cf2a41210b2"
|
||||
integrity sha512-6gBUG+z1kqvwyHYWlc+y74TfYpc18mvmNuVcefjlvd6MSgLP9Hk47ByyBS6Ke8zdSk6kBTDpdiwCjoJQUpu6yg==
|
||||
dependencies:
|
||||
"@types/node" "^14.0.14"
|
||||
abort-controller "^3.0.0"
|
||||
abortcontroller-polyfill "^1.4.0"
|
||||
lodash "4.17.19"
|
||||
node-fetch "^2.6.0"
|
||||
|
||||
ajv-errors@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
|
||||
@@ -4405,6 +4433,11 @@ etag@~1.8.1:
|
||||
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
|
||||
integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
|
||||
|
||||
event-target-shim@^5.0.0:
|
||||
version "5.0.1"
|
||||
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
|
||||
integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
|
||||
|
||||
eventemitter3@4.0.0, eventemitter3@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
|
||||
@@ -6817,6 +6850,11 @@ lodash.sortby@^4.7.0:
|
||||
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
|
||||
integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
|
||||
|
||||
lodash@4.17.19:
|
||||
version "4.17.19"
|
||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
|
||||
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
|
||||
|
||||
lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.10:
|
||||
version "4.17.15"
|
||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
|
||||
@@ -7303,6 +7341,11 @@ node-fetch@^2.3.0:
|
||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
|
||||
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
|
||||
|
||||
node-fetch@^2.6.0:
|
||||
version "2.6.1"
|
||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
|
||||
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
|
||||
|
||||
node-forge@0.9.0:
|
||||
version "0.9.0"
|
||||
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
|
||||
|
||||
Reference in New Issue
Block a user