Merge branch 'develop' into react-18

lowdefy · May 30, 2022 · c1c1ade · c1c1ade
2 parents 331284e + c581fb0
commit c1c1ade
Show file tree

Hide file tree

Showing 43 changed files with 446 additions and 82 deletions.
diff --git a/packages/api/src/context/errors.js b/packages/api/src/context/errors.js
@@ -16,13 +16,6 @@
 
 /* eslint-disable max-classes-per-file */
 
-class AuthenticationError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AuthenticationError';
-  }
-}
-
 class ConfigurationError extends Error {
   constructor(message) {
     super(message);
@@ -44,11 +37,4 @@ class ServerError extends Error {
   }
 }
 
-class TokenExpiredError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'TokenExpiredError';
-  }
-}
-
-export { AuthenticationError, ConfigurationError, RequestError, ServerError, TokenExpiredError };
+export { ConfigurationError, RequestError, ServerError };
diff --git a/packages/api/src/index.js b/packages/api/src/index.js
@@ -17,20 +17,13 @@
 import callRequest from './routes/request/callRequest.js';
 import createApiContext from './context/createApiContext.js';
 import getHomeAndMenus from './routes/rootConfig/getHomeAndMenus.js';
-import getNextAuthConfig from './auth/getNextAuthConfig.js';
+import getNextAuthConfig from './routes/auth/getNextAuthConfig.js';
 import getPageConfig from './routes/page/getPageConfig.js';
 import getRootConfig from './routes/rootConfig/getRootConfig.js';
 
-import {
-  AuthenticationError,
-  ConfigurationError,
-  RequestError,
-  ServerError,
-  TokenExpiredError,
-} from './context/errors.js';
+import { ConfigurationError, RequestError, ServerError } from './context/errors.js';
 
 export {
-  AuthenticationError,
   callRequest,
   ConfigurationError,
   createApiContext,
@@ -40,5 +33,4 @@ export {
   getRootConfig,
   RequestError,
   ServerError,
-  TokenExpiredError,
 };
diff --git a/...c/auth/callbacks/createCallbackPlugins.js → ...s/auth/callbacks/createCallbackPlugins.js b/...c/auth/callbacks/createCallbackPlugins.js → ...s/auth/callbacks/createCallbackPlugins.js
diff --git a/...api/src/auth/callbacks/createCallbacks.js → .../routes/auth/callbacks/createCallbacks.js b/...api/src/auth/callbacks/createCallbacks.js → .../routes/auth/callbacks/createCallbacks.js
diff --git a/...i/src/auth/callbacks/createJWTCallback.js → ...outes/auth/callbacks/createJWTCallback.js b/...i/src/auth/callbacks/createJWTCallback.js → ...outes/auth/callbacks/createJWTCallback.js
@@ -23,9 +23,55 @@ function createJWTCallback({ authConfig, plugins }) {
     type: 'jwt',
   });
 
-  if (jwtCallbackPlugins.length === 0) return undefined;
-
   async function jwtCallback({ token, user, account, profile, isNewUser }) {
+    if (profile) {
+      const {
+        sub,
+        name,
+        given_name,
+        family_name,
+        middle_name,
+        nickname,
+        preferred_username,
+        profile: profile_claim,
+        picture,
+        website,
+        email,
+        email_verified,
+        gender,
+        birthdate,
+        zoneinfo,
+        locale,
+        phone_number,
+        phone_number_verified,
+        address,
+        updated_at,
+      } = profile;
+      token = {
+        sub,
+        name,
+        given_name,
+        family_name,
+        middle_name,
+        nickname,
+        preferred_username,
+        profile: profile_claim,
+        picture,
+        website,
+        email,
+        email_verified,
+        gender,
+        birthdate,
+        zoneinfo,
+        locale,
+        phone_number,
+        phone_number_verified,
+        address,
+        updated_at,
+        ...token,
+      };
+    }
+
     for (const plugin of jwtCallbackPlugins) {
       token = await plugin.fn({
         properties: plugin.properties ?? {},

diff --git a/.../auth/callbacks/createRedirectCallback.js → .../auth/callbacks/createRedirectCallback.js b/.../auth/callbacks/createRedirectCallback.js → .../auth/callbacks/createRedirectCallback.js
diff --git a/...c/auth/callbacks/createSessionCallback.js → ...s/auth/callbacks/createSessionCallback.js b/...c/auth/callbacks/createSessionCallback.js → ...s/auth/callbacks/createSessionCallback.js
@@ -24,8 +24,53 @@ function createSessionCallback({ authConfig, plugins }) {
   });
 
   async function sessionCallback({ session, token, user }) {
+    // console.log({ session, token, user });
     if (token) {
-      session.user.sub = token.sub;
+      const {
+        sub,
+        name,
+        given_name,
+        family_name,
+        middle_name,
+        nickname,
+        preferred_username,
+        profile,
+        picture,
+        website,
+        email,
+        email_verified,
+        gender,
+        birthdate,
+        zoneinfo,
+        locale,
+        phone_number,
+        phone_number_verified,
+        address,
+        updated_at,
+      } = token;
+      session.user = {
+        sub,
+        name,
+        given_name,
+        family_name,
+        middle_name,
+        nickname,
+        preferred_username,
+        profile,
+        picture,
+        website,
+        email,
+        email_verified,
+        gender,
+        birthdate,
+        zoneinfo,
+        locale,
+        phone_number,
+        phone_number_verified,
+        address,
+        updated_at,
+        ...session.user,
+      };
     }
 
     for (const plugin of sessionCallbackPlugins) {

diff --git a/...rc/auth/callbacks/createSignInCallback.js → ...es/auth/callbacks/createSignInCallback.js b/...rc/auth/callbacks/createSignInCallback.js → ...es/auth/callbacks/createSignInCallback.js
diff --git a/packages/api/src/auth/createProviders.js → ...es/api/src/routes/auth/createProviders.js b/packages/api/src/auth/createProviders.js → ...es/api/src/routes/auth/createProviders.js
diff --git a/.../src/auth/events/createCreateUserEvent.js → ...utes/auth/events/createCreateUserEvent.js b/.../src/auth/events/createCreateUserEvent.js → ...utes/auth/events/createCreateUserEvent.js
diff --git a/...api/src/auth/events/createEventPlugins.js → .../routes/auth/events/createEventPlugins.js b/...api/src/auth/events/createEventPlugins.js → .../routes/auth/events/createEventPlugins.js
diff --git a/packages/api/src/auth/events/createEvents.js → ...pi/src/routes/auth/events/createEvents.js b/packages/api/src/auth/events/createEvents.js → ...pi/src/routes/auth/events/createEvents.js
diff --git a/...src/auth/events/createLinkAccountEvent.js → ...tes/auth/events/createLinkAccountEvent.js b/...src/auth/events/createLinkAccountEvent.js → ...tes/auth/events/createLinkAccountEvent.js
diff --git a/...api/src/auth/events/createSessionEvent.js → .../routes/auth/events/createSessionEvent.js b/...api/src/auth/events/createSessionEvent.js → .../routes/auth/events/createSessionEvent.js
diff --git a/.../api/src/auth/events/createSignInEvent.js → ...c/routes/auth/events/createSignInEvent.js b/.../api/src/auth/events/createSignInEvent.js → ...c/routes/auth/events/createSignInEvent.js
diff --git a/...api/src/auth/events/createSignOutEvent.js → .../routes/auth/events/createSignOutEvent.js b/...api/src/auth/events/createSignOutEvent.js → .../routes/auth/events/createSignOutEvent.js
diff --git a/.../src/auth/events/createUpdateUserEvent.js → ...utes/auth/events/createUpdateUserEvent.js b/.../src/auth/events/createUpdateUserEvent.js → ...utes/auth/events/createUpdateUserEvent.js
diff --git a/packages/api/src/auth/getNextAuthConfig.js → .../api/src/routes/auth/getNextAuthConfig.js b/packages/api/src/auth/getNextAuthConfig.js → .../api/src/routes/auth/getNextAuthConfig.js
diff --git a/packages/build/src/build/buildAuth/buildAuth.js b/packages/build/src/build/buildAuth/buildAuth.js
@@ -16,12 +16,16 @@
   limitations under the License.
 */
 
+import { type } from '@lowdefy/helpers';
 import buildAuthPlugins from './buildAuthPlugins.js';
 import buildPageAuth from './buildPageAuth.js';
 import validateAuthConfig from './validateAuthConfig.js';
 
 function buildAuth({ components, context }) {
+  const configured = !type.isNone(components.auth);
+
   validateAuthConfig({ components });
+  components.auth.configured = configured;
   buildPageAuth({ components });
   buildAuthPlugins({ components, context });
 

diff --git a/packages/build/src/build/buildAuth/buildAuth.test.js b/packages/build/src/build/buildAuth/buildAuth.test.js
@@ -31,6 +31,7 @@ test('buildAuth default', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: false,
       events: [],
       pages: {
         roles: {},
@@ -53,6 +54,7 @@ test('buildAuth no pages', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: false,
       events: [],
       pages: {
         roles: {},
@@ -82,6 +84,7 @@ test('buildAuth all protected, some public', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         public: ['a', 'b'],
@@ -117,6 +120,7 @@ test('buildAuth all public, some protected', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         protected: ['a', 'b'],
@@ -152,6 +156,7 @@ test('buildAuth all public', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         public: true,
@@ -188,6 +193,7 @@ test('buildAuth all protected', async () => {
     auth: {
       callbacks: [],
       events: [],
+      configured: true,
       pages: {
         protected: true,
         roles: {},
@@ -224,6 +230,7 @@ test('buildAuth roles', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         roles: {
@@ -276,6 +283,7 @@ test('buildAuth roles and protected pages array', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         roles: {
@@ -307,6 +315,7 @@ test('buildAuth roles and protected true', async () => {
   expect(res).toEqual({
     auth: {
       callbacks: [],
+      configured: true,
       events: [],
       pages: {
         roles: {

diff --git a/packages/client/src/Client.js b/packages/client/src/Client.js
@@ -30,7 +30,6 @@ const Client = ({
   config,
   resetContext = { reset: false, setReset: () => undefined },
   router,
-  session,
   stage,
   types,
   window,
@@ -40,7 +39,6 @@ const Client = ({
     Components,
     config,
     router,
-    session,
     stage,
     types,
     window,

diff --git a/packages/client/src/auth/createAuthMethods.js b/packages/client/src/auth/createAuthMethods.js
@@ -34,12 +34,14 @@ function getCallbackUrl({ lowdefy, callbackUrl = {} }) {
   return undefined;
 }
 
-function createAuthMethods(lowdefy, auth) {
+function createAuthMethods({ lowdefy, auth }) {
   // login and logout are Lowdefy function that handle action params
   // signIn and signOut are the next-auth methods
   function login({ providerId, callbackUrl, authUrl = {} } = {}) {
-    // TODO: if only one provider exists, pass provider here
-    // to link directly to provider
+    if (type.isNone(providerId) && auth.authConfig.providers.length === 1) {
+      providerId = auth.authConfig.providers[0].id;
+    }
+
     auth.signIn(
       providerId,
       { callbackUrl: getCallbackUrl({ lowdefy, callbackUrl }) },

diff --git a/packages/client/src/initLowdefyContext.js b/packages/client/src/initLowdefyContext.js
@@ -44,7 +44,7 @@ const lowdefy = {
   lowdefyGlobal: {},
 };
 
-function initLowdefyContext({ auth, Components, config, router, session, stage, types, window }) {
+function initLowdefyContext({ auth, Components, config, router, stage, types, window }) {
   if (stage === 'dev') {
     window.lowdefy = lowdefy;
   }
@@ -54,7 +54,7 @@ function initLowdefyContext({ auth, Components, config, router, session, stage,
   lowdefy.menus = config.rootConfig.menus;
   lowdefy.pageId = config.pageConfig.pageId;
   lowdefy.urlQuery = urlQuery.parse(window.location.search.slice(1));
-  lowdefy.user = session?.user ?? null;
+  lowdefy.user = auth?.session?.user ?? null;
 
   lowdefy._internal.window = window;
   lowdefy._internal.document = window.document;
@@ -69,7 +69,7 @@ function initLowdefyContext({ auth, Components, config, router, session, stage,
   lowdefy._internal.operators = types.operators;
 
   // TODO: discuss not using object arguments
-  lowdefy._internal.auth = createAuthMethods(lowdefy, auth);
+  lowdefy._internal.auth = createAuthMethods({ lowdefy, auth });
 
   return lowdefy;
 }

diff --git a/packages/server-dev/lib/App.js b/packages/server-dev/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,

diff --git a/packages/server-dev/lib/Page.js b/packages/server-dev/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();
+const Page = ({ auth, Components, config, pageId, resetContext, router, types }) => {
   const { data: pageConfig } = usePageConfig(pageId, router.basePath);
 
-  if (status === 'loading') {
-    return '';
-  }
   if (!pageConfig) {
     router.replace(`/404`);
     return '';
@@ -38,15 +32,14 @@ const Page = ({ Components, config, pageId, resetContext, router, types }) => {
   }
   return (
     <Client
-      auth={{ signIn, signOut }}
+      auth={auth}
       Components={Components}
       config={{
         ...config,
         pageConfig,
       }}
       resetContext={resetContext}
       router={router}
-      session={session}
       stage="dev"
       types={types}
       window={window}