+ {toggleButton}
+
);
}
});
diff --git a/src/skins/vector/views/organisms/CasLogin.js b/src/skins/vector/views/organisms/CasLogin.js
deleted file mode 100644
index ad9dbed95..000000000
--- a/src/skins/vector/views/organisms/CasLogin.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2015 OpenMarket Ltd
-
-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.
-*/
-
-'use strict';
-
-var React = require('react');
-
-var CasLoginController = require('matrix-react-sdk/lib/controllers/organisms/CasLogin');
-
-module.exports = React.createClass({
- displayName: 'CasLogin',
- mixins: [CasLoginController],
-
- render: function() {
- return (
-
+
+
+
+
+
+
+
+ What does this mean?
+
+
-
-
- );
- },
-
-});
diff --git a/src/skins/vector/views/pages/Login.js b/src/skins/vector/views/pages/Login.js
new file mode 100644
index 000000000..b8f0e43ee
--- /dev/null
+++ b/src/skins/vector/views/pages/Login.js
@@ -0,0 +1,199 @@
+/*
+Copyright 2015 OpenMarket Ltd
+
+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.
+*/
+
+'use strict';
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var sdk = require('matrix-react-sdk');
+var Signup = require("matrix-react-sdk/lib/Signup");
+var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin");
+var CasLogin = require("matrix-react-sdk/lib/components/CasLogin");
+
+/**
+ * A wire component which glues together login UI components and Signup logic
+ */
+module.exports = React.createClass({displayName: 'Login',
+ propTypes: {
+ onLoggedIn: React.PropTypes.func.isRequired,
+ homeserverUrl: React.PropTypes.string,
+ identityServerUrl: React.PropTypes.string,
+ // login shouldn't know or care how registration is done.
+ onRegisterClick: React.PropTypes.func.isRequired
+ },
+
+ getDefaultProps: function() {
+ return {
+ homeserverUrl: 'https://matrix.org/',
+ identityServerUrl: 'https://vector.im'
+ };
+ },
+
+ getInitialState: function() {
+ return {
+ busy: false,
+ errorText: null,
+ enteredHomeserverUrl: this.props.homeserverUrl,
+ enteredIdentityServerUrl: this.props.identityServerUrl
+ };
+ },
+
+ componentWillMount: function() {
+ this._initLoginLogic();
+ },
+
+ onPasswordLogin: function(username, password) {
+ var self = this;
+ self.setState({
+ busy: true
+ });
+
+ this._loginLogic.loginViaPassword(username, password).then(function(data) {
+ self.props.onLoggedIn(data);
+ }, function(error) {
+ self._setErrorTextFromError(error);
+ }).finally(function() {
+ self.setState({
+ busy: false
+ });
+ });
+ },
+
+ onHsUrlChanged: function(newHsUrl) {
+ this._initLoginLogic(newHsUrl);
+ },
+
+ onIsUrlChanged: function(newIsUrl) {
+ this._initLoginLogic(null, newIsUrl);
+ },
+
+ _initLoginLogic: function(hsUrl, isUrl) {
+ var self = this;
+ hsUrl = hsUrl || this.state.enteredHomeserverUrl;
+ isUrl = isUrl || this.state.enteredIdentityServerUrl;
+
+ var loginLogic = new Signup.Login(hsUrl, isUrl);
+ this._loginLogic = loginLogic;
+
+ loginLogic.getFlows().then(function(flows) {
+ // old behaviour was to always use the first flow without presenting
+ // options. This works in most cases (we don't have a UI for multiple
+ // logins so let's skip that for now).
+ loginLogic.chooseFlow(0);
+ }, function(err) {
+ self._setErrorTextFromError(err);
+ }).finally(function() {
+ self.setState({
+ busy: false
+ });
+ });
+
+ this.setState({
+ enteredHomeserverUrl: hsUrl,
+ enteredIdentityServerUrl: isUrl,
+ busy: true,
+ errorText: null // reset err messages
+ });
+ },
+
+ _getCurrentFlowStep: function() {
+ return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null
+ },
+
+ _setErrorTextFromError: function(err) {
+ if (err.friendlyText) {
+ this.setState({
+ errorText: err.friendlyText
+ });
+ return;
+ }
+
+ var errCode = err.errcode;
+ if (!errCode && err.httpStatus) {
+ errCode = "HTTP " + err.httpStatus;
+ }
+ this.setState({
+ errorText: (
+ "Error: Problem communicating with the given homeserver " +
+ (errCode ? "(" + errCode + ")" : "")
+ )
+ });
+ },
+
+ componentForStep: function(step) {
+ switch (step) {
+ case 'm.login.password':
+ return (
+
+ Sorry, this homeserver is using a login which is not
+ recognised by Vector ({step})
+
+ );
+ }
+ },
+
+ render: function() {
+ var Loader = sdk.getComponent("atoms.Spinner");
+ var loader = this.state.busy ?
+
+ );
+ }
+});
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 0553c25a1..f8708f0e0 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -89,11 +89,14 @@ module.exports = React.createClass({
});
},
+ onRegisterClick: function() {
+ this.showScreen("register");
+ },
+
render: function() {
var LeftPanel = sdk.getComponent('organisms.LeftPanel');
var RoomView = sdk.getComponent('organisms.RoomView');
var RightPanel = sdk.getComponent('organisms.RightPanel');
- var Login = sdk.getComponent('templates.Login');
var UserSettings = sdk.getComponent('organisms.UserSettings');
var Register = sdk.getComponent('templates.Register');
var CreateRoom = sdk.getComponent('organisms.CreateRoom');
@@ -164,8 +167,9 @@ module.exports = React.createClass({
/>
);
} else {
+ var Login = sdk.getComponent("pages.Login");
return (
-
+
+
+ 
+
+
+
+
+
+ +
+ Sign in
+ {this.componentForStep(this._getCurrentFlowStep())} +
+ { loader }
+ {this.state.errorText}
+
+
+ Create a new account
+
+ + +
-
-
-
- );
- // XXX: clearly these should be separate organisms
- case 'stage_m.login.password':
- return (
-
-
-
-
-
- );
- case 'stage_m.login.cas':
- var CasLogin = sdk.getComponent('organisms.CasLogin');
- return (
-
-
- -
- );
- },
-
- render: function() {
- return (
- Sign in
- {this.componentForStep(this.state.step)} -
- { loader }
- {this.state.errorText}
-
- Create a new account
- - -
-
- );
- }
-});
-
-
-
-
- {this.loginContent()}
-
-