agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 06:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19922 from overleaf/msm-fix-reversedHostname-launchpad

Browse Source 
[web] Add missing `reversedHostname` for admins in CE/SP

GitOrigin-RevId: 2ce273e963a7471c514289cc042890bd1a14d4d2
This commit is contained in:
Miguel Serrano
2024-08-22 08:04:49 +00:00
committed by Copybot
parent 677f2d8a92
commit dc43b69a2f
4 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/launchpad/app/src/LaunchpadController.js
+12 -3
View File
@@ -137,11 +137,15 @@ const _LaunchpadController = {
}
try {
const reversedHostname = user.email
.split('@')[1]
.split('')
.reverse()
.join('')
await User.updateOne(
{ _id: user._id },
{
$set: { isAdmin: true },
emails: [{ email }],
$set: { isAdmin: true, emails: [{ email, reversedHostname }] },
}
).exec()
} catch (err) {
@@ -206,12 +210,17 @@ const _LaunchpadController = {
logger.debug({ userId: user._id }, 'making user an admin')
try {
const reversedHostname = user.email
.split('@')[1]
.split('')
.reverse()
.join('')
await User.updateOne(
{ _id: user._id },
{
$set: {
isAdmin: true,
emails: [{ email }],
emails: [{ email, reversedHostname }],
},
}
).exec()
services/web/modules/launchpad/test/acceptance/src/LaunchpadTests.js
+3
View File
@@ -76,5 +76,8 @@ describe('Launchpad', function () {
// Check we are actually admin
expect(await adminUser.isLoggedIn()).to.equal(true)
expect(adminUser.user.isAdmin).to.equal(true)
// Check reversedHostName is stored
expect(adminUser.user.emails[0].reversedHostname).to.equal('moc.elpmaxe')
})
})
services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.js
+12 -4
View File
@@ -365,7 +365,9 @@ describe('LaunchpadController', function () {
{
$set: {
isAdmin: true,
emails: [{ email: this.user.email }],
emails: [
{ email: this.user.email, reversedHostname: 'moc.elpmaxe' },
],
},
}
)
@@ -749,7 +751,9 @@ describe('LaunchpadController', function () {
{
$set: {
isAdmin: true,
emails: [{ email: this.user.email }],
emails: [
{ email: this.user.email, reversedHostname: 'moc.elpmaxe' },
],
},
}
)
@@ -823,8 +827,12 @@ describe('LaunchpadController', function () {
.calledWith(
{ _id: this.user._id },
{
$set: { isAdmin: true },
emails: [{ email: this.user.email }],
$set: {
isAdmin: true,
emails: [
{ email: this.user.email, reversedHostname: 'moc.elpmaxe' },
],
},
}
)
.should.equal(true)