diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js
deleted file mode 100644
index be970ce1c3..0000000000
--- a/webclient/login/register-controller.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- Copyright 2014 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.
- */
-
-angular.module('RegisterController', ['matrixService'])
-.controller('RegisterController', ['$scope', '$rootScope', '$location', 'matrixService', 'eventStreamService',
- function($scope, $rootScope, $location, matrixService, eventStreamService) {
- 'use strict';
-
- var config = window.webClientConfig;
- var useCaptcha = true;
- if (config !== undefined) {
- useCaptcha = config.useCaptcha;
- }
-
- // FIXME: factor out duplication with login-controller.js
-
- // Assume that this is hosted on the home server, in which case the URL
- // contains the home server.
- var hs_url = $location.protocol() + "://" + $location.host();
- if ($location.port() &&
- !($location.protocol() === "http" && $location.port() === 80) &&
- !($location.protocol() === "https" && $location.port() === 443))
- {
- hs_url += ":" + $location.port();
- }
-
- 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.account = {
- homeserver: hs_url,
- desired_user_id: "",
- desired_user_name: "",
- password: "",
- identityServer: "http://matrix.org:8090",
- pwd1: "",
- pwd2: "",
- displayName : ""
- };
-
- $scope.register = function() {
- // Set the urls
- matrixService.setConfig({
- homeserver: $scope.account.homeserver,
- identityServer: $scope.account.identityServer
- });
-
- if ($scope.account.pwd1 !== $scope.account.pwd2) {
- $scope.feedback = "Passwords don't match.";
- return;
- }
- else if ($scope.account.pwd1.length < 6) {
- $scope.feedback = "Password must be at least 6 characters.";
- return;
- }
-
- if ($scope.account.email) {
- $scope.clientSecret = generateClientSecret();
- matrixService.linkEmail($scope.account.email, $scope.clientSecret, 1).then(
- function(response) {
- $scope.wait_3pid_code = true;
- $scope.sid = response.data.sid;
- $scope.feedback = "";
- },
- function(response) {
- $scope.feedback = "Couldn't request verification email!";
- }
- );
- } else {
- $scope.registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1);
- }
- };
-
- $scope.registerWithMxidAndPassword = function(mxid, password, threepidCreds) {
- matrixService.register(mxid, password, threepidCreds, useCaptcha).then(
- function(response) {
- $scope.feedback = "Success";
- if (useCaptcha) {
- Recaptcha.destroy();
- }
- // Update the current config
- var config = matrixService.config();
- angular.extend(config, {
- access_token: response.data.access_token,
- user_id: response.data.user_id
- });
- matrixService.setConfig(config);
-
- // And permanently save it
- matrixService.saveConfig();
-
- // Update the global scoped used_id var (used in the app header)
- $rootScope.updateHeader();
-
- eventStreamService.resume();
-
- if ($scope.account.displayName) {
- // FIXME: handle errors setting displayName
- matrixService.setDisplayName($scope.account.displayName);
- }
-
- // Go to the user's rooms list page
- $location.url("home");
- },
- function(error) {
- console.trace("Registration error: "+error);
- if (useCaptcha) {
- Recaptcha.reload();
- }
- if (error.data) {
- if (error.data.errcode === "M_USER_IN_USE") {
- $scope.feedback = "Username already taken.";
- $scope.reenter_username = true;
- }
- else if (error.data.errcode == "M_CAPTCHA_INVALID") {
- $scope.feedback = "Failed captcha.";
- }
- else if (error.data.errcode == "M_CAPTCHA_NEEDED") {
- $scope.feedback = "Captcha is required on this home " +
- "server.";
- }
- else if (error.data.error) {
- $scope.feedback = error.data.error;
- }
- }
- else if (error.status === 0) {
- $scope.feedback = "Unable to talk to the server.";
- }
- });
- }
-
- $scope.verifyToken = function() {
- matrixService.authEmail($scope.clientSecret, $scope.sid, $scope.account.threepidtoken).then(
- function(response) {
- if (!response.data.success) {
- $scope.feedback = "Unable to verify code.";
- } else {
- $scope.registerWithMxidAndPassword($scope.account.desired_user_id, $scope.account.pwd1, [{'sid':$scope.sid, 'clientSecret':$scope.clientSecret, 'idServer': $scope.account.identityServer.split('//')[1]}]);
- }
- },
- function(error) {
- $scope.feedback = "Unable to verify code.";
- }
- );
- };
-
- var setupCaptcha = function() {
- console.log("Setting up ReCaptcha")
- var config = window.webClientConfig;
- var public_key = undefined;
- if (config === undefined) {
- console.error("Couldn't find webClientConfig. Cannot get public key for captcha.");
- }
- else {
- public_key = webClientConfig.recaptcha_public_key;
- if (public_key === undefined) {
- console.error("No public key defined for captcha!")
- }
- }
- Recaptcha.create(public_key,
- "regcaptcha",
- {
- theme: "red",
- callback: Recaptcha.focus_response_field
- });
- };
-
- $scope.init = function() {
- if (useCaptcha) {
- setupCaptcha();
- }
- };
-
-}]);
-
|
