graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 10:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

upd: handle email signups properly with approval enabled

Browse source
This commit is contained in:
Mar0xy 2023-10-18 03:21:06 +02:00
parent 3f0cc256dc
commit 32fc540df4
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/server/api/SignupApiService.ts
View file

@ -279,8 +279,12 @@ export class SignupApiService {
} }
if (instance.approvalRequiredForSignup) { if (instance.approvalRequiredForSignup) {
reply.code(204); if (pendingUser.email) {
return; this.emailService.sendEmail(pendingUser.email, 'Approval pending',
'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.',
'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.');
}
return { pendingApproval: true };
} }
return this.signinService.signin(request, reply, account as MiLocalUser); return this.signinService.signin(request, reply, account as MiLocalUser);

2
packages/frontend/src/pages/admin-user.vue
View file

@ -182,7 +182,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else-if="tab === 'approval'" class="_gaps_m"> <div v-else-if="tab === 'approval'" class="_gaps_m">
<MkKeyValue oneline> <MkKeyValue oneline>
<template #key>{{ i18n.ts.approvalStatus }}</template> <template #key>{{ i18n.ts.approvalStatus }}</template>
<template #value><span class="_monospace">{{ approved ? {{ i18n.ts.approved }} : {{ i18n.ts.notApproved }} }}</span></template> <template #value><span class="_monospace">{{ approved ? i18n.ts.approved : i18n.ts.notApproved }}</span></template>
</MkKeyValue> </MkKeyValue>
<MkTextarea v-model="signupReason" readonly> <MkTextarea v-model="signupReason" readonly>

7
packages/frontend/src/pages/signup-complete.vue
View file

@ -45,6 +45,13 @@ function submit() {
os.api('signup-pending', { os.api('signup-pending', {
code: props.code, code: props.code,
}).then(res => { }).then(res => {
if (res.pendingApproval) {
return os.alert({
type: 'success',
title: i18n.ts._signup.almostThere,
text: i18n.ts._signup.approvalPending,
});
}
return login(res.i, '/'); return login(res.i, '/');
}).catch(() => { }).catch(() => {
submitting = false; submitting = false;