@@ -114,7 +79,7 @@ export default class IntegrationsManager extends React.Component {
);
}
- if (this.state.loading) {
+ if (this.props.loading) {
const Spinner = sdk.getComponent("elements.Spinner");
return (
@@ -124,7 +89,7 @@ export default class IntegrationsManager extends React.Component {
);
}
- if (!this.state.connected) {
+ if (!this.props.connected) {
return (
{_t("Cannot connect to integrations server")}
@@ -133,6 +98,6 @@ export default class IntegrationsManager extends React.Component {
);
}
- return ;
+ return ;
}
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 75ab80a837..c5ef2fd989 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1265,6 +1265,17 @@
"Missing session data": "Missing session data",
"Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
"Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.",
+ "Identity Server": "Identity Server",
+ "Integrations Manager": "Integrations Manager",
+ "Find others by phone or email": "Find others by phone or email",
+ "Be found by phone or email": "Be found by phone or email",
+ "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
+ "Terms of Service": "Terms of Service",
+ "To continue you need to accept the Terms of this service.": "To continue you need to accept the Terms of this service.",
+ "Service": "Service",
+ "Summary": "Summary",
+ "Terms": "Terms",
+ "Next": "Next",
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
"We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
"Room contains unknown devices": "Room contains unknown devices",
@@ -1298,7 +1309,6 @@
"Enter Recovery Passphrase": "Enter Recovery Passphrase",
"Warning: you should only set up key backup from a trusted computer.": "Warning: you should only set up key backup from a trusted computer.",
"Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Access your secure message history and set up secure messaging by entering your recovery passphrase.",
- "Next": "Next",
"If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options": "If you've forgotten your recovery passphrase you can use your recovery key or set up new recovery options",
"Enter Recovery Key": "Enter Recovery Key",
"This looks like a valid recovery key!": "This looks like a valid recovery key!",
diff --git a/src/integrations/integrations.js b/src/integrations/integrations.js
new file mode 100644
index 0000000000..1c371bd6fa
--- /dev/null
+++ b/src/integrations/integrations.js
@@ -0,0 +1,65 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import sdk from "../index";
+import ScalarAuthClient from '../ScalarAuthClient';
+import Modal from '../Modal';
+import { TermsNotSignedError } from '../Terms';
+
+export async function showIntegrationsManager(opts) {
+ const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+
+ let props = {};
+ if (ScalarAuthClient.isPossible()) {
+ props.loading = true;
+ } else {
+ props.configured = false;
+ }
+
+ const close = Modal.createTrackedDialog(
+ 'Integrations Manager', '', IntegrationsManager, props, "mx_IntegrationsManager",
+ ).close;
+
+ if (!ScalarAuthClient.isPossible()) {
+ return;
+ }
+
+ const scalarClient = new ScalarAuthClient();
+ try {
+ await scalarClient.connect();
+ if (!scalarClient.hasCredentials()) {
+ props = { connected: false };
+ } else {
+ props = {
+ url: scalarClient.getScalarInterfaceUrlForRoom(
+ opts.room,
+ opts.screen,
+ opts.integrationId,
+ ),
+ };
+ }
+ } catch (err) {
+ if (err instanceof TermsNotSignedError) {
+ // user canceled terms dialog, so just cancel the action
+ close();
+ return;
+ }
+ console.error(err);
+ props = { connected: false };
+ }
+ close();
+ Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, props, "mx_IntegrationsManager");
+}
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 267d62a7bb..c1a426383b 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -1,6 +1,7 @@
/*
Copyright 2017 MTRNord and Cooperative EITA
Copyright 2017 Vector Creations Ltd.
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -353,6 +354,40 @@ export function getCurrentLanguage() {
return counterpart.getLocale();
}
+/**
+ * Given a list of language codes, pick the most appropriate one
+ * given the current language (ie. getCurrentLanguage())
+ * English is assumed to be a reasonable default.
+ *
+ * @param {string[]} langs List of language codes to pick from
+ * @returns {string} The most appropriate language code from langs
+ */
+export function pickBestLanguage(langs) {
+ const currentLang = getCurrentLanguage();
+ const normalisedLangs = langs.map(normalizeLanguageKey);
+
+ {
+ // Best is an exact match
+ const currentLangIndex = normalisedLangs.indexOf(currentLang);
+ if (currentLangIndex > -1) return langs[currentLangIndex];
+ }
+
+ {
+ // Failing that, a different dialect of the same lnguage
+ const closeLangIndex = normalisedLangs.find((l) => l.substr(0,2) === currentLang.substr(0,2));
+ if (closeLangIndex > -1) return langs[closeLangIndex];
+ }
+
+ {
+ // Neither of those? Try an english variant.
+ const enIndex = normalisedLangs.find((l) => l.startsWith('en'));
+ if (enIndex > -1) return langs[enIndex];
+ }
+
+ // if nothing else, use the first
+ return langs[0];
+}
+
function getLangsJson() {
return new Promise((resolve, reject) => {
let url;
diff --git a/test/ScalarAuthClient-test.js b/test/ScalarAuthClient-test.js
new file mode 100644
index 0000000000..7e944189a6
--- /dev/null
+++ b/test/ScalarAuthClient-test.js
@@ -0,0 +1,56 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+
+import sinon from 'sinon';
+
+import ScalarAuthClient from '../src/ScalarAuthClient';
+import MatrixClientPeg from '../src/MatrixClientPeg';
+import { stubClient } from './test-utils';
+
+describe('ScalarAuthClient', function() {
+ let clientSandbox;
+
+ beforeEach(function() {
+ sinon.stub(window.localStorage, 'getItem').withArgs('mx_scalar_token').returns('brokentoken');
+ clientSandbox = stubClient();
+ });
+
+ afterEach(function() {
+ clientSandbox.restore();
+ sinon.restore();
+ });
+
+ it('should request a new token if the old one fails', async function() {
+ const sac = new ScalarAuthClient();
+
+ sac._getAccountName = sinon.stub();
+ sac._getAccountName.withArgs('brokentoken').rejects({
+ message: "Invalid token",
+ });
+ sac._getAccountName.withArgs('wokentoken').resolves(MatrixClientPeg.get().getUserId());
+
+ MatrixClientPeg.get().getOpenIdToken = sinon.stub().resolves('this is your openid token');
+
+ sac.exchangeForScalarToken = sinon.stub().withArgs('this is your openid token').resolves('wokentoken');
+
+ await sac.connect();
+
+ expect(sac.exchangeForScalarToken.calledWith('this is your openid token')).toBeTruthy();
+ expect(sac.scalarToken).toEqual('wokentoken');
+ });
+});
diff --git a/test/Terms-test.js b/test/Terms-test.js
new file mode 100644
index 0000000000..3fc7b56e42
--- /dev/null
+++ b/test/Terms-test.js
@@ -0,0 +1,195 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+
+import sinon from 'sinon';
+
+import * as Matrix from 'matrix-js-sdk';
+
+import { startTermsFlow, Service } from '../src/Terms';
+import { stubClient } from './test-utils';
+import MatrixClientPeg from '../src/MatrixClientPeg';
+
+const POLICY_ONE = {
+ version: "six",
+ en: {
+ name: "The first policy",
+ url: "http://example.com/one",
+ },
+};
+
+const POLICY_TWO = {
+ version: "IX",
+ en: {
+ name: "The second policy",
+ url: "http://example.com/two",
+ },
+};
+
+const IM_SERVICE_ONE = new Service(Matrix.SERVICE_TYPES.IM, 'https://imone.test', 'a token token');
+const IM_SERVICE_TWO = new Service(Matrix.SERVICE_TYPES.IM, 'https://imtwo.test', 'a token token');
+
+describe('Terms', function() {
+ let sandbox;
+
+ beforeEach(function() {
+ sandbox = stubClient();
+ });
+
+ afterEach(function() {
+ sandbox.restore();
+ });
+
+ it('should prompt for all terms & services if no account data', async function() {
+ MatrixClientPeg.get().getAccountData = sinon.stub().returns(null);
+ MatrixClientPeg.get().getTerms = sinon.stub().returns({
+ policies: {
+ "policy_the_first": POLICY_ONE,
+ },
+ });
+ const interactionCallback = sinon.stub().resolves([]);
+ await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
+ console.log("interaction callback calls", interactionCallback.getCall(0));
+
+ expect(interactionCallback.calledWith([
+ {
+ service: IM_SERVICE_ONE,
+ policies: {
+ policy_the_first: POLICY_ONE,
+ },
+ },
+ ])).toBeTruthy();
+ });
+
+ it('should not prompt if all policies are signed in account data', async function() {
+ MatrixClientPeg.get().getAccountData = sinon.stub().returns({
+ getContent: sinon.stub().returns({
+ accepted: ["http://example.com/one"],
+ }),
+ });
+ MatrixClientPeg.get().getTerms = sinon.stub().returns({
+ policies: {
+ "policy_the_first": POLICY_ONE,
+ },
+ });
+ MatrixClientPeg.get().agreeToTerms = sinon.stub();
+
+ const interactionCallback = sinon.spy();
+ await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
+ console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+
+ expect(interactionCallback.called).toBeFalsy();
+ expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+ Matrix.SERVICE_TYPES.IM,
+ 'https://imone.test',
+ 'a token token',
+ ["http://example.com/one"],
+ )).toBeTruthy();
+ });
+
+ it("should prompt for only terms that aren't already signed", async function() {
+ MatrixClientPeg.get().getAccountData = sinon.stub().returns({
+ getContent: sinon.stub().returns({
+ accepted: ["http://example.com/one"],
+ }),
+ });
+ MatrixClientPeg.get().getTerms = sinon.stub().returns({
+ policies: {
+ "policy_the_first": POLICY_ONE,
+ "policy_the_second": POLICY_TWO,
+ },
+ });
+ MatrixClientPeg.get().agreeToTerms = sinon.stub();
+
+ const interactionCallback = sinon.stub().resolves(["http://example.com/one", "http://example.com/two"]);
+ await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
+ console.log("interactionCallback call", interactionCallback.getCall(0).args);
+ console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+
+ expect(interactionCallback.calledWith([
+ {
+ service: IM_SERVICE_ONE,
+ policies: {
+ policy_the_second: POLICY_TWO,
+ },
+ },
+ ])).toBeTruthy();
+ expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+ Matrix.SERVICE_TYPES.IM,
+ 'https://imone.test',
+ 'a token token',
+ ["http://example.com/one", "http://example.com/two"],
+ )).toBeTruthy();
+ });
+
+ it("should prompt for only services with un-agreed policies", async function() {
+ MatrixClientPeg.get().getAccountData = sinon.stub().returns({
+ getContent: sinon.stub().returns({
+ accepted: ["http://example.com/one"],
+ }),
+ });
+
+ MatrixClientPeg.get().getTerms = sinon.stub();
+ MatrixClientPeg.get().getTerms.callsFake((serviceType, baseUrl, accessToken) => {
+ switch (baseUrl) {
+ case 'https://imone.test':
+ return {
+ policies: {
+ "policy_the_first": POLICY_ONE,
+ },
+ };
+ case 'https://imtwo.test':
+ return {
+ policies: {
+ "policy_the_second": POLICY_TWO,
+ },
+ };
+ }
+ });
+
+ MatrixClientPeg.get().agreeToTerms = sinon.stub();
+
+ const interactionCallback = sinon.stub().resolves(["http://example.com/one", "http://example.com/two"]);
+ await startTermsFlow([IM_SERVICE_ONE, IM_SERVICE_TWO], interactionCallback);
+ console.log("getTerms call 0", MatrixClientPeg.get().getTerms.getCall(0).args);
+ console.log("getTerms call 1", MatrixClientPeg.get().getTerms.getCall(1).args);
+ console.log("interactionCallback call", interactionCallback.getCall(0).args);
+ console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+
+ expect(interactionCallback.calledWith([
+ {
+ service: IM_SERVICE_TWO,
+ policies: {
+ policy_the_second: POLICY_TWO,
+ },
+ },
+ ])).toBeTruthy();
+ expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+ Matrix.SERVICE_TYPES.IM,
+ 'https://imone.test',
+ 'a token token',
+ ["http://example.com/one"],
+ )).toBeTruthy();
+ expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+ Matrix.SERVICE_TYPES.IM,
+ 'https://imtwo.test',
+ 'a token token',
+ ["http://example.com/two"],
+ )).toBeTruthy();
+ });
+});
+