Pull down some CAS stuff from vector into controller and logic class

pull/21833/head
Steven Hammerton 2015-10-12 10:13:01 +01:00
parent 3f67d8541f
commit 4e0d930014
3 changed files with 69 additions and 3 deletions

28
src/CasLogic.js Normal file
View File

@ -0,0 +1,28 @@
/*
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 Url = require ('url');
function getServiceUrl() {
var parsedUrl = Url.parse(window.location.href);
return parsedUrl.protocol + "//" + parsedUrl.host + parsedUrl.pathname;
}
module.exports = {
getServiceUrl: getServiceUrl
};

View File

@ -0,0 +1,37 @@
/*
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 MatrixClientPeg = require("../../MatrixClientPeg");
var Cas = require("../../CasLogic");
module.exports = {
onCasClicked: function(ev) {
var serviceRedirectUrl = Cas.getServiceUrl() + "#/login/cas";
var self = this;
MatrixClientPeg.get().getCasServer().done(function(data) {
var serverUrl = data.serverUrl + "/login?service=" + encodeURIComponent(serviceRedirectUrl);
window.location.href = serverUrl;
}, function(error) {
self.setStep("stage_m.login.cas");
self.setState({errorText: 'Login failed.'});
});
},
};

View File

@ -23,6 +23,8 @@ var q = require("q");
var sdk = require('../../index'); var sdk = require('../../index');
var MatrixTools = require('../../MatrixTools'); var MatrixTools = require('../../MatrixTools');
var Cas = require("../../CasLogic");
module.exports = { module.exports = {
PageTypes: { PageTypes: {
RoomView: "room_view", RoomView: "room_view",
@ -132,12 +134,11 @@ module.exports = {
var self = this; var self = this;
var client = MatrixClientPeg.get(); var client = MatrixClientPeg.get();
var splitLocation = window.location.href.split('/'); var serviceUrl = Cas.getServiceUrl();
var serviceUrl = splitLocation[0] + "//" + splitLocation[2];
client.loginWithCas(payload.params.ticket, serviceUrl).done(function(data) { client.loginWithCas(payload.params.ticket, serviceUrl).done(function(data) {
MatrixClientPeg.replaceUsingAccessToken( MatrixClientPeg.replaceUsingAccessToken(
client.getHsUrl(), client.getIsUrl(), client.getHomeserverUrl(), client.getIdentityServerUrl(),
data.user_id, data.access_token data.user_id, data.access_token
); );
self.setState({ self.setState({