@lowdefy/server-dev 0.0.0-experimental-20260909123240 → 0.0.0-experimental-20260909201552
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/client/App.jsx +3 -2
- package/client/Inspector.jsx +1 -1
- package/client/Page.jsx +13 -0
- package/lib/client/ErrorBar.jsx +17 -13
- package/lib/client/RedirectingPage.jsx +56 -0
- package/lib/client/auth/Auth.jsx +11 -6
- package/lib/client/auth/AuthConfigured.jsx +200 -37
- package/lib/client/auth/AuthNotConfigured.js +46 -4
- package/lib/client/auth/authNotConfiguredParity.test.mjs +61 -0
- package/lib/client/auth/authTemplateSync.test.mjs +40 -0
- package/lib/client/auth/betterAuthSessionContract.test.mjs +181 -0
- package/lib/client/utils/formatErrorsForCopy.js +30 -0
- package/lib/client/utils/formatErrorsForCopy.test.mjs +39 -0
- package/lib/client/utils/getErrorBarColor.js +25 -0
- package/lib/client/utils/getErrorBarColor.test.mjs +34 -0
- package/lib/client/utils/request.js +8 -1
- package/lib/client/utils/usePageConfig.js +22 -0
- package/lib/docs/clientErrorStore.js +3 -0
- package/lib/docs/clientErrorStore.test.mjs +42 -0
- package/lib/docs/createDocsMcpServer.js +149 -13
- package/lib/docs/createDocsMcpServer.test.mjs +225 -2
- package/lib/docs/devEventBus.js +136 -0
- package/lib/docs/devEventBus.test.mjs +225 -0
- package/lib/docs/docs.test.mjs +72 -1
- package/lib/docs/evalOperatorHeadless.js +7 -1
- package/lib/docs/findConfig.js +84 -39
- package/lib/docs/getBrowser.js +51 -39
- package/lib/docs/getBrowser.test.mjs +77 -3
- package/lib/docs/getBuildStatus.js +4 -1
- package/lib/docs/getCoreDoc.js +9 -1
- package/lib/docs/getHazards.js +115 -0
- package/lib/docs/getHazards.test.mjs +175 -0
- package/lib/docs/getOverview.js +15 -5
- package/lib/docs/getSchema.js +5 -1
- package/lib/docs/getStaleStatus.js +36 -0
- package/lib/docs/getStaleStatus.test.mjs +74 -0
- package/lib/docs/inspectStateHeadless.js +7 -1
- package/lib/docs/isPageReady.js +53 -0
- package/lib/docs/isPageReady.test.mjs +129 -0
- package/lib/docs/loadFrameworkHazards.js +40 -0
- package/lib/docs/loadFrameworkHazards.test.mjs +43 -0
- package/lib/docs/loadState.js +15 -3
- package/lib/docs/requestRestart.js +30 -0
- package/lib/docs/requestRestart.test.mjs +49 -0
- package/lib/docs/runEndpoint.js +106 -0
- package/lib/docs/runEndpoint.test.mjs +244 -0
- package/lib/docs/runJourney.js +674 -0
- package/lib/docs/runJourney.test.mjs +952 -0
- package/lib/docs/runRequest.js +18 -23
- package/lib/docs/runRequest.test.mjs +127 -0
- package/lib/docs/screenshotPage.js +6 -1
- package/lib/docs/serverErrorStore.js +40 -0
- package/lib/docs/serverErrorStore.test.mjs +45 -0
- package/lib/docs/setupTestFixtures.mjs +82 -6
- package/lib/docs/truncateResponse.js +39 -0
- package/lib/docs/truncateResponse.test.mjs +49 -0
- package/lib/docs/unsettledPageNote.js +24 -0
- package/lib/docs/validateJourneySteps.js +244 -0
- package/lib/docs/validateJourneySteps.test.mjs +183 -0
- package/lib/server/auth/createSystemContext.js +70 -0
- package/lib/server/auth/getAuth.js +46 -0
- package/lib/server/auth/getHeadlessUser.js +7 -8
- package/lib/server/auth/getMockUser.js +18 -14
- package/lib/server/auth/{getAuthConfig.js → getStrategies.js} +12 -10
- package/lib/server/auth/headlessUser.js +3 -2
- package/lib/server/auth/resolveHeadlessUser.test.mjs +0 -4
- package/lib/server/createLowdefyContext.js +91 -45
- package/lib/server/loadDynamicJsMap.js +47 -0
- package/lib/server/log/createHandleError.js +26 -0
- package/lib/server/log/createHandleError.test.mjs +74 -2
- package/lib/server/log/logRequest.js +1 -3
- package/manager/processes/startServer.mjs +0 -2
- package/manager/processes/startWatchers.mjs +4 -0
- package/manager/run.mjs +14 -0
- package/manager/utils/acquireManagerLock.mjs +63 -0
- package/manager/utils/acquireManagerLock.test.mjs +79 -0
- package/manager/utils/createCustomPluginTypesMap.mjs +2 -2
- package/manager/utils/setupWatcher.mjs +1 -1
- package/manager/watchers/pluginSourceWatcher.mjs +57 -0
- package/manager/watchers/pluginSourceWatcher.test.mjs +103 -0
- package/manager/watchers/restartRequestWatcher.mjs +62 -0
- package/manager/watchers/restartRequestWatcher.test.mjs +76 -0
- package/manager/watchers/selectWatchedPluginPackages.mjs +74 -0
- package/manager/watchers/selectWatchedPluginPackages.test.mjs +112 -0
- package/manager/watchers/serverArtifactWatcher.mjs +0 -2
- package/package.json +38 -34
- package/package.original.json +38 -34
- package/src/app.js +60 -15
- package/src/html/renderDevPage.js +4 -1
- package/src/middleware/createSameOriginGuard.js +68 -0
- package/src/middleware/createSameOriginGuard.test.mjs +102 -0
- package/src/middleware/errorHandler.js +36 -1
- package/src/middleware/errorHandler.test.mjs +122 -3
- package/src/middleware/staleFlag.js +76 -0
- package/src/middleware/staleFlag.test.mjs +127 -0
- package/src/routes/agent.js +3 -1
- package/src/routes/auth.js +15 -21
- package/src/routes/clientError.js +9 -11
- package/src/routes/cron.js +3 -1
- package/src/routes/cronForward.js +3 -1
- package/src/routes/detached.js +13 -7
- package/src/routes/devInspect.js +3 -1
- package/src/routes/docs/events.js +50 -0
- package/src/routes/docs/events.test.mjs +117 -0
- package/src/routes/docs/find.js +9 -1
- package/src/routes/docs/journey.js +66 -0
- package/src/routes/docs/journey.test.mjs +147 -0
- package/src/routes/docs/mcp.js +28 -2
- package/src/routes/docs/mcp.test.mjs +130 -0
- package/src/routes/docs/restart.js +35 -0
- package/src/routes/docs/restart.test.mjs +64 -0
- package/src/routes/docs/runEndpoint.js +51 -0
- package/src/routes/docs/runEndpoint.test.mjs +127 -0
- package/src/routes/docs/runRequest.js +23 -8
- package/src/routes/docs/runRequest.test.mjs +82 -0
- package/src/routes/endpoints.js +17 -10
- package/src/routes/feedback.js +7 -12
- package/src/routes/jitPage.js +42 -2
- package/src/routes/jitPage.test.mjs +107 -0
- package/src/routes/mcp.js +71 -5
- package/src/routes/mcp.test.mjs +199 -0
- package/src/routes/mcpProtectedResourceMetadata.js +34 -0
- package/src/routes/mcpProtectedResourceMetadata.test.mjs +65 -0
- package/src/routes/mountOauthDiscovery.js +44 -0
- package/src/routes/mountOauthDiscovery.test.mjs +79 -0
- package/src/routes/normalizeMcpProtocolVersionHeader.js +46 -0
- package/src/routes/normalizeMcpProtocolVersionHeader.test.mjs +62 -0
- package/src/routes/request.js +3 -1
- package/src/routes/request.test.mjs +8 -5
- package/src/routes/usage.js +3 -1
- package/src/routes/user.js +27 -0
- package/src/routes/wellKnownFallback.js +30 -0
- package/src/routes/wellKnownFallback.test.mjs +32 -0
- package/lib/server/auth/getDevSession.js +0 -70
- package/lib/server/auth/getDevSession.test.mjs +0 -138
- package/lib/server/auth/session.js +0 -39
- package/manager/processes/warnAuthUrlPortMismatch.mjs +0 -47
- package/manager/processes/warnAuthUrlPortMismatch.test.mjs +0 -93
- package/src/routes/apiPage.js +0 -37
- package/src/routes/auth.test.mjs +0 -84
package/client/App.jsx
CHANGED
|
@@ -40,7 +40,7 @@ function ThemeTokenResolver({ lowdefyRef, children }) {
|
|
|
40
40
|
return children;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
function App({ router }) {
|
|
43
|
+
function App({ config, router }) {
|
|
44
44
|
const lowdefyRef = useRef({});
|
|
45
45
|
const [runtimeErrors, setRuntimeErrors] = useState([]);
|
|
46
46
|
// Subscribe to rootConfig SWR cache — deduplicates with Routing's fetch.
|
|
@@ -88,6 +88,7 @@ function App({ router }) {
|
|
|
88
88
|
message: error.message,
|
|
89
89
|
source: error.source,
|
|
90
90
|
stack: error.stack,
|
|
91
|
+
prodError: error.prodError === true,
|
|
91
92
|
},
|
|
92
93
|
]);
|
|
93
94
|
}, []);
|
|
@@ -143,7 +144,7 @@ function App({ router }) {
|
|
|
143
144
|
/>
|
|
144
145
|
}
|
|
145
146
|
>
|
|
146
|
-
<Auth>
|
|
147
|
+
<Auth user={config?.user}>
|
|
147
148
|
{(auth) => {
|
|
148
149
|
return <Routing auth={auth} lowdefy={lowdefyRef.current} router={router} />;
|
|
149
150
|
}}
|
package/client/Inspector.jsx
CHANGED
|
@@ -123,7 +123,7 @@ async function bootstrapFromCheckpoint({ basePath, pageId, checkpointName, isCan
|
|
|
123
123
|
context._internal.update();
|
|
124
124
|
} catch (error) {
|
|
125
125
|
// eslint-disable-next-line no-console
|
|
126
|
-
console.error(
|
|
126
|
+
console.error(`Failed to load checkpoint "${checkpointName}":`, error);
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
|
package/client/Page.jsx
CHANGED
|
@@ -20,6 +20,7 @@ import Client from '@lowdefy/client';
|
|
|
20
20
|
|
|
21
21
|
import BuildErrorPage from '../lib/client/BuildErrorPage.jsx';
|
|
22
22
|
import InstallingPluginsPage from '../lib/client/InstallingPluginsPage.jsx';
|
|
23
|
+
import RedirectingPage from '../lib/client/RedirectingPage.jsx';
|
|
23
24
|
import usePageConfig from '../lib/client/utils/usePageConfig.js';
|
|
24
25
|
|
|
25
26
|
const Page = ({
|
|
@@ -46,10 +47,22 @@ const Page = ({
|
|
|
46
47
|
}
|
|
47
48
|
}, [pageConfig?._warnings, lowdefy]);
|
|
48
49
|
|
|
50
|
+
// Full load to the sign-in page so it can return here after sign-in — an
|
|
51
|
+
// effect, not a fetcher side effect, so the redirect re-fires if the same
|
|
52
|
+
// cached result renders again.
|
|
53
|
+
useEffect(() => {
|
|
54
|
+
if (pageConfig?.authRedirect) {
|
|
55
|
+
window.location.assign(pageConfig.authRedirect);
|
|
56
|
+
}
|
|
57
|
+
}, [pageConfig?.authRedirect]);
|
|
58
|
+
|
|
49
59
|
if (!pageConfig) {
|
|
50
60
|
router.replace({ pathname: '/404' });
|
|
51
61
|
return '';
|
|
52
62
|
}
|
|
63
|
+
if (pageConfig.authRedirect) {
|
|
64
|
+
return <RedirectingPage redirect={pageConfig.authRedirect} />;
|
|
65
|
+
}
|
|
53
66
|
if (pageConfig.buildError) {
|
|
54
67
|
return (
|
|
55
68
|
<BuildErrorPage
|
package/lib/client/ErrorBar.jsx
CHANGED
|
@@ -16,15 +16,17 @@
|
|
|
16
16
|
|
|
17
17
|
import React, { useCallback, useState } from 'react';
|
|
18
18
|
|
|
19
|
+
import formatErrorsForCopy from './utils/formatErrorsForCopy.js';
|
|
20
|
+
import getErrorBarColor from './utils/getErrorBarColor.js';
|
|
21
|
+
|
|
19
22
|
function getBarStyle(errors) {
|
|
20
|
-
const hasError = errors.some((e) => e.type !== 'ConfigWarning');
|
|
21
23
|
return {
|
|
22
24
|
position: 'fixed',
|
|
23
25
|
bottom: 0,
|
|
24
26
|
left: 0,
|
|
25
27
|
right: 0,
|
|
26
28
|
height: 28,
|
|
27
|
-
backgroundColor:
|
|
29
|
+
backgroundColor: getErrorBarColor(errors),
|
|
28
30
|
color: '#fff',
|
|
29
31
|
display: 'flex',
|
|
30
32
|
alignItems: 'center',
|
|
@@ -38,17 +40,6 @@ function getBarStyle(errors) {
|
|
|
38
40
|
};
|
|
39
41
|
}
|
|
40
42
|
|
|
41
|
-
function formatErrorsForCopy(errors) {
|
|
42
|
-
return errors
|
|
43
|
-
.map((e) => {
|
|
44
|
-
let text = `[${e.type}] ${e.message}`;
|
|
45
|
-
if (e.source) text += `\n Source: ${e.source}`;
|
|
46
|
-
if (e.stack) text += `\n${e.stack}`;
|
|
47
|
-
return text;
|
|
48
|
-
})
|
|
49
|
-
.join('\n\n');
|
|
50
|
-
}
|
|
51
|
-
|
|
52
43
|
function CopyIcon() {
|
|
53
44
|
return (
|
|
54
45
|
<svg
|
|
@@ -112,6 +103,19 @@ const ErrorBar = ({ errors }) => {
|
|
|
112
103
|
}}
|
|
113
104
|
>
|
|
114
105
|
<span style={{ opacity: 0.8 }}>{latest.type}: </span>
|
|
106
|
+
{latest.prodError === true && (
|
|
107
|
+
<span
|
|
108
|
+
style={{
|
|
109
|
+
backgroundColor: 'rgba(255,255,255,0.25)',
|
|
110
|
+
borderRadius: 8,
|
|
111
|
+
padding: '1px 7px',
|
|
112
|
+
fontSize: 11,
|
|
113
|
+
marginRight: 6,
|
|
114
|
+
}}
|
|
115
|
+
>
|
|
116
|
+
fails in prod
|
|
117
|
+
</span>
|
|
118
|
+
)}
|
|
115
119
|
<span>{latest.message}</span>
|
|
116
120
|
{latest.source && <span style={{ opacity: 0.7, marginLeft: 8 }}>{latest.source}</span>}
|
|
117
121
|
</div>
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2020-2026 Lowdefy, Inc
|
|
3
|
+
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
you may not use this file except in compliance with the License.
|
|
6
|
+
You may obtain a copy of the License at
|
|
7
|
+
|
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
|
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
See the License for the specific language governing permissions and
|
|
14
|
+
limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import React from 'react';
|
|
18
|
+
|
|
19
|
+
// Shown while the 401 sign-in redirect navigates. The link is the escape
|
|
20
|
+
// hatch for a dropped navigation - the tab must never depend on a single
|
|
21
|
+
// window.location.assign to leave this screen.
|
|
22
|
+
const RedirectingPage = ({ redirect }) => {
|
|
23
|
+
return (
|
|
24
|
+
<div
|
|
25
|
+
style={{
|
|
26
|
+
height: '100vh',
|
|
27
|
+
textAlign: 'center',
|
|
28
|
+
display: 'flex',
|
|
29
|
+
flexDirection: 'column',
|
|
30
|
+
alignItems: 'center',
|
|
31
|
+
justifyContent: 'center',
|
|
32
|
+
backgroundColor: 'var(--ant-color-bg-layout)',
|
|
33
|
+
color: 'var(--ant-color-text)',
|
|
34
|
+
fontFamily:
|
|
35
|
+
"system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif",
|
|
36
|
+
}}
|
|
37
|
+
>
|
|
38
|
+
<div
|
|
39
|
+
style={{
|
|
40
|
+
verticalAlign: 'middle',
|
|
41
|
+
display: 'inline-block',
|
|
42
|
+
}}
|
|
43
|
+
>
|
|
44
|
+
<h3>Redirecting to sign-in...</h3>
|
|
45
|
+
<p>
|
|
46
|
+
<a href={redirect} style={{ color: 'var(--ant-color-primary)' }}>
|
|
47
|
+
Continue to sign-in
|
|
48
|
+
</a>{' '}
|
|
49
|
+
if you are not redirected automatically.
|
|
50
|
+
</p>
|
|
51
|
+
</div>
|
|
52
|
+
</div>
|
|
53
|
+
);
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export default RedirectingPage;
|
package/lib/client/auth/Auth.jsx
CHANGED
|
@@ -14,8 +14,6 @@
|
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
/* eslint-disable react/jsx-props-no-spreading */
|
|
18
|
-
|
|
19
17
|
import React from 'react';
|
|
20
18
|
import AuthConfigured from './AuthConfigured.jsx';
|
|
21
19
|
import AuthNotConfigured from './AuthNotConfigured.js';
|
|
@@ -25,20 +23,27 @@ import { serializer } from '@lowdefy/helpers';
|
|
|
25
23
|
// Client code imports the build JSON directly — Vite handles JSON imports;
|
|
26
24
|
// the lib/build/*.js wrappers are server-only (they read from disk).
|
|
27
25
|
// Deserialize to restore arrays from their ~arr build markers (providers
|
|
28
|
-
// must be a real array for
|
|
26
|
+
// must be a real array for provider lookups in createAuthMethods).
|
|
29
27
|
import rawAuthConfig from '../../../build/auth.json';
|
|
30
28
|
|
|
31
29
|
const authConfig = serializer.deserialize(rawAuthConfig);
|
|
32
30
|
|
|
33
|
-
function Auth({ children,
|
|
31
|
+
function Auth({ children, user }) {
|
|
34
32
|
if (authConfig.configured === true) {
|
|
35
33
|
return (
|
|
36
|
-
<AuthConfigured
|
|
34
|
+
<AuthConfigured serverUser={user} authConfig={authConfig}>
|
|
37
35
|
{(auth) => children(auth)}
|
|
38
36
|
</AuthConfigured>
|
|
39
37
|
);
|
|
40
38
|
}
|
|
41
|
-
|
|
39
|
+
// An app whose only auth key is auth.dev has no auth stack, but the dev
|
|
40
|
+
// server still resolves a caller for auth.dev.mockUser - pass it through so
|
|
41
|
+
// _user reads the same identity in the browser as on the server.
|
|
42
|
+
return (
|
|
43
|
+
<AuthNotConfigured authConfig={authConfig} user={user}>
|
|
44
|
+
{(auth) => children(auth)}
|
|
45
|
+
</AuthNotConfigured>
|
|
46
|
+
);
|
|
42
47
|
}
|
|
43
48
|
|
|
44
49
|
export default Auth;
|
|
@@ -14,60 +14,223 @@
|
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
import React, { useEffect, useRef } from 'react';
|
|
17
|
+
import React, { useEffect, useRef, useState } from 'react';
|
|
18
|
+
import { createAuthClient } from 'better-auth/react';
|
|
20
19
|
import {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
} from '
|
|
20
|
+
adminClient,
|
|
21
|
+
emailOTPClient,
|
|
22
|
+
magicLinkClient,
|
|
23
|
+
organizationClient,
|
|
24
|
+
phoneNumberClient,
|
|
25
|
+
twoFactorClient,
|
|
26
|
+
} from 'better-auth/client/plugins';
|
|
27
|
+
import { oauthProviderClient } from '@better-auth/oauth-provider/client';
|
|
28
|
+
import { passkeyClient } from '@better-auth/passkey/client';
|
|
28
29
|
|
|
29
|
-
import { serializer } from '@lowdefy/helpers';
|
|
30
|
+
import { normalizeCaller, serializer } from '@lowdefy/helpers';
|
|
30
31
|
|
|
31
32
|
import rawLowdefyConfig from '../../../build/config.json';
|
|
32
33
|
|
|
33
34
|
const lowdefyConfig = serializer.deserialize(rawLowdefyConfig);
|
|
34
35
|
|
|
35
|
-
//
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
// GenericOAuth providers have no client plugin here. BetterAuth 1.7.0 dropped
|
|
37
|
+
// genericOAuthClient from better-auth/client/plugins, and nothing replaces it:
|
|
38
|
+
// through 1.6.x it was a marker plugin carrying only an id, a version, an empty
|
|
39
|
+
// $InferServerPlugin for TypeScript inference, and the generic-oauth error
|
|
40
|
+
// codes - no actions, atoms, fetch plugins or path methods. signIn.oauth2 is
|
|
41
|
+
// resolved by the client's dynamic path proxy from the call itself
|
|
42
|
+
// (signIn.oauth2 -> POST /sign-in/oauth2, POST because providerId is always
|
|
43
|
+
// sent), so the sign-in a Lowdefy GenericOAuth provider makes is unaffected.
|
|
44
|
+
const authClient = createAuthClient({
|
|
45
|
+
baseURL: `${window.location.origin}${lowdefyConfig.basePath ?? ''}/api/auth`,
|
|
46
|
+
plugins: [
|
|
47
|
+
adminClient(),
|
|
48
|
+
emailOTPClient(),
|
|
49
|
+
magicLinkClient(),
|
|
50
|
+
oauthProviderClient(),
|
|
51
|
+
organizationClient(),
|
|
52
|
+
passkeyClient(),
|
|
53
|
+
phoneNumberClient(),
|
|
54
|
+
twoFactorClient(),
|
|
55
|
+
],
|
|
56
|
+
});
|
|
40
57
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
58
|
+
// UpdateSession owns session freshness - suppress BetterAuth's own
|
|
59
|
+
// signal-driven refetch on the calls that would otherwise fire one, so
|
|
60
|
+
// nothing competes with (and aborts) the refetch UpdateSession awaits.
|
|
61
|
+
// Only calls that mutate an existing session are suppressed - calls that
|
|
62
|
+
// can establish one (the sign-ins, and the two-factor, phone-number,
|
|
63
|
+
// email-otp and passkey verifies) keep their signal: its refetch is what makes the store
|
|
64
|
+
// notice a login when no navigation follows.
|
|
65
|
+
// disableSignal silences all atomListeners for the call, including the
|
|
66
|
+
// organization plugin's org atoms - none are exposed to app config, so a
|
|
67
|
+
// future design exposing one must refresh it through its own action.
|
|
68
|
+
const sessionScoped = (params) => ({
|
|
69
|
+
...params,
|
|
70
|
+
fetchOptions: { ...params?.fetchOptions, disableSignal: true },
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
// The server resolves the caller per request and embeds it in the page
|
|
74
|
+
// config, so the first render never flashes unauthenticated. The BetterAuth
|
|
75
|
+
// client store takes over once its session fetch settles.
|
|
76
|
+
//
|
|
77
|
+
// Roles and merged attributes resolve server-side from the active member row
|
|
78
|
+
// - the base session carries neither. The last server-resolved caller is
|
|
79
|
+
// held in state: while the session user is unchanged it stays authoritative
|
|
80
|
+
// for the fields the session does not carry, and UpdateSession refreshes it
|
|
81
|
+
// from /api/user after a change (e.g. SetActiveOrganization). Holding it in
|
|
82
|
+
// state, not a ref, re-renders Session when it changes so _user recomputes -
|
|
83
|
+
// the same reactive footing the session half already stands on.
|
|
84
|
+
//
|
|
85
|
+
// Only the session half is passed through normalizeCaller. BetterAuth's store
|
|
86
|
+
// returns camelCase keys whatever the columns are named, so untransformed it
|
|
87
|
+
// would sit emailVerified beside the resolved caller's email_verified on one
|
|
88
|
+
// object; anything arriving from the server is already snake_case.
|
|
89
|
+
function Session({ children, reloadSuppressedRef, serverUser }) {
|
|
90
|
+
const { data: session, isPending } = authClient.useSession();
|
|
91
|
+
const [resolvedUser, setResolvedUser] = useState(serverUser);
|
|
92
|
+
const wasAuthenticated = useRef(Boolean(serverUser));
|
|
45
93
|
|
|
46
94
|
useEffect(() => {
|
|
47
|
-
if (
|
|
95
|
+
if (session) {
|
|
96
|
+
wasAuthenticated.current = true;
|
|
97
|
+
}
|
|
98
|
+
// Reload after sign-out (or session revocation) so the server can apply
|
|
99
|
+
// the page auth fork - a protected page redirects to the login page.
|
|
100
|
+
// A logout with a callbackUrl suppresses the reload - its own navigation
|
|
101
|
+
// would otherwise race this one.
|
|
102
|
+
if (wasAuthenticated.current && !isPending && !session && !reloadSuppressedRef.current) {
|
|
48
103
|
window.location.reload();
|
|
49
104
|
}
|
|
50
|
-
}, [
|
|
105
|
+
}, [session, isPending]);
|
|
51
106
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
107
|
+
if (isPending) {
|
|
108
|
+
return children(resolvedUser, setResolvedUser);
|
|
109
|
+
}
|
|
110
|
+
if (!session?.user) {
|
|
111
|
+
return children(null, setResolvedUser);
|
|
112
|
+
}
|
|
113
|
+
const resolved = resolvedUser;
|
|
114
|
+
if (!resolved) {
|
|
115
|
+
return children({ roles: [], ...normalizeCaller(session.user) }, setResolvedUser);
|
|
116
|
+
}
|
|
117
|
+
if (resolved.id !== session.user.id) {
|
|
118
|
+
// The ref has not caught up with a changed session user - a sign-in as a
|
|
119
|
+
// different person lands between the session refetch and the /api/user
|
|
120
|
+
// result. Render the last resolved caller whole rather than mixing the new
|
|
121
|
+
// session user with the previous person's resolved fields, or falling back
|
|
122
|
+
// to a caller with no roles - blocks re-evaluate operators on render, so a
|
|
123
|
+
// role-guarded page would act on an empty role list. UpdateSession closes
|
|
124
|
+
// the window when it lands the new caller; a flow that changes the session
|
|
125
|
+
// user without chaining it leaves the previous caller rendered until the
|
|
126
|
+
// next page load.
|
|
127
|
+
return children(resolved, setResolvedUser);
|
|
56
128
|
}
|
|
57
|
-
|
|
129
|
+
// _user is one object with one meaning on both sides: the resolved caller is
|
|
130
|
+
// spread whole, so every field resolveAuthentication emits is readable in app
|
|
131
|
+
// config without this file naming it. session.user is the floor - the client
|
|
132
|
+
// store may hold a fresher one than the resolved state, and the resolved
|
|
133
|
+
// object wins wherever both carry a key.
|
|
134
|
+
const user = { ...normalizeCaller(session.user), ...resolved };
|
|
135
|
+
return children(user, setResolvedUser);
|
|
58
136
|
}
|
|
59
137
|
|
|
60
|
-
function AuthConfigured({ authConfig, children,
|
|
61
|
-
const
|
|
138
|
+
function AuthConfigured({ authConfig, children, serverUser }) {
|
|
139
|
+
const reloadSuppressedRef = useRef(false);
|
|
140
|
+
const auth = {
|
|
141
|
+
authConfig,
|
|
142
|
+
getSession: ({ disableCookieCache } = {}) =>
|
|
143
|
+
authClient.getSession(disableCookieCache ? { query: { disableCookieCache: true } } : {}),
|
|
144
|
+
// Refetches the session through the session atom - the store's only
|
|
145
|
+
// writer - and resolves only after the store is written. fetchSession
|
|
146
|
+
// returns undefined and never rejects (failures are written into the
|
|
147
|
+
// atom), so the atom's own { data, error } is read back and returned,
|
|
148
|
+
// keeping unwrap working and surfacing a failed refresh to the action.
|
|
149
|
+
refreshSession: async ({ disableCookieCache } = {}) => {
|
|
150
|
+
const sessionAtom = authClient.$store.atoms.session;
|
|
151
|
+
await sessionAtom
|
|
152
|
+
.get()
|
|
153
|
+
.refetch(disableCookieCache ? { query: { disableCookieCache: true } } : undefined);
|
|
154
|
+
const { data, error } = sessionAtom.get();
|
|
155
|
+
return { data, error };
|
|
156
|
+
},
|
|
157
|
+
// The server-resolved caller - roles from the active member row and the
|
|
158
|
+
// merged attributes bag - for re-syncing after session changes.
|
|
159
|
+
getResolvedUser: async () => {
|
|
160
|
+
const response = await fetch(`${lowdefyConfig.basePath ?? ''}/api/user`, {
|
|
161
|
+
credentials: 'same-origin',
|
|
162
|
+
});
|
|
163
|
+
if (!response.ok) {
|
|
164
|
+
// /api/user itself always answers 200 { user } - user: null when no
|
|
165
|
+
// caller is admitted, which updateSession branches on. A non-OK
|
|
166
|
+
// response is a transport failure (gateway error page, 5xx) with no
|
|
167
|
+
// parsable body.
|
|
168
|
+
throw new Error(`Failed to fetch the resolved user (HTTP ${response.status}).`);
|
|
169
|
+
}
|
|
170
|
+
return response.json();
|
|
171
|
+
},
|
|
172
|
+
suppressSignOutReload: () => {
|
|
173
|
+
reloadSuppressedRef.current = true;
|
|
174
|
+
},
|
|
175
|
+
acceptInvitation: (params) => authClient.organization.acceptInvitation(sessionScoped(params)),
|
|
176
|
+
// addPasskey runs the WebAuthn browser ceremony itself - options fetch,
|
|
177
|
+
// authenticator prompt, verification.
|
|
178
|
+
addPasskey: (params) => authClient.passkey.addPasskey(params),
|
|
179
|
+
changePassword: (params) => authClient.changePassword(sessionScoped(params)),
|
|
180
|
+
deletePasskey: (params) => authClient.passkey.deletePasskey(params),
|
|
181
|
+
updatePasskey: (params) => authClient.passkey.updatePasskey(params),
|
|
182
|
+
leaveOrganization: (params) => authClient.organization.leave(sessionScoped(params)),
|
|
183
|
+
// The caller's memberships from the org plugin, keyed on the session
|
|
184
|
+
// alone - not the active organization. sessionScoped so the list read
|
|
185
|
+
// does not also fire the org-list atom's own refetch of the same route.
|
|
186
|
+
listOrganizations: () => authClient.organization.list(sessionScoped()),
|
|
187
|
+
// POST /oauth2/consent. The signed authorization query is not passed
|
|
188
|
+
// here - the oauthProviderClient fetch plugin stamps it onto the body as
|
|
189
|
+
// oauth_query from window.location.search, so the call must run while
|
|
190
|
+
// the page still holds the query the oauth-provider redirect arrived
|
|
191
|
+
// with.
|
|
192
|
+
oauth2Consent: (params) => authClient.oauth2.consent(params),
|
|
193
|
+
// POST /oauth2/continue - resumes the authorization after the post-login
|
|
194
|
+
// organization choice (the page runs SetActiveOrganization first). Same
|
|
195
|
+
// oauth_query contract as oauth2Consent: the signed query rides from
|
|
196
|
+
// window.location.search, so the call must run before any navigation.
|
|
197
|
+
oauth2Continue: (params) => authClient.oauth2.continue(params),
|
|
198
|
+
// The one-time email code: send, then sign in with it.
|
|
199
|
+
emailOtpSend: (params) => authClient.emailOtp.sendVerificationOtp(params),
|
|
200
|
+
emailOtpVerify: (params) => authClient.signIn.emailOtp(params),
|
|
201
|
+
phoneNumberRequestPasswordReset: (params) =>
|
|
202
|
+
authClient.phoneNumber.requestPasswordReset(params),
|
|
203
|
+
phoneNumberResetPassword: (params) => authClient.phoneNumber.resetPassword(params),
|
|
204
|
+
phoneNumberSendOtp: (params) => authClient.phoneNumber.sendOtp(params),
|
|
205
|
+
phoneNumberVerify: (params) => authClient.phoneNumber.verify(params),
|
|
206
|
+
requestPasswordReset: (params) => authClient.requestPasswordReset(params),
|
|
207
|
+
resetPassword: (params) => authClient.resetPassword(params),
|
|
208
|
+
revokeOtherSessions: () => authClient.revokeOtherSessions(sessionScoped()),
|
|
209
|
+
sendVerificationEmail: (params) => authClient.sendVerificationEmail(params),
|
|
210
|
+
setActiveOrganization: (params) => authClient.organization.setActive(sessionScoped(params)),
|
|
211
|
+
signInEmail: (params) => authClient.signIn.email(params),
|
|
212
|
+
signInMagicLink: (params) => authClient.signIn.magicLink(params),
|
|
213
|
+
signInOauth2: (params) => authClient.signIn.oauth2(params),
|
|
214
|
+
signInPasskey: (params) => authClient.signIn.passkey(params),
|
|
215
|
+
signInPhoneNumber: (params) => authClient.signIn.phoneNumber(params),
|
|
216
|
+
signInSocial: (params) => authClient.signIn.social(params),
|
|
217
|
+
signOut: () => authClient.signOut(),
|
|
218
|
+
signUpEmail: (params) => authClient.signUp.email(params),
|
|
219
|
+
twoFactorDisable: (params) => authClient.twoFactor.disable(sessionScoped(params)),
|
|
220
|
+
twoFactorEnable: (params) => authClient.twoFactor.enable(sessionScoped(params)),
|
|
221
|
+
twoFactorGenerateBackupCodes: (params) =>
|
|
222
|
+
authClient.twoFactor.generateBackupCodes(sessionScoped(params)),
|
|
223
|
+
twoFactorVerifyBackupCode: (params) => authClient.twoFactor.verifyBackupCode(params),
|
|
224
|
+
twoFactorVerifyTotp: (params) => authClient.twoFactor.verifyTotp(params),
|
|
225
|
+
};
|
|
62
226
|
return (
|
|
63
|
-
<
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
</SessionProvider>
|
|
227
|
+
<Session reloadSuppressedRef={reloadSuppressedRef} serverUser={serverUser}>
|
|
228
|
+
{(user, setResolvedUser) => {
|
|
229
|
+
auth.user = user;
|
|
230
|
+
auth.updateResolvedUser = (resolved) => setResolvedUser(resolved);
|
|
231
|
+
return children(auth);
|
|
232
|
+
}}
|
|
233
|
+
</Session>
|
|
71
234
|
);
|
|
72
235
|
}
|
|
73
236
|
|
|
@@ -13,18 +13,60 @@
|
|
|
13
13
|
See the License for the specific language governing permissions and
|
|
14
14
|
limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
|
|
16
|
+
|
|
17
|
+
import { ConfigError } from '@lowdefy/errors';
|
|
17
18
|
|
|
18
19
|
function authNotConfigured() {
|
|
19
|
-
throw new
|
|
20
|
+
throw new ConfigError(
|
|
21
|
+
'Auth is not configured. Add an "auth" section to lowdefy.yaml to use auth actions.'
|
|
22
|
+
);
|
|
20
23
|
}
|
|
21
24
|
|
|
22
|
-
|
|
25
|
+
// Every key AuthConfigured exposes must be present here, or an auth action in an
|
|
26
|
+
// app without an auth section fails with "auth.x is not a function" instead of
|
|
27
|
+
// the ConfigError that names the missing config.
|
|
28
|
+
function AuthNotConfigured({ authConfig, children, user = null }) {
|
|
23
29
|
const auth = {
|
|
24
30
|
authConfig,
|
|
31
|
+
user,
|
|
32
|
+
acceptInvitation: authNotConfigured,
|
|
33
|
+
addPasskey: authNotConfigured,
|
|
34
|
+
changePassword: authNotConfigured,
|
|
35
|
+
deletePasskey: authNotConfigured,
|
|
36
|
+
getResolvedUser: authNotConfigured,
|
|
25
37
|
getSession: authNotConfigured,
|
|
26
|
-
|
|
38
|
+
leaveOrganization: authNotConfigured,
|
|
39
|
+
listOrganizations: authNotConfigured,
|
|
40
|
+
oauth2Consent: authNotConfigured,
|
|
41
|
+
oauth2Continue: authNotConfigured,
|
|
42
|
+
emailOtpSend: authNotConfigured,
|
|
43
|
+
emailOtpVerify: authNotConfigured,
|
|
44
|
+
phoneNumberRequestPasswordReset: authNotConfigured,
|
|
45
|
+
phoneNumberResetPassword: authNotConfigured,
|
|
46
|
+
phoneNumberSendOtp: authNotConfigured,
|
|
47
|
+
phoneNumberVerify: authNotConfigured,
|
|
48
|
+
refreshSession: authNotConfigured,
|
|
49
|
+
requestPasswordReset: authNotConfigured,
|
|
50
|
+
resetPassword: authNotConfigured,
|
|
51
|
+
revokeOtherSessions: authNotConfigured,
|
|
52
|
+
sendVerificationEmail: authNotConfigured,
|
|
53
|
+
setActiveOrganization: authNotConfigured,
|
|
54
|
+
signInEmail: authNotConfigured,
|
|
55
|
+
signInMagicLink: authNotConfigured,
|
|
56
|
+
signInOauth2: authNotConfigured,
|
|
57
|
+
signInPasskey: authNotConfigured,
|
|
58
|
+
signInPhoneNumber: authNotConfigured,
|
|
59
|
+
signInSocial: authNotConfigured,
|
|
27
60
|
signOut: authNotConfigured,
|
|
61
|
+
signUpEmail: authNotConfigured,
|
|
62
|
+
suppressSignOutReload: authNotConfigured,
|
|
63
|
+
twoFactorDisable: authNotConfigured,
|
|
64
|
+
twoFactorEnable: authNotConfigured,
|
|
65
|
+
twoFactorGenerateBackupCodes: authNotConfigured,
|
|
66
|
+
twoFactorVerifyBackupCode: authNotConfigured,
|
|
67
|
+
twoFactorVerifyTotp: authNotConfigured,
|
|
68
|
+
updatePasskey: authNotConfigured,
|
|
69
|
+
updateResolvedUser: authNotConfigured,
|
|
28
70
|
};
|
|
29
71
|
|
|
30
72
|
return children(auth);
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2020-2026 Lowdefy, Inc
|
|
3
|
+
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
you may not use this file except in compliance with the License.
|
|
6
|
+
You may obtain a copy of the License at
|
|
7
|
+
|
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
|
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
See the License for the specific language governing permissions and
|
|
14
|
+
limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { readFile } from 'node:fs/promises';
|
|
18
|
+
import path from 'node:path';
|
|
19
|
+
import { fileURLToPath } from 'node:url';
|
|
20
|
+
|
|
21
|
+
import AuthNotConfigured from './AuthNotConfigured.js';
|
|
22
|
+
|
|
23
|
+
const authDir = path.dirname(fileURLToPath(import.meta.url));
|
|
24
|
+
|
|
25
|
+
// The keys of the `const auth = { ... }` literal plus the `auth.x =` assignments
|
|
26
|
+
// made after it - both reach the app through the same context object.
|
|
27
|
+
function readExposedKeys(source) {
|
|
28
|
+
const literal = source.slice(source.indexOf('const auth = {'), source.indexOf('\n };'));
|
|
29
|
+
const keys = [...literal.matchAll(/^ {4}([a-zA-Z0-9_]+)[:,]/gm)].map((match) => match[1]);
|
|
30
|
+
const assigned = [...source.matchAll(/^ +auth\.([a-zA-Z0-9_]+) =/gm)].map((match) => match[1]);
|
|
31
|
+
return [...new Set([...keys, ...assigned])].sort();
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function callAuthNotConfigured() {
|
|
35
|
+
let auth;
|
|
36
|
+
AuthNotConfigured({ authConfig: { enabled: false }, children: (value) => (auth = value) });
|
|
37
|
+
return auth;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// An app with no auth section still renders every block and action. A method
|
|
41
|
+
// AuthConfigured exposes but AuthNotConfigured omits surfaces as
|
|
42
|
+
// "auth.x is not a function" instead of the ConfigError naming the missing config.
|
|
43
|
+
test('AuthNotConfigured exposes every key AuthConfigured exposes', async () => {
|
|
44
|
+
const source = await readFile(path.join(authDir, 'AuthConfigured.jsx'), 'utf8');
|
|
45
|
+
const auth = callAuthNotConfigured();
|
|
46
|
+
expect(Object.keys(auth).sort()).toEqual(readExposedKeys(source));
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
test('AuthNotConfigured keeps authConfig and a null user', () => {
|
|
50
|
+
const auth = callAuthNotConfigured();
|
|
51
|
+
expect(auth.authConfig).toEqual({ enabled: false });
|
|
52
|
+
expect(auth.user).toBeNull();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
test('AuthNotConfigured methods throw a ConfigError naming the missing auth config', () => {
|
|
56
|
+
const auth = callAuthNotConfigured();
|
|
57
|
+
expect(() => auth.signInEmail({})).toThrow(
|
|
58
|
+
'Auth is not configured. Add an "auth" section to lowdefy.yaml to use auth actions.'
|
|
59
|
+
);
|
|
60
|
+
expect(() => auth.signInEmail({})).toThrow(expect.objectContaining({ name: 'ConfigError' }));
|
|
61
|
+
});
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2020-2026 Lowdefy, Inc
|
|
3
|
+
|
|
4
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
you may not use this file except in compliance with the License.
|
|
6
|
+
You may obtain a copy of the License at
|
|
7
|
+
|
|
8
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
|
|
10
|
+
Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
See the License for the specific language governing permissions and
|
|
14
|
+
limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { readdir, readFile } from 'node:fs/promises';
|
|
18
|
+
import path from 'node:path';
|
|
19
|
+
import { fileURLToPath } from 'node:url';
|
|
20
|
+
|
|
21
|
+
const devAuthDir = path.dirname(fileURLToPath(import.meta.url));
|
|
22
|
+
const prodAuthDir = path.resolve(devAuthDir, '../../../../server/lib/client/auth');
|
|
23
|
+
|
|
24
|
+
// The dev and prod server templates each carry their own copy of the auth
|
|
25
|
+
// components, kept in sync by hand. A change applied to one and not the
|
|
26
|
+
// other ships dev-only or prod-only - the app then behaves differently
|
|
27
|
+
// between lowdefy dev and a production build, which no unit test of either
|
|
28
|
+
// copy can catch.
|
|
29
|
+
test('the auth client templates are byte-identical between server and server-dev', async () => {
|
|
30
|
+
const isTemplate = (file) => !file.includes('.test.');
|
|
31
|
+
const devFiles = (await readdir(devAuthDir)).filter(isTemplate).sort();
|
|
32
|
+
const prodFiles = (await readdir(prodAuthDir)).filter(isTemplate).sort();
|
|
33
|
+
expect(prodFiles).toEqual(devFiles);
|
|
34
|
+
for (const file of devFiles) {
|
|
35
|
+
const dev = await readFile(path.join(devAuthDir, file), 'utf8');
|
|
36
|
+
const prod = await readFile(path.join(prodAuthDir, file), 'utf8');
|
|
37
|
+
// Compared per file so a failure names the file that diverged.
|
|
38
|
+
expect({ file, content: prod }).toEqual({ file, content: dev });
|
|
39
|
+
}
|
|
40
|
+
});
|