@lowdefy/server 4.0.0-alpha.10 → 4.0.0-alpha.11

package/lib/Page.js

@@ -20,22 +20,34 @@ 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/operatorsClient.js';
+import operators from '../build/plugins/operators/client.js';
 
 const Page = ({ 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 }}
       Components={{ Head, Link }}
       config={{
         pageConfig,
         rootConfig,
       }}
       router={router}
+      session={session}
       types={{
         actions,
         blocks,

package/lowdefy/createCustomPluginTypesMap.mjs

@@ -33,6 +33,11 @@ async function getPluginDefinitions({ directories }) {
 async function createCustomPluginTypesMap({ directories }) {
   const customTypesMap = {
     actions: {},
+    auth: {
+      callbacks: {},
+      events: {},
+      providers: {},
+    },
     blocks: {},
     connections: {},
     icons: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/server",
-  "version": "4.0.0-alpha.10",
+  "version": "4.0.0-alpha.11",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -42,25 +42,26 @@
     "next": "next"
   },
   "dependencies": {
-    "@lowdefy/actions-core": "4.0.0-alpha.10",
-    "@lowdefy/api": "4.0.0-alpha.10",
-    "@lowdefy/blocks-antd": "4.0.0-alpha.10",
-    "@lowdefy/blocks-basic": "4.0.0-alpha.10",
-    "@lowdefy/blocks-loaders": "4.0.0-alpha.10",
-    "@lowdefy/client": "4.0.0-alpha.10",
-    "@lowdefy/helpers": "4.0.0-alpha.10",
-    "@lowdefy/layout": "4.0.0-alpha.10",
-    "@lowdefy/node-utils": "4.0.0-alpha.10",
-    "@lowdefy/operators-js": "4.0.0-alpha.10",
+    "@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-loaders": "4.0.0-alpha.11",
+    "@lowdefy/client": "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-js": "4.0.0-alpha.11",
+    "@lowdefy/plugin-next-auth": "4.0.0-alpha.11",
     "next": "12.0.10",
-    "next-auth": "4.1.2",
+    "next-auth": "4.3.4",
     "process": "0.11.10",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-icons": "4.3.1"
   },
   "devDependencies": {
-    "@lowdefy/build": "4.0.0-alpha.10",
+    "@lowdefy/build": "4.0.0-alpha.11",
     "@next/eslint-plugin-next": "12.0.10",
     "less": "4.1.2",
     "less-loader": "10.2.0",
@@ -71,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d697b4b5f354697d9481a371b90a00ca0944f486"
+  "gitHead": "810fb2d8cb9ee8b0586b55fbbf26a5a5a0da3b2a"
 }

package/pages/404.js

@@ -19,7 +19,6 @@ import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
 import Page from '../lib/Page.js';
 
 export async function getStaticProps() {
-  // TODO: get the right api context options
   const apiContext = await createApiContext({ buildDirectory: './build' });
 
   const [rootConfig, pageConfig] = await Promise.all([

package/pages/[pageId].js

@@ -15,13 +15,18 @@
 */
 
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+import { getSession } from 'next-auth/react';
 
 import Page from '../lib/Page.js';
 
 export async function getServerSideProps(context) {
   const { pageId } = context.params;
-  // TODO: get the right api context options
-  const apiContext = await createApiContext({ buildDirectory: './build' });
+  const session = await getSession(context);
+  const apiContext = await createApiContext({
+    buildDirectory: './build',
+    logger: console,
+    session,
+  });
 
   const [rootConfig, pageConfig] = await Promise.all([
     getRootConfig(apiContext),
@@ -41,6 +46,7 @@ export async function getServerSideProps(context) {
     props: {
       pageConfig,
       rootConfig,
+      session,
     },
   };
 }

package/pages/_app.js

@@ -16,12 +16,18 @@
 
 import React from 'react';
 import dynamic from 'next/dynamic';
+import { SessionProvider } from 'next-auth/react';
 
 // Must be in _app due to next specifications.
 import '../build/plugins/styles.less';
 
-function App({ Component, pageProps }) {
-  return <Component {...pageProps} />;
+// TODO: SessionProvider requires basebath
+function App({ Component, pageProps: { session, ...pageProps } }) {
+  return (
+    <SessionProvider session={session}>
+      <Component {...pageProps} />
+    </SessionProvider>
+  );
 }
 
 const DynamicApp = dynamic(() => Promise.resolve(App), {

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

@@ -15,14 +15,11 @@
 */
 
 import NextAuth from 'next-auth';
-import Auth0Provider from 'next-auth/providers/auth0';
+import { getNextAuthConfig } from '@lowdefy/api';
 
-export default NextAuth({
-  providers: [
-    Auth0Provider({
-      clientId: process.env.AUTH0_CLIENT_ID,
-      clientSecret: process.env.AUTH0_CLIENT_SECRET,
-      issuer: process.env.AUTH0_ISSUER,
-    }),
-  ],
-});
+import authJson from '../../../build/auth.json';
+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 } }));

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

@@ -16,26 +16,28 @@
 
 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 operators from '../../../../build/plugins/operatorsServer.js';
+import operators from '../../../../build/plugins/operators/server.js';
 
 export default async function handler(req, res) {
   try {
     if (req.method !== 'POST') {
       throw new Error('Only POST requests are supported.');
     }
-    // TODO: configure API context
+    const session = await getSession({ req });
     const apiContext = await createApiContext({
       buildDirectory: './build',
       connections,
-      // TODO: use a logger like pino
-      logger: console,
+      // logger: console,
+      logger: { debug: () => {} },
       operators,
       secrets: getSecretsFromEnv(),
+      session,
     });
+
     const { pageId, requestId } = req.query;
     const { payload } = req.body;
-
     const response = await callRequest(apiContext, { pageId, payload, requestId });
     res.status(200).json(response);
   } catch (error) {

package/pages/index.js

@@ -15,12 +15,17 @@
 */
 
 import { createApiContext, getPageConfig, getRootConfig } from '@lowdefy/api';
+import { getSession } from 'next-auth/react';
 
 import Page from '../lib/Page.js';
 
-export async function getServerSideProps() {
-  // TODO: is this build directory configurable from the cli?
-  const apiContext = await createApiContext({ buildDirectory: './build' });
+export async function getServerSideProps(context) {
+  const session = await getSession(context);
+  const apiContext = await createApiContext({
+    buildDirectory: './build',
+    logger: console,
+    session,
+  });
   const rootConfig = await getRootConfig(apiContext);
   const { home } = rootConfig;
   if (home.configured === false) {
@@ -44,6 +49,7 @@ export async function getServerSideProps() {
     props: {
       pageConfig,
       rootConfig,
+      session,
     },
   };
 }