diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 6a01b3fb55..b5eb73d92b 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -35,6 +35,8 @@ angular.module('eventHandlerService', [])
$rootScope.events = {
rooms: {}, // will contain roomId: { messages:[], members:{userid1: event} }
};
+
+ $rootScope.presence = {};
var initRoom = function(room_id) {
if (!(room_id in $rootScope.events.rooms)) {
@@ -44,6 +46,12 @@ angular.module('eventHandlerService', [])
$rootScope.events.rooms[room_id].members = {};
}
}
+
+ var reInitRoom = function(room_id) {
+ $rootScope.events.rooms[room_id] = {};
+ $rootScope.events.rooms[room_id].messages = [];
+ $rootScope.events.rooms[room_id].members = {};
+ }
var handleMessage = function(event, isLiveEvent) {
if ("membership_target" in event.content) {
@@ -85,6 +93,7 @@ angular.module('eventHandlerService', [])
};
var handlePresence = function(event, isLiveEvent) {
+ $rootScope.presence[event.content.user_id] = event;
$rootScope.$broadcast(PRESENCE_EVENT, event, isLiveEvent);
};
@@ -118,6 +127,10 @@ angular.module('eventHandlerService', [])
for (var i=0; i<events.length; i++) {
this.handleEvent(events[i], isLiveEvents);
}
- }
+ },
+
+ reInitRoom: function(room_id) {
+ reInitRoom(room_id);
+ },
};
}]);
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index fa5a6091d3..d5738e01c8 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -79,7 +79,6 @@ angular.module('matrixService', [])
return $http(request);
};
-
return {
/****** Home server API ******/
prefix: prefixPath,
@@ -310,17 +309,25 @@ angular.module('matrixService', [])
},
// hit the Identity Server for a 3PID request.
- linkEmail: function(email) {
+ linkEmail: function(email, clientSecret, sendAttempt) {
var path = "/matrix/identity/api/v1/validate/email/requestToken"
- var data = "clientSecret=abc123&email=" + encodeURIComponent(email);
+ var data = "clientSecret="+clientSecret+"&email=" + encodeURIComponent(email)+"&sendAttempt="+sendAttempt;
var headers = {};
headers["Content-Type"] = "application/x-www-form-urlencoded";
return doBaseRequest(config.identityServer, "POST", path, {}, data, headers);
},
- authEmail: function(userId, tokenId, code) {
+ authEmail: function(clientSecret, tokenId, code) {
var path = "/matrix/identity/api/v1/validate/email/submitToken";
- var data = "token="+code+"&mxId="+encodeURIComponent(userId)+"&tokenId="+tokenId;
+ var data = "token="+code+"&sid="+tokenId+"&clientSecret="+clientSecret;
+ var headers = {};
+ headers["Content-Type"] = "application/x-www-form-urlencoded";
+ return doBaseRequest(config.identityServer, "POST", path, {}, data, headers);
+ },
+
+ bindEmail: function(userId, tokenId, clientSecret) {
+ var path = "/matrix/identity/api/v1/3pid/bind";
+ var data = "mxid="+encodeURIComponent(userId)+"&sid="+tokenId+"&clientSecret="+clientSecret;
var headers = {};
headers["Content-Type"] = "application/x-www-form-urlencoded";
return doBaseRequest(config.identityServer, "POST", path, {}, data, headers);
@@ -393,6 +400,7 @@ angular.module('matrixService', [])
// Set a new config (Use saveConfig to actually store it permanently)
setConfig: function(newConfig) {
config = newConfig;
+ console.log("new IS: "+config.identityServer);
},
// Commits config into permanent storage
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index a3d7308312..35d0ef1654 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -157,6 +157,6 @@ angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload',
}
);
};
-
+
$scope.refresh();
}]);
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js
index cd13dcea82..51f9a3bdf4 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -70,6 +70,7 @@ angular.module('LoginController', ['matrixService'])
$scope.login = function() {
matrixService.setConfig({
homeserver: $scope.account.homeserver,
+ identityServer: $scope.account.identityServer,
user_id: $scope.account.user_id
});
// try to login
@@ -79,6 +80,7 @@ angular.module('LoginController', ['matrixService'])
$scope.feedback = "Login successful.";
matrixService.setConfig({
homeserver: $scope.account.homeserver,
+ identityServer: $scope.account.identityServer,
user_id: response.data.user_id,
access_token: response.data.access_token
});
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 65a33dd60b..3311618825 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -15,8 +15,8 @@ limitations under the License.
*/
angular.module('RoomController', ['ngSanitize', 'mUtilities'])
-.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities',
- function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities) {
+.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities', '$rootScope',
+ function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities, $rootScope) {
'use strict';
var MESSAGES_PER_PAGINATION = 30;
var THUMBNAIL_SIZE = 320;
@@ -152,6 +152,8 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
};
var updateMemberList = function(chunk) {
+ if (chunk.room_id != $scope.room_id) return;
+
var isNewMember = !(chunk.target_user_id in $scope.members);
if (isNewMember) {
// FIXME: why are we copying these fields around inside chunk?
@@ -199,6 +201,10 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
);
});
*/
+
+ if (chunk.target_user_id in $rootScope.presence) {
+ updatePresence($rootScope.presence[chunk.target_user_id]);
+ }
}
else {
// selectively update membership else it will nuke the picture and displayname too :/
@@ -265,7 +271,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
$scope.onInit = function() {
console.log("onInit");
-
+
// Does the room ID provided in the URL?
var room_id_or_alias;
if ($routeParams.room_id_or_alias) {
@@ -316,6 +322,8 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
};
var onInit2 = function() {
+ eventHandlerService.reInitRoom($scope.room_id);
+
// Join the room
matrixService.join($scope.room_id).then(
function() {
|
