@geekity/cms 0.51.0 → 0.52.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/admin/pages/account/forgot.njk +13 -7
- package/admin/pages/account/reset.njk +1 -1
- package/admin/pages/users/edit.njk +36 -4
- package/admin/pages/users/new.njk +19 -1
- package/dist/admin/admin-bar.d.ts.map +1 -1
- package/dist/admin/admin-bar.js +11 -10
- package/dist/admin/admin-bar.js.map +1 -1
- package/dist/admin/autosave.d.ts.map +1 -1
- package/dist/admin/autosave.js +1 -2
- package/dist/admin/autosave.js.map +1 -1
- package/dist/admin/confirm-password.d.ts +19 -1
- package/dist/admin/confirm-password.d.ts.map +1 -1
- package/dist/admin/confirm-password.js +40 -8
- package/dist/admin/confirm-password.js.map +1 -1
- package/dist/admin/connected-apps.d.ts.map +1 -1
- package/dist/admin/connected-apps.js +1 -0
- package/dist/admin/connected-apps.js.map +1 -1
- package/dist/admin/credentials.d.ts +0 -1
- package/dist/admin/credentials.d.ts.map +1 -1
- package/dist/admin/credentials.js +1 -2
- package/dist/admin/credentials.js.map +1 -1
- package/dist/admin/documents.d.ts +0 -7
- package/dist/admin/documents.d.ts.map +1 -1
- package/dist/admin/documents.js +1 -15
- package/dist/admin/documents.js.map +1 -1
- package/dist/admin/export.d.ts +2 -0
- package/dist/admin/export.d.ts.map +1 -1
- package/dist/admin/export.js +5 -4
- package/dist/admin/export.js.map +1 -1
- package/dist/admin/headers.d.ts.map +1 -1
- package/dist/admin/headers.js +4 -0
- package/dist/admin/headers.js.map +1 -1
- package/dist/admin/index.d.ts +7 -7
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +5 -5
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/indieauth-consent.d.ts.map +1 -1
- package/dist/admin/indieauth-consent.js +3 -2
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/legacy-migrations.d.ts.map +1 -1
- package/dist/admin/legacy-migrations.js +6 -2
- package/dist/admin/legacy-migrations.js.map +1 -1
- package/dist/admin/plugins.d.ts +2 -0
- package/dist/admin/plugins.d.ts.map +1 -1
- package/dist/admin/plugins.js +15 -11
- package/dist/admin/plugins.js.map +1 -1
- package/dist/admin/recovery.d.ts +7 -4
- package/dist/admin/recovery.d.ts.map +1 -1
- package/dist/admin/recovery.js +68 -43
- package/dist/admin/recovery.js.map +1 -1
- package/dist/admin/routes.d.ts.map +1 -1
- package/dist/admin/routes.js +99 -76
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/uploads.d.ts +4 -13
- package/dist/admin/uploads.d.ts.map +1 -1
- package/dist/admin/uploads.js +9 -28
- package/dist/admin/uploads.js.map +1 -1
- package/dist/admin/users.d.ts +7 -0
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +156 -43
- package/dist/admin/users.js.map +1 -1
- package/dist/cli/commands.d.ts.map +1 -1
- package/dist/cli/commands.js +12 -1
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +5 -4
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/password.js +3 -3
- package/dist/cli/password.js.map +1 -1
- package/dist/cli/serve.d.ts.map +1 -1
- package/dist/cli/serve.js +17 -0
- package/dist/cli/serve.js.map +1 -1
- package/dist/cli/user.d.ts +1 -1
- package/dist/cli/user.d.ts.map +1 -1
- package/dist/cli/user.js +74 -11
- package/dist/cli/user.js.map +1 -1
- package/dist/config.d.ts +8 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +4 -1
- package/dist/config.js.map +1 -1
- package/dist/federation/actor.d.ts.map +1 -1
- package/dist/federation/actor.js +9 -5
- package/dist/federation/actor.js.map +1 -1
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +6 -15
- package/dist/federation/keys.js.map +1 -1
- package/dist/files/atomic.d.ts +7 -1
- package/dist/files/atomic.d.ts.map +1 -1
- package/dist/files/atomic.js +75 -14
- package/dist/files/atomic.js.map +1 -1
- package/dist/files/data-files.d.ts +12 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +24 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/files/lock-file.d.ts.map +1 -0
- package/dist/{jobs → files}/lock-file.js +1 -1
- package/dist/files/lock-file.js.map +1 -0
- package/dist/gemini/certificate.d.ts.map +1 -1
- package/dist/gemini/certificate.js +15 -12
- package/dist/gemini/certificate.js.map +1 -1
- package/dist/indieauth/grants.d.ts +1 -0
- package/dist/indieauth/grants.d.ts.map +1 -1
- package/dist/indieauth/grants.js.map +1 -1
- package/dist/indieauth/tokens.d.ts +4 -1
- package/dist/indieauth/tokens.d.ts.map +1 -1
- package/dist/indieauth/tokens.js +7 -3
- package/dist/indieauth/tokens.js.map +1 -1
- package/dist/jobs/file-records.js +1 -1
- package/dist/jobs/file-records.js.map +1 -1
- package/dist/jobs/processes.d.ts +0 -1
- package/dist/jobs/processes.d.ts.map +1 -1
- package/dist/jobs/processes.js +1 -9
- package/dist/jobs/processes.js.map +1 -1
- package/dist/notifications/mail-service.d.ts.map +1 -1
- package/dist/notifications/mail-service.js +16 -1
- package/dist/notifications/mail-service.js.map +1 -1
- package/dist/plugin.d.ts +3 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js.map +1 -1
- package/dist/plugins/site.d.ts.map +1 -1
- package/dist/plugins/site.js +1 -1
- package/dist/plugins/site.js.map +1 -1
- package/dist/site/admin-paths.d.ts +7 -0
- package/dist/site/admin-paths.d.ts.map +1 -1
- package/dist/site/admin-paths.js +18 -0
- package/dist/site/admin-paths.js.map +1 -1
- package/dist/site/passwords.d.ts +9 -2
- package/dist/site/passwords.d.ts.map +1 -1
- package/dist/site/passwords.js +45 -14
- package/dist/site/passwords.js.map +1 -1
- package/dist/site/users.d.ts +67 -11
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +207 -35
- package/dist/site/users.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +11 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sessions.d.ts +3 -0
- package/dist/store/sessions.d.ts.map +1 -1
- package/dist/store/sessions.js +27 -18
- package/dist/store/sessions.js.map +1 -1
- package/dist/store/tokens.d.ts +4 -2
- package/dist/store/tokens.d.ts.map +1 -1
- package/dist/store/tokens.js +16 -10
- package/dist/store/tokens.js.map +1 -1
- package/dist/util/html-tree.d.ts +4 -0
- package/dist/util/html-tree.d.ts.map +1 -1
- package/dist/util/html-tree.js +34 -0
- package/dist/util/html-tree.js.map +1 -1
- package/dist/util/process-alive.d.ts +3 -0
- package/dist/util/process-alive.d.ts.map +1 -0
- package/dist/util/process-alive.js +11 -0
- package/dist/util/process-alive.js.map +1 -0
- package/dist/web/compression.js +2 -3
- package/dist/web/compression.js.map +1 -1
- package/dist/web/indieauth-bearer.js +2 -2
- package/dist/web/indieauth-bearer.js.map +1 -1
- package/dist/web/indieauth-token.js +3 -3
- package/dist/web/indieauth-token.js.map +1 -1
- package/dist/web/session.d.ts +6 -1
- package/dist/web/session.d.ts.map +1 -1
- package/dist/web/session.js +21 -3
- package/dist/web/session.js.map +1 -1
- package/dist/web/signed-in.d.ts.map +1 -1
- package/dist/web/signed-in.js +6 -2
- package/dist/web/signed-in.js.map +1 -1
- package/dist/web/throttle.d.ts +26 -18
- package/dist/web/throttle.d.ts.map +1 -1
- package/dist/web/throttle.js +130 -24
- package/dist/web/throttle.js.map +1 -1
- package/package.json +4 -4
- package/templates/site/gitignore +4 -0
- package/themes/default/mail/email-changed.html.njk +17 -0
- package/themes/default/mail/email-changed.subject.njk +1 -0
- package/themes/default/mail/email-changed.txt.njk +14 -0
- package/themes/default/mail/password-changed.html.njk +1 -1
- package/themes/default/mail/password-changed.txt.njk +2 -1
- package/themes/default/partials/jsonld.njk +1 -1
- package/dist/jobs/lock-file.d.ts.map +0 -1
- package/dist/jobs/lock-file.js.map +0 -1
- /package/dist/{jobs → files}/lock-file.d.ts +0 -0
package/dist/admin/users.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { randomInt } from 'node:crypto';
|
|
2
|
-
import { countUsers, createUser, removeUserRecord, DuplicateUsernameError, findUserById, listUsers, setUserAdminTheme, setUserEmail, setUserNotification, setUserNotificationMode, setUserPassword, setUserProfile,
|
|
1
|
+
import { createHash, randomInt } from 'node:crypto';
|
|
2
|
+
import { countUsers, createUser, removeUserRecord, DuplicateUsernameError, findUserById, isAvatarUrl, listUsers, setUserAdminTheme, setUserEmail, setUserNotification, setUserNotificationMode, setUserPassword, cleanProfile, setUserProfile, UserRemovalRefusedError, } from '../site/users.js';
|
|
3
3
|
import { authorHref } from '../content/authors.js';
|
|
4
4
|
import { isLinkUrl, LINK_REL_RULE, LINK_URL_RULE, splitLinkRel } from '../site/navigation.js';
|
|
5
5
|
import { DEFAULT_DELIVERY_MODE, deliveryMode, notificationEvent, notificationSwitches, } from '../site/notification-preferences.js';
|
|
@@ -7,9 +7,12 @@ import { revokeTokensForUser } from '../indieauth/tokens.js';
|
|
|
7
7
|
import { autosaveCopies } from '../autosave/index.js';
|
|
8
8
|
import { discardWritingLedger } from '../writing/ledger.js';
|
|
9
9
|
import { stringOrEmpty } from '../util/forms.js';
|
|
10
|
+
import { startSession } from '../web/session.js';
|
|
10
11
|
import { ADMIN_THEMES, adminTheme } from '../site/admin-theme.js';
|
|
12
|
+
import { lockedMessage, answerLockedOut } from './confirm-password.js';
|
|
11
13
|
import { emailProblem, passwordProblem, usernameProblem } from './credentials.js';
|
|
12
14
|
import { flashAndRedirect } from './flash.js';
|
|
15
|
+
import { appsDisconnectedPhrase } from './recovery.js';
|
|
13
16
|
import { editUserPath, USERS_PATH } from '../site/admin-paths.js';
|
|
14
17
|
import { toldFollowers } from './settings-page.js';
|
|
15
18
|
import { ADMIN_TEMPLATES } from './templates.js';
|
|
@@ -30,6 +33,8 @@ export const USER_PROFILE_PATH = `${USERS_PATH}/profile`;
|
|
|
30
33
|
export const USER_NOTIFICATIONS_PATH = `${USERS_PATH}/notifications`;
|
|
31
34
|
export const USER_NOTIFICATION_MODE_PATH = `${USER_NOTIFICATIONS_PATH}/mode`;
|
|
32
35
|
export const USER_THEME_PATH = `${USERS_PATH}/theme`;
|
|
36
|
+
const EMAIL_CHANGED_TEMPLATE = 'email-changed';
|
|
37
|
+
const WRONG_PASSWORD = 'Your password was not right, so';
|
|
33
38
|
export const USER_FIELDS = {
|
|
34
39
|
username: 'username',
|
|
35
40
|
password: 'password',
|
|
@@ -51,14 +56,16 @@ export const USER_FIELDS = {
|
|
|
51
56
|
location: 'location',
|
|
52
57
|
links: 'links',
|
|
53
58
|
adminTheme: 'admin_theme',
|
|
59
|
+
profileHash: 'profile_hash',
|
|
60
|
+
emailHash: 'email_hash',
|
|
54
61
|
};
|
|
55
62
|
export function mountUsers(app, options) {
|
|
56
63
|
const { render } = options;
|
|
57
64
|
app.get(USERS_PATH, (c) => showUsers(c, render));
|
|
58
65
|
app.get(ADD_USER_PATH, (c) => showAddUser(c, render));
|
|
59
|
-
app.post(ADD_USER_PATH, (c) => addUser(c,
|
|
60
|
-
app.post(CHANGE_PASSWORD_PATH, (c) => changePassword(c,
|
|
61
|
-
app.post(USER_EMAIL_PATH, saveEmail);
|
|
66
|
+
app.post(ADD_USER_PATH, (c) => addUser(c, options));
|
|
67
|
+
app.post(CHANGE_PASSWORD_PATH, (c) => changePassword(c, options));
|
|
68
|
+
app.post(USER_EMAIL_PATH, (c) => saveEmail(c, options));
|
|
62
69
|
app.post(USER_PROFILE_PATH, (c) => saveProfile(c, render));
|
|
63
70
|
app.post(USER_NOTIFICATIONS_PATH, saveNotification);
|
|
64
71
|
app.post(USER_NOTIFICATION_MODE_PATH, saveNotificationMode);
|
|
@@ -72,7 +79,7 @@ function showUsers(c, render) {
|
|
|
72
79
|
function showAddUser(c, render) {
|
|
73
80
|
return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c));
|
|
74
81
|
}
|
|
75
|
-
async function addUser(c, render) {
|
|
82
|
+
async function addUser(c, { render, confirmPassword }) {
|
|
76
83
|
const body = await c.req.parseBody();
|
|
77
84
|
const username = stringOrEmpty(body[USER_FIELDS.username]).trim();
|
|
78
85
|
const supplied = stringOrEmpty(body[USER_FIELDS.password]);
|
|
@@ -80,6 +87,10 @@ async function addUser(c, render) {
|
|
|
80
87
|
const generate = stringOrEmpty(body[USER_FIELDS.generate]) !== '';
|
|
81
88
|
const password = generate ? generatePassword() : supplied;
|
|
82
89
|
const problems = addUserProblems(username, password, generate, email);
|
|
90
|
+
const confirmation = await confirmPassword(c, stringOrEmpty(body[USER_FIELDS.currentPassword]));
|
|
91
|
+
if (confirmation.kind !== 'confirmed') {
|
|
92
|
+
problems.currentPassword = `${WRONG_PASSWORD} nobody was added.`;
|
|
93
|
+
}
|
|
83
94
|
if (Object.keys(problems).length === 0) {
|
|
84
95
|
try {
|
|
85
96
|
await createUser({
|
|
@@ -98,13 +109,17 @@ async function addUser(c, render) {
|
|
|
98
109
|
}
|
|
99
110
|
if (Object.keys(problems).length > 0) {
|
|
100
111
|
c.status(400);
|
|
112
|
+
if (confirmation.kind === 'locked')
|
|
113
|
+
problems.currentPassword = answerLockedOut(c, confirmation.wait);
|
|
101
114
|
return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c, { addForm: { username, email, generate }, addProblems: problems }));
|
|
102
115
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
:
|
|
116
|
+
if (generate) {
|
|
117
|
+
c.header('cache-control', 'no-store');
|
|
118
|
+
return render(c, ADMIN_TEMPLATES.usersNew, addScreen(c, { added: { username, password } }));
|
|
119
|
+
}
|
|
120
|
+
return flashAndRedirect(c, 'notice', `Added ${username}.`, USERS_PATH);
|
|
106
121
|
}
|
|
107
|
-
async function changePassword(c, render) {
|
|
122
|
+
async function changePassword(c, { render, confirmPassword }) {
|
|
108
123
|
const session = c.var.session;
|
|
109
124
|
const user = signedInUser(c);
|
|
110
125
|
if (session === undefined || user === undefined)
|
|
@@ -113,31 +128,69 @@ async function changePassword(c, render) {
|
|
|
113
128
|
const current = stringOrEmpty(body[USER_FIELDS.currentPassword]);
|
|
114
129
|
const next = stringOrEmpty(body[USER_FIELDS.newPassword]);
|
|
115
130
|
const confirmation = stringOrEmpty(body[USER_FIELDS.newPasswordConfirmation]);
|
|
131
|
+
const confirmed = await confirmPassword(c, current);
|
|
116
132
|
const problems = changePasswordProblems({
|
|
117
|
-
correct:
|
|
133
|
+
correct: confirmed.kind === 'confirmed',
|
|
118
134
|
next,
|
|
119
135
|
confirmation,
|
|
120
136
|
});
|
|
121
137
|
if (Object.keys(problems).length > 0) {
|
|
122
138
|
c.status(400);
|
|
139
|
+
if (confirmed.kind === 'locked')
|
|
140
|
+
problems.currentPassword = answerLockedOut(c, confirmed.wait);
|
|
123
141
|
return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, user, { passwordProblems: problems }));
|
|
124
142
|
}
|
|
125
|
-
await setUserPassword({
|
|
143
|
+
await setUserPassword({
|
|
144
|
+
dataDir: c.var.config.dataDir,
|
|
145
|
+
userId: user.id,
|
|
146
|
+
password: next,
|
|
147
|
+
now: c.var.config.now(),
|
|
148
|
+
});
|
|
126
149
|
const ended = c.var.admin.deleteSessionsForUser(user.id, { except: session.id });
|
|
127
|
-
|
|
150
|
+
c.var.admin.deleteSession(session.id);
|
|
151
|
+
startSession(c, user);
|
|
152
|
+
c.var.admin.deletePasswordResetsForUser(user.id);
|
|
153
|
+
const disconnected = await revokeTokensForUser(c.var.config.dataDir, user.id, c.var.config.now());
|
|
154
|
+
const closed = [
|
|
155
|
+
...(ended === 0 ? [] : [`${signedOut(ended)} signed out`]),
|
|
156
|
+
...(disconnected === 0 ? [] : [appsDisconnectedPhrase(disconnected)]),
|
|
157
|
+
];
|
|
158
|
+
return backToUser(c, 'notice', closed.length === 0
|
|
128
159
|
? 'Your password was changed.'
|
|
129
|
-
: `Your password was changed, and ${
|
|
160
|
+
: `Your password was changed, and ${closed.join(' and ')}.`, user);
|
|
130
161
|
}
|
|
131
|
-
async function saveEmail(c) {
|
|
162
|
+
async function saveEmail(c, { render, confirmPassword }) {
|
|
132
163
|
const named = await namedUser(c);
|
|
133
164
|
if (named instanceof Response)
|
|
134
165
|
return named;
|
|
135
166
|
const { dataDir, body, target } = named;
|
|
136
167
|
const email = stringOrEmpty(body[USER_FIELDS.email]).trim();
|
|
168
|
+
const confirmation = await confirmPassword(c, stringOrEmpty(body[USER_FIELDS.currentPassword]));
|
|
169
|
+
if (confirmation.kind !== 'confirmed') {
|
|
170
|
+
const message = confirmation.kind === 'locked'
|
|
171
|
+
? lockedMessage(confirmation.wait)
|
|
172
|
+
: `${WRONG_PASSWORD} the address was not changed.`;
|
|
173
|
+
return backToUser(c, 'error', message, target);
|
|
174
|
+
}
|
|
137
175
|
const problem = emailProblem(email);
|
|
138
176
|
if (problem !== undefined)
|
|
139
177
|
return backToUser(c, 'error', problem, target);
|
|
178
|
+
const previous = target.email;
|
|
179
|
+
if (staleForm(body[USER_FIELDS.emailHash], previous) && email !== (previous ?? '')) {
|
|
180
|
+
c.status(409);
|
|
181
|
+
return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { emailConflict: { submitted: email, current: previous ?? '' } }));
|
|
182
|
+
}
|
|
140
183
|
await setUserEmail({ dataDir, userId: target.id, email });
|
|
184
|
+
if (previous !== email) {
|
|
185
|
+
c.var.admin.deletePasswordResetsForUser(target.id);
|
|
186
|
+
if (previous !== undefined && c.var.mailConfigured) {
|
|
187
|
+
void c.var.mail.send({
|
|
188
|
+
to: previous,
|
|
189
|
+
template: EMAIL_CHANGED_TEMPLATE,
|
|
190
|
+
data: { username: target.username, email },
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
}
|
|
141
194
|
return backToUser(c, 'notice', email === ''
|
|
142
195
|
? `${target.username} has no email address any more.`
|
|
143
196
|
: `${target.username} will be emailed at ${email}.`, target);
|
|
@@ -148,22 +201,54 @@ async function saveProfile(c, render) {
|
|
|
148
201
|
return named;
|
|
149
202
|
const { dataDir, body, target } = named;
|
|
150
203
|
const typed = typedProfile(body);
|
|
151
|
-
const
|
|
152
|
-
if (
|
|
204
|
+
const profile = { ...typed, links: parseProfileLinks(typed.links) };
|
|
205
|
+
if (staleForm(body[USER_FIELDS.profileHash], target.profile) && !sameProfile(profile, target)) {
|
|
206
|
+
c.status(409);
|
|
207
|
+
return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, {
|
|
208
|
+
profileConflict: {
|
|
209
|
+
submitted: profileText(cleanProfile(profile)),
|
|
210
|
+
current: profileText(target.profile),
|
|
211
|
+
},
|
|
212
|
+
}, typed));
|
|
213
|
+
}
|
|
214
|
+
const problems = profileProblems(typed);
|
|
215
|
+
if (Object.keys(problems).length > 0) {
|
|
153
216
|
c.status(400);
|
|
154
|
-
return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { profileProblems:
|
|
217
|
+
return render(c, ADMIN_TEMPLATES.usersEdit, userScreen(c, target, { profileProblems: problems }, typed));
|
|
155
218
|
}
|
|
156
|
-
const changed = await setUserProfile({
|
|
157
|
-
dataDir,
|
|
158
|
-
userId: target.id,
|
|
159
|
-
profile: { ...typed, links: parseProfileLinks(typed.links) },
|
|
160
|
-
});
|
|
219
|
+
const changed = await setUserProfile({ dataDir, userId: target.id, profile });
|
|
161
220
|
// A follower's copy of somebody's name, bio and picture is only as fresh as
|
|
162
221
|
// the last `Update` they were sent.
|
|
163
222
|
const saved = changed ? findUserById(dataDir, target.id) : undefined;
|
|
164
223
|
const told = saved === undefined ? undefined : await c.var.delivery.updateActor(saved);
|
|
165
224
|
return backToUser(c, 'notice', `Saved ${target.username}’s profile.${toldFollowers(told)}`, target);
|
|
166
225
|
}
|
|
226
|
+
function staleForm(posted, stored) {
|
|
227
|
+
const formVersion = stringOrEmpty(posted);
|
|
228
|
+
const unversionedForm = formVersion === '';
|
|
229
|
+
if (unversionedForm)
|
|
230
|
+
return false;
|
|
231
|
+
return formVersion !== storedVersion(stored);
|
|
232
|
+
}
|
|
233
|
+
function storedVersion(stored) {
|
|
234
|
+
return createHash('sha256')
|
|
235
|
+
.update(JSON.stringify(stored ?? null))
|
|
236
|
+
.digest('hex');
|
|
237
|
+
}
|
|
238
|
+
function sameProfile(submitted, target) {
|
|
239
|
+
return storedVersion(cleanProfile(submitted)) === storedVersion(target.profile);
|
|
240
|
+
}
|
|
241
|
+
function profileText(profile) {
|
|
242
|
+
return [
|
|
243
|
+
`Display name: ${profile?.displayName ?? ''}`,
|
|
244
|
+
`Bio: ${profile?.bio ?? ''}`,
|
|
245
|
+
`Avatar: ${profile?.avatar ?? ''}`,
|
|
246
|
+
`Job title: ${profile?.jobTitle ?? ''}`,
|
|
247
|
+
`Location: ${profile?.location ?? ''}`,
|
|
248
|
+
`Links:`,
|
|
249
|
+
formatProfileLinks(profile?.links),
|
|
250
|
+
].join('\n');
|
|
251
|
+
}
|
|
167
252
|
function typedProfile(body) {
|
|
168
253
|
return {
|
|
169
254
|
displayName: stringOrEmpty(body[USER_FIELDS.displayName]),
|
|
@@ -229,16 +314,25 @@ async function saveTheme(c) {
|
|
|
229
314
|
async function removeUser(c) {
|
|
230
315
|
const dataDir = c.var.config.dataDir;
|
|
231
316
|
const target = userInForm(dataDir, await c.req.parseBody());
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
317
|
+
if (target === undefined)
|
|
318
|
+
return flashAndRedirect(c, 'error', GONE_USER, USERS_PATH);
|
|
319
|
+
let deleted;
|
|
320
|
+
try {
|
|
321
|
+
deleted = await deleteUser({
|
|
322
|
+
dataDir,
|
|
323
|
+
userId: target.id,
|
|
324
|
+
signedInAs: c.var.session?.userId ?? null,
|
|
325
|
+
now: c.var.config.now(),
|
|
326
|
+
endSessions: (userId) => c.var.admin.deleteSessionsForUser(userId),
|
|
327
|
+
});
|
|
328
|
+
}
|
|
329
|
+
catch (error) {
|
|
330
|
+
if (!(error instanceof UserRemovalRefusedError))
|
|
331
|
+
throw error;
|
|
332
|
+
return flashAndRedirect(c, 'error', removalRefusal(error.reason, target), USERS_PATH);
|
|
239
333
|
}
|
|
240
|
-
|
|
241
|
-
|
|
334
|
+
if (!deleted)
|
|
335
|
+
return flashAndRedirect(c, 'error', GONE_USER, USERS_PATH);
|
|
242
336
|
return flashAndRedirect(c, 'notice', `Deleted ${target.username}.`, USERS_PATH);
|
|
243
337
|
}
|
|
244
338
|
function showUser(c, render) {
|
|
@@ -269,23 +363,30 @@ async function namedUser(c) {
|
|
|
269
363
|
}
|
|
270
364
|
const GONE_USER = 'That user is already gone.';
|
|
271
365
|
export async function deleteUser(input) {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
366
|
+
return await removeUserRecord({
|
|
367
|
+
...input,
|
|
368
|
+
beforeRemoval: async (userId) => {
|
|
369
|
+
input.endSessions?.(userId);
|
|
370
|
+
await revokeTokensForUser(input.dataDir, userId, input.now);
|
|
371
|
+
autosaveCopies(input.dataDir).discardUser(userId);
|
|
372
|
+
discardWritingLedger(input.dataDir, userId);
|
|
373
|
+
},
|
|
374
|
+
});
|
|
277
375
|
}
|
|
278
376
|
export function deleteUserRefusal(input) {
|
|
279
377
|
if (input.target === undefined)
|
|
280
378
|
return GONE_USER;
|
|
281
|
-
if (input.total <= 1)
|
|
282
|
-
return
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
return 'You cannot delete your own account. Another admin can do it for you.';
|
|
286
|
-
}
|
|
379
|
+
if (input.total <= 1)
|
|
380
|
+
return removalRefusal('only-user', input.target);
|
|
381
|
+
if (input.target.id === input.signedInAs)
|
|
382
|
+
return removalRefusal('own-account', input.target);
|
|
287
383
|
return undefined;
|
|
288
384
|
}
|
|
385
|
+
function removalRefusal(reason, target) {
|
|
386
|
+
return reason === 'only-user'
|
|
387
|
+
? `${target.username} is the only user. Add another before deleting this one.`
|
|
388
|
+
: 'You cannot delete your own account. Another admin can do it for you.';
|
|
389
|
+
}
|
|
289
390
|
export function changePasswordProblems(input) {
|
|
290
391
|
const problems = {};
|
|
291
392
|
if (!input.correct)
|
|
@@ -385,6 +486,16 @@ function themeChoices(user) {
|
|
|
385
486
|
export function parseProfileLinks(value) {
|
|
386
487
|
return profileLinkLines(value).map(profileLinkFields);
|
|
387
488
|
}
|
|
489
|
+
function profileProblems(typed) {
|
|
490
|
+
const avatar = typed.avatar.trim();
|
|
491
|
+
const links = profileLinkLineProblem(typed.links);
|
|
492
|
+
return {
|
|
493
|
+
...(avatar === '' || isAvatarUrl(avatar)
|
|
494
|
+
? {}
|
|
495
|
+
: { avatar: `An avatar is ${LINK_URL_RULE}. "${avatar}" is not one.` }),
|
|
496
|
+
...(links === undefined ? {} : { links }),
|
|
497
|
+
};
|
|
498
|
+
}
|
|
388
499
|
export function profileLinkLineProblem(value) {
|
|
389
500
|
const bad = profileLinkLines(value).find((line) => !isProfileLink(profileLinkFields(line)));
|
|
390
501
|
if (bad === undefined)
|
|
@@ -433,6 +544,8 @@ function row(user, context) {
|
|
|
433
544
|
location: user.profile?.location ?? '',
|
|
434
545
|
links: formatProfileLinks(user.profile?.links),
|
|
435
546
|
},
|
|
547
|
+
profileHash: storedVersion(user.profile),
|
|
548
|
+
emailHash: storedVersion(user.email),
|
|
436
549
|
archiveUrl: authorHref(user.username),
|
|
437
550
|
storedActorId: user.actorId ?? '',
|
|
438
551
|
notifications: notificationSwitches(user),
|
package/dist/admin/users.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/admin/users.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/admin/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAgBzD,UAAU,YAAY;IACpB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IACxE,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAgBzD,UAAU,YAAY;IACpB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IACxE,GAAG,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAgQhE,CAAC"}
|
package/dist/cli/commands.js
CHANGED
|
@@ -210,12 +210,23 @@ export const COMMANDS = {
|
|
|
210
210
|
run: importCommand,
|
|
211
211
|
},
|
|
212
212
|
user: {
|
|
213
|
-
synopsis: [
|
|
213
|
+
synopsis: [
|
|
214
|
+
'user add <username> [--password <pw>] [--email <address>] [--config <file>]',
|
|
215
|
+
'user password <username> [--password <pw>] [--config <file>]',
|
|
216
|
+
],
|
|
214
217
|
help: [
|
|
215
218
|
[
|
|
216
219
|
'user add',
|
|
217
220
|
['Create an admin user, so a site can get its first login', 'without the setup screen.'],
|
|
218
221
|
],
|
|
222
|
+
[
|
|
223
|
+
'user password',
|
|
224
|
+
[
|
|
225
|
+
"Set a user's password, ending their sessions, reset links",
|
|
226
|
+
'and connected apps. The way back in for a user who cannot',
|
|
227
|
+
'sign in and has no working email.',
|
|
228
|
+
],
|
|
229
|
+
],
|
|
219
230
|
],
|
|
220
231
|
run: userCommand,
|
|
221
232
|
},
|
package/dist/cli/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/help.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAmDA,wBAAsB,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAwB3E"}
|
package/dist/cli/help.js
CHANGED
|
@@ -5,10 +5,11 @@ import { pluginCommands } from './plugin-commands.js';
|
|
|
5
5
|
const OPTIONS_HELP = `Options:
|
|
6
6
|
--config <file> Config file to load. Defaults to the first of
|
|
7
7
|
${CONFIG_FILENAMES.join(', ')} found in the working directory.
|
|
8
|
-
--password <pw>
|
|
9
|
-
echo, or read as one line when
|
|
10
|
-
A password on the command line
|
|
11
|
-
list and in shell history, so
|
|
8
|
+
--password <pw> With user add or user password: the password. Left off,
|
|
9
|
+
it is asked for without echo, or read as one line when
|
|
10
|
+
standard input is a pipe. A password on the command line
|
|
11
|
+
is visible in the process list and in shell history, so
|
|
12
|
+
the command warns; prefer being asked.
|
|
12
13
|
--email <addr> The new user's email address. Optional; it is what a
|
|
13
14
|
forgotten password is recovered through.
|
|
14
15
|
--until <time> With maintenance on: when the site should be back, as an
|
package/dist/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,MAAM,YAAY,GAAG;;qBAEA,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/password.js
CHANGED
|
@@ -45,8 +45,8 @@ export async function readPassword(options = {}) {
|
|
|
45
45
|
input.pause();
|
|
46
46
|
}
|
|
47
47
|
if (cancelled)
|
|
48
|
-
throw new Error('Cancelled;
|
|
49
|
-
throw new Error('No password was given: standard input ended before a line arrived.
|
|
50
|
-
'
|
|
48
|
+
throw new Error('Cancelled; nothing was changed.');
|
|
49
|
+
throw new Error('No password was given: standard input ended before a line arrived. Pipe the password in ' +
|
|
50
|
+
'as a single line.');
|
|
51
51
|
}
|
|
52
52
|
//# sourceMappingURL=password.js.map
|
package/dist/cli/password.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../src/cli/password.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAcvC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAO,GAAwB,EAAE;IAClE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC;IAEtC,IAAI,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC;IACpC,IAAI,QAAQ;QAAE,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC;QACzB,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ;YAC/B,QAAQ,EAAE,CAAC;QACb,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnE,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvB,SAAS,GAAG,IAAI,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM;QACR,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3B,wEAAwE;YACxE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,IAAI,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAElE,MAAM,IAAI,KAAK,CACb,
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../src/cli/password.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAcvC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAO,GAAwB,EAAE;IAClE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC;IAEtC,IAAI,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC;IACpC,IAAI,QAAQ;QAAE,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC;QACzB,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ;YAC/B,QAAQ,EAAE,CAAC;QACb,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnE,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACvB,SAAS,GAAG,IAAI,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM;QACR,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3B,wEAAwE;YACxE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,IAAI,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAElE,MAAM,IAAI,KAAK,CACb,0FAA0F;QACxF,mBAAmB,CACtB,CAAC;AACJ,CAAC"}
|
package/dist/cli/serve.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/cli/serve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/cli/serve.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,wBAAsB,YAAY,CAAC,EAAE,UAAU,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB9E"}
|
package/dist/cli/serve.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import cluster from 'node:cluster';
|
|
2
|
+
import { isIP } from 'node:net';
|
|
2
3
|
import { loadResolvedConfig } from '../config-loader.js';
|
|
3
4
|
import { geminiHost } from '../gemini/site-certificate.js';
|
|
4
5
|
import { seedStarterContent } from '../init.js';
|
|
@@ -53,6 +54,14 @@ async function serveWorker(configPath) {
|
|
|
53
54
|
'and recorded in data/dev-mode.jsonl. `geekity dev-mode off` takes the site live.\n';
|
|
54
55
|
}
|
|
55
56
|
announcement += `Geekity CMS is serving ${cms.config.baseUrl} on port ${String(port)}\n`;
|
|
57
|
+
if (isLoopbackUrl(cms.config.baseUrl)) {
|
|
58
|
+
announcement +=
|
|
59
|
+
`Warning: the base URL is ${cms.config.baseUrl}, but the server listens on every ` +
|
|
60
|
+
'network address. While the base URL is a localhost one, the session cookie is not ' +
|
|
61
|
+
'marked Secure, no HSTS header is sent and password reset links point at localhost. ' +
|
|
62
|
+
'Set GEEKITY_BASE_URL, or the base URL on Settings > General, to the https ' +
|
|
63
|
+
'address people use.\n';
|
|
64
|
+
}
|
|
56
65
|
if (geminiPort !== undefined) {
|
|
57
66
|
const host = geminiHost(cms.config, await cms.settings.values(SITE));
|
|
58
67
|
announcement += `Gemini is on port ${String(geminiPort)} for ${host}\n`;
|
|
@@ -65,4 +74,12 @@ async function serveWorker(configPath) {
|
|
|
65
74
|
}
|
|
66
75
|
return 0;
|
|
67
76
|
}
|
|
77
|
+
function isLoopbackUrl(baseUrl) {
|
|
78
|
+
const host = URL.parse(baseUrl)
|
|
79
|
+
?.hostname.replace(/^\[|\]$/g, '')
|
|
80
|
+
.toLowerCase() ?? '';
|
|
81
|
+
if (host === 'localhost' || host.endsWith('.localhost') || host === '::1')
|
|
82
|
+
return true;
|
|
83
|
+
return isIP(host) === 4 && host.startsWith('127.');
|
|
84
|
+
}
|
|
68
85
|
//# sourceMappingURL=serve.js.map
|
package/dist/cli/serve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/cli/serve.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/cli/serve.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/user.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { ParsedArgs } from './args.ts';
|
|
2
|
-
export declare function userCommand(
|
|
2
|
+
export declare function userCommand(parsed: ParsedArgs): Promise<number>;
|
|
3
3
|
//# sourceMappingURL=user.d.ts.map
|
package/dist/cli/user.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/cli/user.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/cli/user.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAK5C,wBAAsB,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBrE"}
|