@lowdefy/server 4.0.0-alpha.12 → 4.0.0-alpha.15

package/lib/Page.js

@@ -20,34 +20,23 @@ import { useRouter } from 'next/router';
 import Client from '@lowdefy/client';
 import Head from 'next/head';
 import Link from 'next/link';
-import { signIn, signOut, useSession } from 'next-auth/react';
 
 import actions from '../build/plugins/actions.js';
 import blocks from '../build/plugins/blocks.js';
 import icons from '../build/plugins/icons.js';
 import operators from '../build/plugins/operators/client.js';
 
-const Page = ({ pageConfig, rootConfig }) => {
+const Page = ({ auth, pageConfig, rootConfig }) => {
   const router = useRouter();
-  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 (
     <Client
-      auth={{ signIn, signOut }}
+      auth={auth}
       Components={{ Head, Link }}
       config={{
         pageConfig,
         rootConfig,
       }}
       router={router}
-      session={session}
       types={{
         actions,
         blocks,

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/lowdefy/build.mjs

@@ -25,18 +25,15 @@ import createCustomPluginTypesMap from './createCustomPluginTypesMap.mjs';
 const argv = yargs(hideBin(process.argv)).argv;
 
 async function run() {
+  const serverDirectory = path.resolve(
+    argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd()
+  );
   const directories = {
-    build: path.resolve(
-      argv.buildDirectory ||
-        process.env.LOWDEFY_DIRECTORY_BUILD ||
-        path.join(process.cwd(), 'build')
-    ),
+    build: path.join(serverDirectory, 'build'),
     config: path.resolve(
       argv.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()
     ),
-    server: path.resolve(
-      argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd()
-    ),
+    server: serverDirectory,
   };
 
   const customTypesMap = await createCustomPluginTypesMap({ directories });

package/next.config.js

@@ -30,6 +30,7 @@ module.exports = withLess({
   // experimental: {
   //   concurrentFeatures: true,
   // },
+  outputFileTracing: true,
   eslint: {
     ignoreDuringBuilds: true,
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-alpha.12",
+  "version": "4.0.0-alpha.15",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -42,35 +42,35 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-alpha.12",
-    "@lowdefy/api": "4.0.0-alpha.12",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.12",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.12",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.12",
-    "@lowdefy/client": "4.0.0-alpha.12",
-    "@lowdefy/helpers": "4.0.0-alpha.12",
-    "@lowdefy/layout": "4.0.0-alpha.12",
-    "@lowdefy/node-utils": "4.0.0-alpha.12",
-    "@lowdefy/operators-js": "4.0.0-alpha.12",
-    "@lowdefy/plugin-next-auth": "4.0.0-alpha.12",
-    "next": "12.0.10",
+    "@lowdefy/actions-core": "4.0.0-alpha.15",
+    "@lowdefy/api": "4.0.0-alpha.15",
+    "@lowdefy/blocks-antd": "4.0.0-alpha.15",
+    "@lowdefy/blocks-basic": "4.0.0-alpha.15",
+    "@lowdefy/blocks-loaders": "4.0.0-alpha.15",
+    "@lowdefy/client": "4.0.0-alpha.15",
+    "@lowdefy/helpers": "4.0.0-alpha.15",
+    "@lowdefy/layout": "4.0.0-alpha.15",
+    "@lowdefy/node-utils": "4.0.0-alpha.15",
+    "@lowdefy/operators-js": "4.0.0-alpha.15",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.15",
+    "next": "12.1.6",
     "next-auth": "4.3.4",
     "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"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-alpha.12",
-    "@next/eslint-plugin-next": "12.0.10",
+    "@lowdefy/build": "4.0.0-alpha.15",
+    "@next/eslint-plugin-next": "12.1.6",
     "less": "4.1.2",
-    "less-loader": "10.2.0",
-    "next-with-less": "2.0.4",
-    "yaml": "1.10.2",
-    "yargs": "17.3.1"
+    "less-loader": "11.0.0",
+    "next-with-less": "2.0.5",
+    "yaml": "2.1.1",
+    "yargs": "17.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "41b6138a81bee7da362dad06345bc9f87b2c2133"
+  "gitHead": "b4e4538475e997f95baa37f01f39689240e6f01c"
 }

package/pages/404.js

@@ -13,13 +13,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-
+import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 
 import Page from '../lib/Page.js';
 
 export async function getStaticProps() {
-  const apiContext = await createApiContext({ buildDirectory: './build' });
+  // Important to give absolute path so Next can trace build files
+  const apiContext = await createApiContext({ buildDirectory: path.join(process.cwd(), 'build') });
 
   const [rootConfig, pageConfig] = await Promise.all([
     getRootConfig(apiContext),

package/pages/[pageId].js

@@ -14,16 +14,18 @@
   limitations under the License.
 */
 
+import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
-import { getSession } from 'next-auth/react';
 
+import getServerSession from '../lib/auth/getServerSession.js';
 import Page from '../lib/Page.js';
 
 export async function getServerSideProps(context) {
   const { pageId } = context.params;
-  const session = await getSession(context);
+  const session = await getServerSession(context);
+  // Important to give absolute path so Next can trace build files
   const apiContext = await createApiContext({
-    buildDirectory: './build',
+    buildDirectory: path.join(process.cwd(), 'build'),
     logger: console,
     session,
   });

package/pages/_app.js

@@ -13,20 +13,21 @@
   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 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';
 
-// TODO: SessionProvider requires basebath
-function App({ Component, pageProps: { session, ...pageProps } }) {
+function App({ Component, pageProps: { session, rootConfig, pageConfig } }) {
   return (
-    <SessionProvider session={session}>
-      <Component {...pageProps} />
-    </SessionProvider>
+    <Auth session={session}>
+      {(auth) => <Component auth={auth} rootConfig={rootConfig} pageConfig={pageConfig} />}
+    </Auth>
   );
 }
 

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

@@ -22,4 +22,16 @@ import callbacks from '../../../build/plugins/auth/callbacks.js';
 import events from '../../../build/plugins/auth/events.js';
 import providers from '../../../build/plugins/auth/providers.js';
 
-export default NextAuth(getNextAuthConfig({ authJson, plugins: { callbacks, events, providers } }));
+export default async function auth(req, res) {
+  if (authJson.configured === true) {
+    return await NextAuth(
+      req,
+      res,
+      getNextAuthConfig({ authJson, plugins: { callbacks, events, providers } })
+    );
+  }
+
+  return res.status(404).json({
+    message: 'Auth not configured',
+  });
+}

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

@@ -14,9 +14,12 @@
   limitations under the License.
 */
 
+import path from 'path';
 import { callRequest, createApiContext } from '@lowdefy/api';
 import { getSecretsFromEnv } from '@lowdefy/node-utils';
-import { getSession } from 'next-auth/react';
+
+import getServerSession from '../../../../lib/auth/getServerSession.js';
+
 import connections from '../../../../build/plugins/connections.js';
 import operators from '../../../../build/plugins/operators/server.js';
 
@@ -25,9 +28,10 @@ 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 });
+    // Important to give absolute path so Next can trace build files
     const apiContext = await createApiContext({
-      buildDirectory: './build',
+      buildDirectory: path.join(process.cwd(), 'build'),
       connections,
       // logger: console,
       logger: { debug: () => {} },
@@ -36,9 +40,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/index.js

@@ -14,15 +14,18 @@
   limitations under the License.
 */
 
+import path from 'path';
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
-import { getSession } from 'next-auth/react';
 
+import getServerSession from '../lib/auth/getServerSession.js';
 import Page from '../lib/Page.js';
 
 export async function getServerSideProps(context) {
-  const session = await getSession(context);
+  const session = await getServerSession(context);
+
+  // Important to give absolute path so Next can trace build files
   const apiContext = await createApiContext({
-    buildDirectory: './build',
+    buildDirectory: path.join(process.cwd(), 'build'),
     logger: console,
     session,
   });