1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-30 10:36:35 +02:00
This commit is contained in:
Laurent Cozic 2021-08-03 19:43:20 +01:00
parent db0e0ee17e
commit 0fc4bc05f6

View File

@ -16,7 +16,7 @@ import { formatMaxItemSize, formatMaxTotalSize, formatTotalSize, formatTotalSize
import { getCanShareFolder, totalSizeClass } from '../../models/utils/user'; import { getCanShareFolder, totalSizeClass } from '../../models/utils/user';
import { yesNoDefaultOptions } from '../../utils/views/select'; import { yesNoDefaultOptions } from '../../utils/views/select';
import { confirmUrl } from '../../utils/urlUtils'; import { confirmUrl } from '../../utils/urlUtils';
import { cancelSubscription, updateSubscriptionType } from '../../utils/stripe'; import { cancelSubscriptionByUserId, updateSubscriptionType } from '../../utils/stripe';
import { createCsrfTag } from '../../utils/csrf'; import { createCsrfTag } from '../../utils/csrf';
export interface CheckRepeatPasswordInput { export interface CheckRepeatPasswordInput {
@ -277,7 +277,7 @@ router.post('users', async (path: SubPath, ctx: AppContext) => {
await userModel.save(userToSave, { isNew: false }); await userModel.save(userToSave, { isNew: false });
} }
} else if (fields.user_cancel_subscription_button) { } else if (fields.user_cancel_subscription_button) {
await cancelSubscription(ctx.joplin.models, userId); await cancelSubscriptionByUserId(ctx.joplin.models, userId);
const sessionId = contextSessionId(ctx, false); const sessionId = contextSessionId(ctx, false);
if (sessionId) { if (sessionId) {
await ctx.joplin.models.session().logout(sessionId); await ctx.joplin.models.session().logout(sessionId);
@ -294,7 +294,7 @@ router.post('users', async (path: SubPath, ctx: AppContext) => {
await userModel.save({ id: user.id, must_set_password: 1 }); await userModel.save({ id: user.id, must_set_password: 1 });
await userModel.sendAccountConfirmationEmail(user); await userModel.sendAccountConfirmationEmail(user);
} else if (fields.cancel_subscription_button) { } else if (fields.cancel_subscription_button) {
await cancelSubscription(ctx.joplin.models, userId); await cancelSubscriptionByUserId(ctx.joplin.models, userId);
} else if (fields.update_subscription_basic_button) { } else if (fields.update_subscription_basic_button) {
await updateSubscriptionType(ctx.joplin.models, userId, AccountType.Basic); await updateSubscriptionType(ctx.joplin.models, userId, AccountType.Basic);
} else if (fields.update_subscription_pro_button) { } else if (fields.update_subscription_pro_button) {