imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Steven Hammerton 2015-10-12 10:13:01 +01:00
parent 3f67d8541f
commit 4e0d930014
3 changed files with 69 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/pages/MatrixChat.js
View file

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