jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove settings.dashboardOrigin

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-04 22:10:14 +05:30
parent 4cdf37b060
commit 67ee82abb9
7 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/users.js
View File

@@ -667,7 +667,7 @@ async function getPasswordResetLink(user, auditSource) {
await update(user, { resetToken, resetTokenCreationTime }, auditSource);
}
const resetLink = `${settings.dashboardOrigin()}/passwordreset.html?resetToken=${resetToken}`;
const resetLink = `https://${settings.dashboardFqdn()}/passwordreset.html?resetToken=${resetToken}`;
return resetLink;
}
@@ -796,7 +796,7 @@ async function getInviteLink(user, auditSource) {
if (!user.inviteToken) throw new BoxError(BoxError.BAD_STATE, 'User already used invite link');
const directoryConfig = await getProfileConfig();
let inviteLink = `${settings.dashboardOrigin()}/setupaccount.html?inviteToken=${user.inviteToken}&email=${encodeURIComponent(user.email)}`;
let inviteLink = `https://${settings.dashboardFqdn()}/setupaccount.html?inviteToken=${user.inviteToken}&email=${encodeURIComponent(user.email)}`;
if (user.username) inviteLink += `&username=${encodeURIComponent(user.username)}`;
if (user.displayName) inviteLink += `&displayName=${encodeURIComponent(user.displayName)}`;
@@ -909,13 +909,13 @@ function compareRoles(role1, role2) {
async function getAvatarUrl(user) {
assert.strictEqual(typeof user, 'object');
const fallbackUrl = `${settings.dashboardOrigin()}/img/avatar-default-symbolic.svg`;
const fallbackUrl = `https://${settings.dashboardFqdn()}/img/avatar-default-symbolic.svg`;
const result = await getAvatar(user.id);
if (result.equals(constants.AVATAR_NONE)) return fallbackUrl;
else if (result.equals(constants.AVATAR_GRAVATAR)) return `https://www.gravatar.com/avatar/${require('crypto').createHash('md5').update(user.email).digest('hex')}.jpg`;
else if (result) return `${settings.dashboardOrigin()}/api/v1/profile/avatar/${user.id}`;
else if (result) return `https://${settings.dashboardFqdn()}/api/v1/profile/avatar/${user.id}`;
else return fallbackUrl;
}