self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-14 18:27:44 +02:00
Code Issues Releases Activity

Server: Display user flags in profile when logged in as admin

Browse Source
This commit is contained in:
Laurent Cozic 2021-08-22 13:30:23 +01:00
parent f11ba29112
commit 43943299f3
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/server/src/routes/index/users.ts
View File

@ -4,7 +4,7 @@ import { RouteType } from '../../utils/types';
import { AppContext, HttpMethod } from '../../utils/types';
import { bodyFields, contextSessionId, formParse } from '../../utils/requestUtils';
import { ErrorForbidden, ErrorUnprocessableEntity } from '../../utils/errors';
import { User, UserFlagType, Uuid } from '../../services/database/types';
import { User, UserFlagType, userFlagTypeToLabel, Uuid } from '../../services/database/types';
import config from '../../config';
import { View } from '../../services/MustacheService';
import defaultView from '../../utils/defaultView';
@ -141,6 +141,12 @@ router.get('users/:id', async (path: SubPath, ctx: AppContext, user: User = null
postUrl = `${config().baseUrl}/users/${user.id}`;
}
let userFlags: string[] = isNew ? null : (await models.userFlag().allByUserId(user.id)).map(f => {
return `${formatDateTime(f.created_time)}: ${userFlagTypeToLabel(f.type)}`;
});
if (!userFlags || !userFlags.length || !owner.is_admin) userFlags = null;
const subscription = !isNew ? await ctx.joplin.models.subscription().byUserId(userId) : null;
const view: View = defaultView('user', 'Profile');
@ -168,6 +174,8 @@ router.get('users/:id', async (path: SubPath, ctx: AppContext, user: User = null
view.content.canSetEmail = isNew || owner.is_admin;
view.content.canShareFolderOptions = yesNoDefaultOptions(user, 'can_share_folder');
view.content.canUploadOptions = yesNoOptions(user, 'can_upload');
view.content.userFlags = userFlags;
view.jsFiles.push('zxcvbn');
view.cssFiles.push('index/user');
@ -296,8 +304,7 @@ router.post('users', async (path: SubPath, ctx: AppContext) => {
if (fields.disable_button || fields.restore_button) {
const user = await models.user().load(path.id);
await models.user().checkIfAllowed(ctx.joplin.owner, AclAction.Delete, user);
await models.userFlag().toggle(user.id, UserFlagType.ManuallyDisabled, !!fields.restore_button);
await models.userFlag().toggle(user.id, UserFlagType.ManuallyDisabled, !fields.restore_button);
} else if (fields.send_reset_password_email) {
const user = await models.user().load(path.id);
await models.user().save({ id: user.id, must_set_password: 1 });

15
packages/server/src/services/database/types.ts
View File

@ -36,6 +36,21 @@ export enum UserFlagType {
ManuallyDisabled = 6,
}
export function userFlagTypeToLabel(t: UserFlagType): string {
const s: Record<UserFlagType, string> = {
[UserFlagType.FailedPaymentWarning]: 'Failed Payment (Warning)',
[UserFlagType.FailedPaymentFinal]: 'Failed Payment (Final)',
[UserFlagType.AccountOverLimit]: 'Account Over Limit',
[UserFlagType.AccountWithoutSubscription]: 'Account Without Subscription',
[UserFlagType.SubscriptionCancelled]: 'Subscription Cancelled',
[UserFlagType.ManuallyDisabled]: 'Manually Disabled',
};
if (!s[t]) throw new Error(`Unknown flag type: ${t}`);
return s[t];
}
export enum FileContentType {
Any = 1,
JoplinItem = 2,

11
packages/server/src/views/index/user.mustache
View File

@ -140,6 +140,17 @@
</div>
{{/subscription}}
{{#userFlags}}
<h1 class="title">Flags</h1>
{{/userFlags}}
{{#userFlags}}
<ul>
<li>{{.}}</li>
</ul>
{{/userFlags}}
</form>
<script>