diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js
deleted file mode 100644
index d9c8baff47..0000000000
--- a/webclient/rooms/rooms-controller.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-Copyright 2014 matrix.org
-
-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';
-
-angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload', 'eventHandlerService'])
-.controller('RoomsController', ['$scope', '$location', 'matrixService', 'mFileUpload', 'eventHandlerService', 'eventStreamService',
- function($scope, $location, matrixService, mFileUpload, eventHandlerService, eventStreamService) {
-
- $scope.rooms = {};
- $scope.public_rooms = [];
- $scope.newRoomId = "";
- $scope.feedback = "";
-
- $scope.newRoom = {
- room_id: "",
- private: false
- };
-
- $scope.goToRoom = {
- room_id: "",
- };
-
- $scope.joinAlias = {
- room_alias: "",
- };
-
- $scope.newProfileInfo = {
- name: matrixService.config().displayName,
- avatar: matrixService.config().avatarUrl,
- avatarFile: undefined
- };
-
- $scope.linkedEmails = {
- linkNewEmail: "", // the email entry box
- emailBeingAuthed: undefined, // to populate verification text
- authTokenId: undefined, // the token id from the IS
- clientSecret: undefined, // our client secret
- sendAttempt: 1,
- emailCode: "", // the code entry box
- linkedEmailList: matrixService.config().emailList // linked email list
- };
-
- $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
- var config = matrixService.config();
- if (event.target_user_id === config.user_id && event.content.membership === "invite") {
- console.log("Invited to room " + event.room_id);
- // FIXME push membership to top level key to match /im/sync
- event.membership = event.content.membership;
- // FIXME bodge a nicer name than the room ID for this invite.
- event.room_display_name = event.user_id + "'s room";
- $scope.rooms[event.room_id] = event;
- }
- });
-
- var assignRoomAliases = function(data) {
- for (var i=0; i<data.length; i++) {
- var alias = matrixService.getRoomIdToAliasMapping(data[i].room_id);
- if (alias) {
- // use the existing alias from storage
- data[i].room_alias = alias;
- data[i].room_display_name = alias;
- }
- else if (data[i].aliases && data[i].aliases[0]) {
- // save the mapping
- // TODO: select the smarter alias from the array
- matrixService.createRoomIdToAliasMapping(data[i].room_id, data[i].aliases[0]);
- data[i].room_display_name = data[i].aliases[0];
- }
- else if (data[i].membership == "invite" && "inviter" in data[i]) {
- data[i].room_display_name = data[i].inviter + "'s room"
- }
- else {
- // last resort use the room id
- data[i].room_display_name = data[i].room_id;
- }
- }
- return data;
- };
-
- $scope.refresh = function() {
- // List all rooms joined or been invited to
- matrixService.rooms().then(
- function(response) {
- var data = assignRoomAliases(response.data.rooms);
- $scope.feedback = "Success";
- for (var i=0; i<data.length; i++) {
- $scope.rooms[data[i].room_id] = data[i];
- }
-
- var presence = response.data.presence;
- for (var i = 0; i < presence.length; ++i) {
- eventHandlerService.handleEvent(presence[i], false);
- }
- },
- function(error) {
- $scope.feedback = "Failure: " + error.data;
- });
-
- matrixService.publicRooms().then(
- function(response) {
- $scope.public_rooms = assignRoomAliases(response.data.chunk);
- }
- );
-
- eventStreamService.resume();
- };
-
- $scope.createNewRoom = function(room_id, isPrivate) {
-
- var visibility = "public";
- if (isPrivate) {
- visibility = "private";
- }
-
- matrixService.create(room_id, visibility).then(
- function(response) {
- // This room has been created. Refresh the rooms list
- console.log("Created room " + response.data.room_alias + " with id: "+
- response.data.room_id);
- matrixService.createRoomIdToAliasMapping(
- response.data.room_id, response.data.room_alias);
- $scope.refresh();
- },
- function(error) {
- $scope.feedback = "Failure: " + error.data;
- });
- };
-
- // Go to a room
- $scope.goToRoom = function(room_id) {
- // Simply open the room page on this room id
- //$location.url("room/" + room_id);
- matrixService.join(room_id).then(
- function(response) {
- if (response.data.hasOwnProperty("room_id")) {
- if (response.data.room_id != room_id) {
- $location.url("room/" + response.data.room_id);
- return;
- }
- }
-
- $location.url("room/" + room_id);
- },
- function(error) {
- $scope.feedback = "Can't join room: " + error.data;
- }
- );
- };
-
- $scope.joinAlias = function(room_alias) {
- matrixService.joinAlias(room_alias).then(
- function(response) {
- // Go to this room
- $location.url("room/" + room_alias);
- },
- function(error) {
- $scope.feedback = "Can't join room: " + error.data;
- }
- );
- };
-
- $scope.setDisplayName = function(newName) {
- matrixService.setDisplayName(newName).then(
- function(response) {
- $scope.feedback = "Updated display name.";
- var config = matrixService.config();
- config.displayName = newName;
- matrixService.setConfig(config);
- matrixService.saveConfig();
- },
- function(error) {
- $scope.feedback = "Can't update display name: " + error.data;
- }
- );
- };
-
-
- $scope.$watch("newProfileInfo.avatarFile", function(newValue, oldValue) {
- if ($scope.newProfileInfo.avatarFile) {
- console.log("Uploading new avatar file...");
- mFileUpload.uploadFile($scope.newProfileInfo.avatarFile).then(
- function(url) {
- $scope.newProfileInfo.avatar = url;
- $scope.setAvatar($scope.newProfileInfo.avatar);
- },
- function(error) {
- $scope.feedback = "Can't upload image";
- }
- );
- }
- });
-
- $scope.setAvatar = function(newUrl) {
- console.log("Updating avatar to "+newUrl);
- matrixService.setProfilePictureUrl(newUrl).then(
- function(response) {
- console.log("Updated avatar");
- $scope.feedback = "Updated avatar.";
- var config = matrixService.config();
- config.avatarUrl = newUrl;
- matrixService.setConfig(config);
- matrixService.saveConfig();
- },
- function(error) {
- $scope.feedback = "Can't update avatar: " + error.data;
- }
- );
- };
-
- var generateClientSecret = function() {
- var ret = "";
- var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
- for (var i = 0; i < 32; i++) {
- ret += chars.charAt(Math.floor(Math.random() * chars.length));
- }
-
- return ret;
- };
-
-
- $scope.linkEmail = function(email) {
- if (email != $scope.linkedEmails.emailBeingAuthed) {
- $scope.linkedEmails.clientSecret = generateClientSecret();
- $scope.linkedEmails.sendAttempt = 1;
- }
- matrixService.linkEmail(email, $scope.linkedEmails.clientSecret, $scope.linkedEmails.sendAttempt).then(
- function(response) {
- if (response.data.success === true) {
- $scope.linkedEmails.authTokenId = response.data.sid;
- $scope.emailFeedback = "You have been sent an email.";
- $scope.linkedEmails.emailBeingAuthed = email;
- }
- else {
- $scope.emailFeedback = "Failed to send email.";
- }
- },
- function(error) {
- $scope.emailFeedback = "Can't send email: " + error.data;
- }
- );
- };
-
- $scope.submitEmailCode = function(code) {
- var tokenId = $scope.linkedEmails.authTokenId;
- if (tokenId === undefined) {
- $scope.emailFeedback = "You have not requested a code with this email.";
- return;
- }
- matrixService.authEmail(matrixService.config().user_id, tokenId, code, $scope.linkedEmails.clientSecret).then(
- function(response) {
- if ("success" in response.data && response.data.success === false) {
- $scope.emailFeedback = "Failed to authenticate email.";
- return;
- }
- matrixService.bindEmail(matrixService.config().user_id, tokenId, $scope.linkedEmails.clientSecret).then(
- function(response) {
- var config = matrixService.config();
- var emailList = {};
- if ("emailList" in config) {
- emailList = config.emailList;
- }
- emailList[$scope.linkedEmails.emailBeingAuthed] = response;
- // save the new email list
- config.emailList = emailList;
- matrixService.setConfig(config);
- matrixService.saveConfig();
- // invalidate the email being authed and update UI.
- $scope.linkedEmails.emailBeingAuthed = undefined;
- $scope.emailFeedback = "";
- $scope.linkedEmails.linkedEmailList = emailList;
- $scope.linkedEmails.linkNewEmail = "";
- $scope.linkedEmails.emailCode = "";
- }, function(reason) {
- $scope.emailFeedback = "Failed to link email: " + reason;
- }
- );
- },
- function(reason) {
- $scope.emailFeedback = "Failed to auth email: " + reason;
- }
- );
- };
-
- $scope.refresh();
-}]);
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html
deleted file mode 100644
index ba3b7d8bad..0000000000
--- a/webclient/rooms/rooms.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<div ng-controller="RoomsController" class="rooms">
-
- <div id="page">
- <div id="wrapper">
-
- <div>
- <form>
- <table>
- <tr>
- <td>
- <div class="profile-avatar">
- <img ng-src="{{ newProfileInfo.avatar || 'img/default-profile.jpg' }}" m-file-input="newProfileInfo.avatarFile"/>
- </div>
- </td>
- <td>
- <!-- TODO: To enable once we have an upload server
- <button m-file-input="newProfileInfo.avatarFile">Upload new Avatar</button>
- or use an existing image URL:
- -->
- <div>
- <input size="40" ng-model="newProfileInfo.avatar" ng-enter="setAvatar(newProfileInfo.avatar)" placeholder="Image URL"/>
- <button ng-disabled="!newProfileInfo.avatar" ng-click="setAvatar(newProfileInfo.avatar)">Update Avatar</button>
- </div>
- </td>
- </tr>
- </table>
- </form>
- </div>
-
- <div>
- <form>
- <input size="40" ng-model="newProfileInfo.name" ng-enter="setDisplayName(newProfileInfo.name)" />
- <button ng-disabled="!newProfileInfo.name" ng-click="setDisplayName(newProfileInfo.name)">Update Name</button>
- </form>
- </div>
-
- <br/>
-
- <div>
- <form>
- <input size="40" ng-model="linkedEmails.linkNewEmail" ng-enter="linkEmail(linkedEmails.linkNewEmail)" />
- <button ng-disabled="!linkedEmails.linkNewEmail" ng-click="linkEmail(linkedEmails.linkNewEmail)">
- Link Email
- </button>
- {{ emailFeedback }}
- </form>
- <form ng-hide="!linkedEmails.emailBeingAuthed">
- Enter validation token for {{ linkedEmails.emailBeingAuthed }}:
- <br />
- <input size="20" ng-model="linkedEmails.emailCode" ng-enter="submitEmailCode(linkedEmails.emailCode)" />
- <button ng-disabled="!linkedEmails.emailCode || !linkedEmails.linkNewEmail" ng-click="submitEmailCode(linkedEmails.emailCode)">
- Submit Code
- </button>
- </form>
- Linked emails:
- <table>
- <tr ng-repeat="(address, info) in linkedEmails.linkedEmailList">
- <td>{{address}}</td>
- </tr>
- </table>
- </div>
- <br/>
-
- <h3>My rooms</h3>
-
- <div class="rooms" ng-repeat="(rm_id, room) in rooms">
- <div>
- <a href="#/room/{{ room.room_alias ? room.room_alias : rm_id }}" >{{ room.room_display_name }}</a> {{room.membership === 'invite' ? ' (invited)' : ''}}
- </div>
- </div>
- <br/>
-
- <h3>Public rooms</h3>
-
- <div class="public_rooms" ng-repeat="room in public_rooms">
- <div>
- <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" >{{ room.room_alias }}</a>
- </div>
- </div>
- <br/>
-
- <div>
- <form>
- <input size="40" ng-model="newRoom.room_id" ng-enter="createNewRoom(newRoom.room_id, newRoom.private)" placeholder="(e.g. foo_channel)"/>
- <input type="checkbox" ng-model="newRoom.private">private
- <button ng-disabled="!newRoom.room_id" ng-click="createNewRoom(newRoom.room_id, newRoom.private)">Create room</button>
- </form>
- </div>
- <div>
- <form>
- <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channel:example.org)"/>
- <button ng-disabled="!joinAlias.room_alias" ng-click="joinAlias(joinAlias.room_alias)">Join room</button>
- </form>
- </div>
- <br/>
-
- {{ feedback }}
-
- </div>
- </div>
-</div>
|
