krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

v3: support party invitation from email

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-18 16:39:11 +02:00
parent d1f9e9e7ca
commit 2f934455ad
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/client/js/controllers/authCtrl.js
View File

@@ -31,7 +31,7 @@ angular.module('habitrpg')
} else if (status === 400 && data.errors && _.isArray(data.errors)) { // bad requests
data.errors.forEach(function (err) {
$window.alert(err.message);
});
});
} else if (!!data && !!data.error) {
$window.alert(data.message);
} else {
@@ -51,7 +51,15 @@ angular.module('habitrpg')
$scope.registrationInProgress = true;
var url = ApiUrl.get() + "/api/v3/user/auth/local/register";
if($rootScope.selectedLanguage) url = url + '?lang=' + $rootScope.selectedLanguage.code;
if (location.search && location.search.indexOf('Invite=') !== -1) { // matches groupInvite and partyInvite
url += location.search;
}
if($rootScope.selectedLanguage) {
var toAppend = url.indexOf('?') !== -1 ? '&' : '?';
url = url + toAppend + 'lang=' + $rootScope.selectedLanguage.code;
}
$http.post(url, scope.registerVals).success(function(res, status, headers, config) {
runAuth(res.data._id, res.data.apiToken);
}).error(errorAlert);

2
website/server/controllers/api-v3/groups.js
View File

@@ -568,7 +568,7 @@ async function _inviteByEmail (invite, group, inviter, req, res) {
inviter: inviter._id,
sentAt: Date.now(), // so we can let it expire
});
let link = `?groupInvite=${encrypt(groupQueryString)}`;
let link = `/static/front?groupInvite=${encrypt(groupQueryString)}`;
let variables = [
{name: 'LINK', content: link},