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/login/login-controller.js b/webclient/login/login-controller.js
index 67d0b7b90c..35886c5583 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/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js
index c25e24c8bc..65d345d7a6 100644
--- a/webclient/rooms/rooms-controller.js
+++ b/webclient/rooms/rooms-controller.js
@@ -48,6 +48,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
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
};
@@ -207,11 +209,27 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
);
};
+ 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) {
- matrixService.linkEmail(email).then(
+ 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.tokenId;
+ $scope.linkedEmails.authTokenId = response.data.sid;
$scope.emailFeedback = "You have been sent an email.";
$scope.linkedEmails.emailBeingAuthed = email;
}
@@ -231,28 +249,34 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
$scope.emailFeedback = "You have not requested a code with this email.";
return;
}
- matrixService.authEmail(matrixService.config().user_id, tokenId, code).then(
+ 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;
}
- var config = matrixService.config();
- var emailList = {};
- if ("emailList" in config) {
- emailList = config.emailList;
- }
- emailList[response.address] = 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 = "";
+ 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;
|
