@lowdefy/server-dev 4.0.0-alpha.11 → 4.0.0-alpha.14

package/lib/App.js

@@ -31,7 +31,7 @@ import blocks from '../build/plugins/blocks.js';
 import icons from '../build/plugins/icons.js';
 import operators from '../build/plugins/operators/client.js';
 
-const App = () => {
+const App = ({ auth }) => {
   const router = useRouter();
   const { data: rootConfig } = useRootConfig(router.basePath);
 
@@ -44,6 +44,7 @@ const App = () => {
     <Reload basePath={router.basePath}>
       {(resetContext) => (
         <Page
+          auth={auth}
           Components={{ Head, Link }}
           config={{
             rootConfig,

package/lib/Page.js

@@ -15,20 +15,14 @@
 */
 
 import React from 'react';
-import { signIn, signOut, useSession } from 'next-auth/react';
-
 import Client from '@lowdefy/client';
 
 import RestartingPage from './RestartingPage.js';
 import usePageConfig from './utils/usePageConfig.js';
 
-const Page = ({ Components, config, pageId, resetContext, router, types }) => {
-  const { data: session, status } = useSession();
-
-  if (status === 'loading') {
-    return '';
-  }
+const Page = ({ auth, Components, config, pageId, resetContext, router, types }) => {
   const { data: pageConfig } = usePageConfig(pageId, router.basePath);
+
   if (!pageConfig) {
     router.replace(`/404`);
     return '';
@@ -38,7 +32,7 @@ const Page = ({ Components, config, pageId, resetContext, router, types }) => {
   }
   return (
     <Client
-      auth={{ signIn, signOut }}
+      auth={auth}
       Components={Components}
       config={{
         ...config,
@@ -46,7 +40,6 @@ const Page = ({ Components, config, pageId, resetContext, router, types }) => {
       }}
       resetContext={resetContext}
       router={router}
-      session={session}
       stage="dev"
       types={types}
       window={window}

package/lib/auth/Auth.js

@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+/* eslint-disable react/jsx-props-no-spreading */
+
+import React from 'react';
+import AuthConfigured from './AuthConfigured.js';
+import AuthNotConfigured from './AuthNotConfigured.js';
+
+import authConfig from '../../build/auth.json';
+
+function Auth({ children, session }) {
+  if (authConfig.configured === true) {
+    return (
+      <AuthConfigured session={session} authConfig={authConfig}>
+        {(auth) => children(auth)}
+      </AuthConfigured>
+    );
+  }
+  return <AuthNotConfigured authConfig={authConfig}>{(auth) => children(auth)}</AuthNotConfigured>;
+}
+
+export default Auth;

package/lib/auth/AuthConfigured.js

@@ -0,0 +1,47 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+/* eslint-disable react/jsx-props-no-spreading */
+
+import React from 'react';
+import { SessionProvider, signIn, signOut, useSession } from 'next-auth/react';
+
+function Session({ children }) {
+  const { data: session, status } = useSession();
+  // 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.
+  if (status === 'loading') {
+    return '';
+  }
+  return children(session);
+}
+
+function AuthConfigured({ authConfig, children, serverSession }) {
+  const auth = { signIn, signOut, authConfig };
+
+  return (
+    <SessionProvider session={serverSession}>
+      <Session>
+        {(session) => {
+          auth.session = session;
+          return children(auth);
+        }}
+      </Session>
+    </SessionProvider>
+  );
+}
+
+export default AuthConfigured;

package/lib/auth/AuthNotConfigured.js

@@ -0,0 +1,32 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+/* eslint-disable react/jsx-props-no-spreading */
+
+function authNotConfigured() {
+  throw new Error('Auth not configured.');
+}
+
+function AuthNotConfigured({ authConfig, children }) {
+  const auth = {
+    authConfig,
+    signIn: authNotConfigured,
+    signOut: authNotConfigured,
+  };
+
+  return children(auth);
+}
+
+export default AuthNotConfigured;

package/lib/auth/getServerSession.js

@@ -0,0 +1,27 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import { getSession } from 'next-auth/react';
+import authJson from '../../build/auth.json';
+
+async function getServerSession(context) {
+  if (authJson.configured === true) {
+    return await getSession(context);
+  }
+  return undefined;
+}
+
+export default getServerSession;

package/manager/processes/initialBuild.mjs

@@ -17,10 +17,10 @@
 
 function initialBuild(context) {
   return async () => {
+    context.readDotEnv();
     await context.lowdefyBuild();
     await context.installPlugins();
     await context.nextBuild();
-    await context.readDotEnv();
   };
 }
 

package/manager/processes/readDotEnv.mjs

@@ -16,12 +16,10 @@
 
 import path from 'path';
 import dotenv from 'dotenv';
-import { readFile } from '@lowdefy/node-utils';
 
 function readDotEnv(context) {
-  return async () => {
-    const dotEnv = await readFile(path.join(context.directories.config, '.env'));
-    context.serverEnv = dotenv.parse(dotEnv || '');
+  return () => {
+    dotenv.config({ path: path.join(context.directories.config, '.env'), silent: true });
   };
 }
 

package/manager/processes/startNextServer.mjs

@@ -27,7 +27,6 @@ function startServerProcess(context) {
     processOptions: {
       env: {
         ...process.env,
-        ...context.serverEnv,
         PORT: context.options.port,
       },
     },

package/manager/run.mjs

@@ -80,7 +80,9 @@ async function run() {
   try {
     const serverPromise = startServer(context);
     await wait(800);
-    opener(`http://localhost:${context.options.port}`);
+    if (process.env.LOWDEFY_SERVER_DEV_OPEN_BROWSER === 'true') {
+      opener(`http://localhost:${context.options.port}`);
+    }
     await serverPromise;
   } catch (error) {
     console.log(error);

package/manager/watchers/envWatcher.mjs

@@ -21,7 +21,8 @@ import setupWatcher from '../utils/setupWatcher.mjs';
 function envWatcher(context) {
   const callback = async () => {
     console.warn('.env file changed.');
-    await context.readDotEnv();
+    context.readDotEnv();
+    await context.lowdefyBuild();
     context.restartServer();
   };
   return setupWatcher({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server-dev",
-  "version": "4.0.0-alpha.11",
+  "version": "4.0.0-alpha.14",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -39,50 +39,50 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-alpha.11",
-    "@lowdefy/api": "4.0.0-alpha.11",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.11",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.11",
-    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.11",
-    "@lowdefy/blocks-echarts": "4.0.0-alpha.11",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.11",
-    "@lowdefy/blocks-markdown": "4.0.0-alpha.11",
-    "@lowdefy/build": "4.0.0-alpha.11",
-    "@lowdefy/client": "4.0.0-alpha.11",
-    "@lowdefy/connection-axios-http": "4.0.0-alpha.11",
-    "@lowdefy/engine": "4.0.0-alpha.11",
-    "@lowdefy/helpers": "4.0.0-alpha.11",
-    "@lowdefy/layout": "4.0.0-alpha.11",
-    "@lowdefy/node-utils": "4.0.0-alpha.11",
-    "@lowdefy/operators-change-case": "4.0.0-alpha.11",
-    "@lowdefy/operators-diff": "4.0.0-alpha.11",
-    "@lowdefy/operators-js": "4.0.0-alpha.11",
-    "@lowdefy/operators-mql": "4.0.0-alpha.11",
-    "@lowdefy/operators-nunjucks": "4.0.0-alpha.11",
-    "@lowdefy/operators-uuid": "4.0.0-alpha.11",
-    "@lowdefy/operators-yaml": "4.0.0-alpha.11",
-    "@lowdefy/plugin-next-auth": "4.0.0-alpha.11",
+    "@lowdefy/actions-core": "4.0.0-alpha.14",
+    "@lowdefy/api": "4.0.0-alpha.14",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.14",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.14",
+    "@lowdefy/blocks-color-selectors": "4.0.0-alpha.14",
+    "@lowdefy/blocks-echarts": "4.0.0-alpha.14",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.14",
+    "@lowdefy/blocks-markdown": "4.0.0-alpha.14",
+    "@lowdefy/build": "4.0.0-alpha.14",
+    "@lowdefy/client": "4.0.0-alpha.14",
+    "@lowdefy/connection-axios-http": "4.0.0-alpha.14",
+    "@lowdefy/engine": "4.0.0-alpha.14",
+    "@lowdefy/helpers": "4.0.0-alpha.14",
+    "@lowdefy/layout": "4.0.0-alpha.14",
+    "@lowdefy/node-utils": "4.0.0-alpha.14",
+    "@lowdefy/operators-change-case": "4.0.0-alpha.14",
+    "@lowdefy/operators-diff": "4.0.0-alpha.14",
+    "@lowdefy/operators-js": "4.0.0-alpha.14",
+    "@lowdefy/operators-mql": "4.0.0-alpha.14",
+    "@lowdefy/operators-nunjucks": "4.0.0-alpha.14",
+    "@lowdefy/operators-uuid": "4.0.0-alpha.14",
+    "@lowdefy/operators-yaml": "4.0.0-alpha.14",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.14",
     "chokidar": "3.5.3",
-    "dotenv": "15.0.0",
+    "dotenv": "16.0.1",
     "next": "12.1.6",
     "next-auth": "4.3.4",
     "opener": "1.5.2",
     "process": "0.11.10",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
     "react-icons": "4.3.1",
-    "swr": "1.1.2",
-    "yaml": "2.0.0-10",
-    "yargs": "17.3.1"
+    "swr": "1.3.0",
+    "yaml": "2.1.1",
+    "yargs": "17.5.1"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "12.0.10",
+    "@next/eslint-plugin-next": "12.1.6",
     "less": "4.1.2",
-    "less-loader": "10.2.0",
-    "next-with-less": "2.0.4"
+    "less-loader": "11.0.0",
+    "next-with-less": "2.0.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "810fb2d8cb9ee8b0586b55fbbf26a5a5a0da3b2a"
+  "gitHead": "9cc0b7280c82a16689c31aaf71be278f3a40edc6"
 }

package/pages/_app.js

@@ -16,7 +16,8 @@
 
 import React, { Suspense } from 'react';
 import dynamic from 'next/dynamic';
-import { SessionProvider } from 'next-auth/react';
+
+import Auth from '../lib/auth/Auth.js';
 
 // Must be in _app due to next specifications.
 import '../build/plugins/styles.less';
@@ -24,9 +25,7 @@ import '../build/plugins/styles.less';
 function App({ Component }) {
   return (
     <Suspense fallback="">
-      <SessionProvider>
-        <Component />
-      </SessionProvider>
+      <Auth>{(auth) => <Component auth={auth} />}</Auth>
     </Suspense>
   );
 }

package/pages/api/page/[pageId].js

@@ -15,10 +15,10 @@
 */
 
 import { createApiContext, getPageConfig } from '@lowdefy/api';
-import { getSession } from 'next-auth/react';
+import getServerSession from '../../../lib/auth/getServerSession.js';
 
 export default async function handler(req, res) {
-  const session = await getSession({ req });
+  const session = await getServerSession({ req });
   const apiContext = await createApiContext({
     buildDirectory: './build',
     logger: console,

package/pages/api/request/[pageId]/[requestId].js

@@ -16,8 +16,9 @@
 
 import { callRequest, createApiContext } from '@lowdefy/api';
 import { getSecretsFromEnv } from '@lowdefy/node-utils';
-import { getSession } from 'next-auth/react';
+
 import connections from '../../../../build/plugins/connections.js';
+import getServerSession from '../../../../lib/auth/getServerSession.js';
 import operators from '../../../../build/plugins/operators/server.js';
 
 export default async function handler(req, res) {
@@ -25,7 +26,7 @@ export default async function handler(req, res) {
     if (req.method !== 'POST') {
       throw new Error('Only POST requests are supported.');
     }
-    const session = await getSession({ req });
+    const session = await getServerSession({ req });
     const apiContext = await createApiContext({
       buildDirectory: './build',
       connections,
@@ -35,9 +36,9 @@ export default async function handler(req, res) {
       session,
     });
 
-    const { pageId, requestId } = req.query;
+    const { blockId, pageId, requestId } = req.query;
     const { payload } = req.body;
-    const response = await callRequest(apiContext, { pageId, payload, requestId });
+    const response = await callRequest(apiContext, { blockId, pageId, payload, requestId });
     res.status(200).json(response);
   } catch (error) {
     res.status(500).json({ name: error.name, message: error.message });

package/pages/api/root.js

@@ -15,10 +15,11 @@
 */
 
 import { createApiContext, getRootConfig } from '@lowdefy/api';
-import { getSession } from 'next-auth/react';
+
+import getServerSession from '../../lib/auth/getServerSession.js';
 
 export default async function handler(req, res) {
-  const session = await getSession({ req });
+  const session = await getServerSession({ req });
   const apiContext = await createApiContext({
     buildDirectory: './build',
     logger: console,