@lowdefy/server 4.0.0-rc.6 → 4.0.0-rc.8

package/lib/Page.js

@@ -26,7 +26,7 @@ import blocks from '../build/plugins/blocks.js';
 import icons from '../build/plugins/icons.js';
 import operators from '../build/plugins/operators/client.js';
 
-const Page = ({ auth, pageConfig, rootConfig }) => {
+const Page = ({ auth, lowdefy, pageConfig, rootConfig }) => {
   const router = useRouter();
   return (
     <Client
@@ -36,6 +36,7 @@ const Page = ({ auth, pageConfig, rootConfig }) => {
         pageConfig,
         rootConfig,
       }}
+      lowdefy={lowdefy}
       router={router}
       types={{
         actions,

package/lib/auth/Auth.js

@@ -24,7 +24,7 @@ import authConfig from '../../build/auth.json';
 function Auth({ children, session }) {
   if (authConfig.configured === true) {
     return (
-      <AuthConfigured session={session} authConfig={authConfig}>
+      <AuthConfigured serverSession={session} authConfig={authConfig}>
         {(auth) => children(auth)}
       </AuthConfigured>
     );

package/lib/auth/AuthConfigured.js

@@ -15,11 +15,22 @@
 */
 /* eslint-disable react/jsx-props-no-spreading */
 
-import React from 'react';
-import { SessionProvider, signIn, signOut, useSession } from 'next-auth/react';
+import React, { useEffect, useRef } from 'react';
+import { getSession, SessionProvider, signIn, signOut, useSession } from 'next-auth/react';
+
+import lowdefyConfig from '../../build/config.json';
 
 function Session({ children }) {
+  const wasAuthenticated = useRef(false);
   const { data: session, status } = useSession();
+  wasAuthenticated.current = wasAuthenticated.current || status === 'authenticated';
+
+  useEffect(() => {
+    if (wasAuthenticated.current && status === 'unauthenticated') {
+      window.location.reload();
+    }
+  }, [status]);
+
   // If session is passed to SessionProvider from getServerSideProps
   // we won't have a loading state here.
   // But 404 uses getStaticProps so we have this for 404.
@@ -30,10 +41,13 @@ function Session({ children }) {
 }
 
 function AuthConfigured({ authConfig, children, serverSession }) {
-  const auth = { signIn, signOut, authConfig };
-
+  const auth = { authConfig, getSession, signIn, signOut };
+  let basePath = lowdefyConfig.basePath;
+  if (basePath) {
+    basePath = `${basePath}/api/auth`;
+  }
   return (
-    <SessionProvider session={serverSession}>
+    <SessionProvider session={serverSession} basePath={basePath}>
       <Session>
         {(session) => {
           auth.session = session;

package/lib/auth/AuthNotConfigured.js

@@ -22,6 +22,7 @@ function authNotConfigured() {
 function AuthNotConfigured({ authConfig, children }) {
   const auth = {
     authConfig,
+    getSession: authNotConfigured,
     signIn: authNotConfigured,
     signOut: authNotConfigured,
   };

package/next.config.js

@@ -2,7 +2,7 @@ const withLess = require('next-with-less');
 const lowdefyConfig = require('./build/config.json');
 
 module.exports = withLess({
-  basePath: process.env.LOWDEFY_BASE_PATH || lowdefyConfig.basePath,
+  basePath: lowdefyConfig.basePath,
   reactStrictMode: true,
   webpack: (config, { isServer }) => {
     if (!isServer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.8",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -45,17 +45,17 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.6",
-    "@lowdefy/api": "4.0.0-rc.6",
-    "@lowdefy/blocks-antd": "4.0.0-rc.6",
-    "@lowdefy/blocks-basic": "4.0.0-rc.6",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.6",
-    "@lowdefy/client": "4.0.0-rc.6",
-    "@lowdefy/helpers": "4.0.0-rc.6",
-    "@lowdefy/layout": "4.0.0-rc.6",
-    "@lowdefy/node-utils": "4.0.0-rc.6",
-    "@lowdefy/operators-js": "4.0.0-rc.6",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.6",
+    "@lowdefy/actions-core": "4.0.0-rc.8",
+    "@lowdefy/api": "4.0.0-rc.8",
+    "@lowdefy/blocks-antd": "4.0.0-rc.8",
+    "@lowdefy/blocks-basic": "4.0.0-rc.8",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.8",
+    "@lowdefy/client": "4.0.0-rc.8",
+    "@lowdefy/helpers": "4.0.0-rc.8",
+    "@lowdefy/layout": "4.0.0-rc.8",
+    "@lowdefy/node-utils": "4.0.0-rc.8",
+    "@lowdefy/operators-js": "4.0.0-rc.8",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.8",
     "next": "12.3.1",
     "next-auth": "4.20.1",
     "process": "0.11.10",
@@ -64,18 +64,18 @@
     "react-icons": "4.7.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-rc.6",
+    "@lowdefy/build": "4.0.0-rc.8",
     "@next/eslint-plugin-next": "12.1.6",
     "less": "4.1.3",
     "less-loader": "11.1.0",
     "next-with-less": "2.0.5",
     "webpack": "5.76.0",
-    "yaml": "2.2.1",
+    "yaml": "2.2.2",
     "yargs": "17.6.2"
   },
   "packageManager": "pnpm@7.11.0",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8238145a9eb26c6f3dc48661ab6eca6e3aca4f83"
+  "gitHead": "db883daef0443647439b6fe2db845b846ffb6d4e"
 }

package/package.original.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.8",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -45,17 +45,17 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-rc.6",
-    "@lowdefy/api": "4.0.0-rc.6",
-    "@lowdefy/blocks-antd": "4.0.0-rc.6",
-    "@lowdefy/blocks-basic": "4.0.0-rc.6",
-    "@lowdefy/blocks-loaders": "4.0.0-rc.6",
-    "@lowdefy/client": "4.0.0-rc.6",
-    "@lowdefy/helpers": "4.0.0-rc.6",
-    "@lowdefy/layout": "4.0.0-rc.6",
-    "@lowdefy/node-utils": "4.0.0-rc.6",
-    "@lowdefy/operators-js": "4.0.0-rc.6",
-    "@lowdefy/plugin-next-auth": "4.0.0-rc.6",
+    "@lowdefy/actions-core": "4.0.0-rc.8",
+    "@lowdefy/api": "4.0.0-rc.8",
+    "@lowdefy/blocks-antd": "4.0.0-rc.8",
+    "@lowdefy/blocks-basic": "4.0.0-rc.8",
+    "@lowdefy/blocks-loaders": "4.0.0-rc.8",
+    "@lowdefy/client": "4.0.0-rc.8",
+    "@lowdefy/helpers": "4.0.0-rc.8",
+    "@lowdefy/layout": "4.0.0-rc.8",
+    "@lowdefy/node-utils": "4.0.0-rc.8",
+    "@lowdefy/operators-js": "4.0.0-rc.8",
+    "@lowdefy/plugin-next-auth": "4.0.0-rc.8",
     "next": "12.3.1",
     "next-auth": "4.20.1",
     "process": "0.11.10",
@@ -64,13 +64,13 @@
     "react-icons": "4.7.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-rc.6",
+    "@lowdefy/build": "4.0.0-rc.8",
     "@next/eslint-plugin-next": "12.1.6",
     "less": "4.1.3",
     "less-loader": "11.1.0",
     "next-with-less": "2.0.5",
     "webpack": "5.76.0",
-    "yaml": "2.2.1",
+    "yaml": "2.2.2",
     "yargs": "17.6.2"
   },
   "packageManager": "pnpm@7.11.0",

package/pages/_app.js

@@ -15,7 +15,7 @@
 */
 /* eslint-disable react/jsx-props-no-spreading */
 
-import React from 'react';
+import React, { useRef } from 'react';
 import dynamic from 'next/dynamic';
 
 import Auth from '../lib/auth/Auth.js';
@@ -24,9 +24,17 @@ import Auth from '../lib/auth/Auth.js';
 import '../build/plugins/styles.less';
 
 function App({ Component, pageProps: { session, rootConfig, pageConfig } }) {
+  const lowdefyRef = useRef({});
   return (
     <Auth session={session}>
-      {(auth) => <Component auth={auth} rootConfig={rootConfig} pageConfig={pageConfig} />}
+      {(auth) => (
+        <Component
+          auth={auth}
+          lowdefy={lowdefyRef.current}
+          rootConfig={rootConfig}
+          pageConfig={pageConfig}
+        />
+      )}
     </Auth>
   );
 }

package/pages/_document.js

@@ -16,16 +16,20 @@
 
 import React from 'react';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
+
 import appJson from '../build/app.json';
+import lowdefyConfig from '../build/config.json';
+
+const basePath = lowdefyConfig.basePath ?? '';
 
 class LowdefyDocument extends Document {
   render() {
     return (
       <Html>
         <Head>
-          <link rel="manifest" href="/manifest.webmanifest" />
-          <link rel="icon" type="image/svg+xml" href="/icon.svg" />
-          <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+          <link rel="manifest" href={`${basePath}/manifest.webmanifest`} />
+          <link rel="icon" type="image/svg+xml" href={`${basePath}/icon.svg`} />
+          <link rel="apple-touch-icon" href={`${basePath}/apple-touch-icon.png`} />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
           <script
             dangerouslySetInnerHTML={{

package/pages/api/auth/[...nextauth].js

@@ -36,6 +36,11 @@ export const authOptions = getNextAuthConfig(
 
 export default async function auth(req, res) {
   if (authJson.configured === true) {
+    // Required for emails in corporate networks, see:
+    // https://next-auth.js.org/tutorials/avoid-corporate-link-checking-email-provider
+    if (req.method === 'HEAD') {
+      return res.status(200).end();
+    }
     return await NextAuth(req, res, authOptions);
   }