@maka/maka-cli 4.10.2 → 4.11.1

package/bundle/obf/src/templates/meteor/app/client/main.js

@@ -10,4 +10,6 @@ document.ontouchmove = event => {
   event.preventDefault();
 };
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/client';

package/bundle/obf/src/templates/meteor/app/client/main.js.jsx

@@ -10,4 +10,6 @@ document.ontouchmove = event => {
   event.preventDefault();
 };
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/client/index.jsx';

package/bundle/obf/src/templates/meteor/app/client/main.js.ts

@@ -10,4 +10,6 @@ document.ontouchmove = event => {
   event.preventDefault();
 };
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/client';

package/bundle/obf/src/templates/meteor/app/client/main.js.tsx

@@ -10,4 +10,6 @@ document.ontouchmove = event => {
   event.preventDefault();
 };
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/client/index';

package/bundle/obf/src/templates/meteor/app/imports/startup/client/index.js.jsx

@@ -39,13 +39,12 @@ const client = new ApolloClient({
 });
 <% } %><% if (config.engines.theme === 'material') { if (config.engines.ssr === 'true') { %>
 import { ThemeProvider } from '@mui/material/styles';
-import CssBaseline from '@mui/material/CssBaseline';
 import { theme } from '../lib/index';<% } else { %>
 // Material UI Theme config using default mui.
 import { ThemeProvider, createTheme, responsiveFontSizes } from '@mui/material/styles';
 import CssBaseline from '@mui/material/CssBaseline';
 // https://mui.com/material-ui/customization/default-theme/
-let theme = createTheme({
+const newTheme = createTheme({
   typography: {
     useNextVariants: true,
   },
@@ -59,7 +58,7 @@ let theme = createTheme({
     },
   },
 });
-theme = responsiveFontSizes(theme);<% }} %>
+const theme = responsiveFontSizes(newTheme);<% }} %>
 <% if (config.engines.ssr === 'true') { %>
 // Server Side Rendering sink and router classifier.
 import { BrowserRouter } from 'react-router-dom'
@@ -67,13 +66,13 @@ import { onPageLoad } from "meteor/server-render";
 <% } %>
 <% if (config.engines.ssr === 'true') { %>import Routes from '../lib/routes';<% } else { %>import Routes from './routes';<% } %>
 
-const App = ({ user }) => (<% if (config.engines.ssr === 'true') { %>
+const App = () => (<% if (config.engines.ssr === 'true') { %>
   <BrowserRouter><% } %><% if (config.engines.graphql === 'apollo') { %>
   <ApolloProvider client={client}>
   <ApolloHooksProvider client={client}><% } %><% if (config.engines.theme === 'material') { %>
   <ThemeProvider theme={theme}>
   <CssBaseline /><% } %>
-  <Routes user={user} history={browserHistory}/><% if (config.engines.theme === 'material') { %>
+  <Routes history={browserHistory}/><% if (config.engines.theme === 'material') { %>
   </ThemeProvider><% } %><% if (config.engines.graphql === 'apollo') { %>
   </ApolloHooksProvider>
   </ApolloProvider><% } %><% if (config.engines.ssr === 'true') { %>
@@ -81,7 +80,7 @@ const App = ({ user }) => (<% if (config.engines.ssr === 'true') { %>
 );
 
 const startApp = () => {<% if (config.engines.ssr === 'true') { %>
-  onPageLoad(sink => {
+  onPageLoad(() => {
     ReactDOM.hydrateRoot(document.getElementById('app'), <App />);
   });<% } else { %>
   const root = ReactDOM.createRoot(document.getElementById('app'));

package/bundle/obf/src/templates/meteor/app/imports/startup/client/index.js.tsx

@@ -39,14 +39,13 @@ const client = new ApolloClient({
 });
 <% } %><% if (config.engines.theme === 'material') { if (config.engines.ssr === 'true') { %>
 import { ThemeProvider } from '@mui/material/styles';
-import CssBaseline from '@mui/material/CssBaseline';
 import { theme } from '../lib/index';<% } else { %>
 // Material UI Theme config using default mui.
 // https://mui.com/material-ui/customization/default-theme/
 import { ThemeProvider, createTheme, responsiveFontSizes } from '@mui/material/styles';
 import CssBaseline from '@mui/material/CssBaseline';
 // https://mui.com/material-ui/customization/default-theme/
-let theme = createTheme({
+const newTheme = createTheme({
   typography: {
     useNextVariants: true,
   },
@@ -60,7 +59,7 @@ let theme = createTheme({
     },
   },
 });
-theme = responsiveFontSizes(theme);<% }} %>
+const theme = responsiveFontSizes(newTheme);<% }} %>
 <% if (config.engines.ssr === 'true') { %>
 // Server Side Rendering sink and router classifier.
 import { BrowserRouter } from 'react-router-dom'
@@ -68,13 +67,13 @@ import { onPageLoad } from "meteor/server-render";
 <% } %>
 <% if (config.engines.ssr === 'true') { %>import Routes from '../lib/routes';<% } else { %>import Routes from './routes';<% } %>
 
-const App = ({ user }) => (<% if (config.engines.ssr === 'true') { %>
+const App = () => (<% if (config.engines.ssr === 'true') { %>
   <BrowserRouter><% } %><% if (config.engines.graphql === 'apollo') { %>
   <ApolloProvider client={client}>
   <ApolloHooksProvider client={client}><% } %><% if (config.engines.theme === 'material') { %>
   <ThemeProvider theme={theme}>
   <CssBaseline /><% } %>
-  <Routes user={user} history={browserHistory}/><% if (config.engines.theme === 'material') { %>
+  <Routes history={browserHistory}/><% if (config.engines.theme === 'material') { %>
   </ThemeProvider><% } %><% if (config.engines.graphql === 'apollo') { %>
   </ApolloHooksProvider>
   </ApolloProvider><% } %><% if (config.engines.ssr === 'true') { %>
@@ -82,7 +81,7 @@ const App = ({ user }) => (<% if (config.engines.ssr === 'true') { %>
 );
 
 const startApp = () => {<% if (config.engines.ssr === 'true') { %>
-  onPageLoad(sink => {
+  onPageLoad(() => {
     ReactDOM.hydrateRoot(document.getElementById('app'), <App />);
   });<% } else { %>
   const root = ReactDOM.createRoot(document.getElementById('app'));

package/bundle/obf/src/templates/meteor/app/imports/startup/client/routes.js.jsx

@@ -41,8 +41,9 @@ const PublicRoutes = ({ history }) => (
     {publicRoutes}
   </Router>
 );
-const Routes = ({ user = {}, history }) => (
-  (user._id) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
-);
+const Routes = ({ history }) => {
+  let currentUser = null;
+  return (currentUser) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
+}
 
 export default Routes;

package/bundle/obf/src/templates/meteor/app/imports/startup/client/routes.js.tsx

@@ -41,8 +41,9 @@ const PublicRoutes = ({ history }) => (
     {publicRoutes}
   </Router>
 );
-const Routes = ({ user = {}, history }) => (
-  (user._id) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
-);
+const Routes = ({ history }) => {
+  let currentUser = null;
+  return (currentUser) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
+}
 
 export default Routes;

package/bundle/obf/src/templates/meteor/app/imports/startup/lib/index.js.jsx

@@ -3,7 +3,7 @@
 import { createTheme, responsiveFontSizes } from '@mui/material/styles';
 import CssBaseline from '@mui/material/CssBaseline';
 // https://mui.com/material-ui/customization/default-theme/
-let theme = createTheme({
+const newTheme = createTheme({
   typography: {
     useNextVariants: true,
   },
@@ -17,5 +17,5 @@ let theme = createTheme({
     },
   },
 });
-theme = responsiveFontSizes(theme);
+const theme = responsiveFontSizes(newTheme);
 export { theme };<% } %>

package/bundle/obf/src/templates/meteor/app/imports/startup/lib/index.js.tsx

@@ -3,7 +3,7 @@
 import { createTheme, responsiveFontSizes } from '@mui/material/styles';
 import CssBaseline from '@mui/material/CssBaseline';
 // https://mui.com/material-ui/customization/default-theme/
-let theme = createTheme({
+const newTheme = createTheme({
   typography: {
     useNextVariants: true,
   },
@@ -17,5 +17,5 @@ let theme = createTheme({
     },
   },
 });
-theme = responsiveFontSizes(theme);
+const theme = responsiveFontSizes(newTheme);
 export { theme };<% } %>

package/bundle/obf/src/templates/meteor/app/imports/startup/lib/routes.js.jsx

@@ -41,8 +41,9 @@ const PublicRoutes = ({ history }) => (
     {publicRoutes}
   </Router>
 );
-const Routes = ({ user = {}, history }) => (
-  (user._id) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
-);
+const Routes = ({ history }) => {
+  let currentUser = null;
+  return (currentUser) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
+}
 
 export default Routes;

package/bundle/obf/src/templates/meteor/app/imports/startup/lib/routes.js.tsx

@@ -41,8 +41,9 @@ const PublicRoutes = ({ history }) => (
     {publicRoutes}
   </Router>
 );
-const Routes = ({ user = {}, history }) => (
-  (user._id) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
-);
+const Routes = ({ history }) => {
+  let currentUser = null;
+  return (currentUser) ? <PrivateRoutes history={history}/> : <PublicRoutes history={history}/>
+}
 
 export default Routes;

package/bundle/obf/src/templates/meteor/app/imports/startup/server/index.js.jsx

@@ -1,4 +1,3 @@
-import bodyParser from 'body-parser';
 import { Meteor } from 'meteor/meteor';
 import { WebAppInternals } from "meteor/webapp";
 Meteor.startup(() => {
@@ -6,6 +5,7 @@ Meteor.startup(() => {
 });
 <% if (config.engines.graphql === 'apollo') { %>
 import { ApolloServer } from '@apollo/server';
+import bodyParser from 'body-parser';
 import { WebApp } from 'meteor/webapp';
 import { mergeTypeDefs, mergeResolvers } from '@graphql-tools/merge';
 import {

package/bundle/obf/src/templates/meteor/app/imports/startup/server/index.js.tsx

@@ -1,10 +1,10 @@
-import bodyParser from 'body-parser';
 import { Meteor } from 'meteor/meteor';
 import { WebAppInternals } from "meteor/webapp";
 Meteor.startup(() => {
   WebAppInternals.setInlineScriptsAllowed(false);
 });
 <% if (config.engines.graphql === 'apollo') { %>
+import bodyParser from 'body-parser';
 import { ApolloServer } from '@apollo/server';
 import { WebApp } from 'meteor/webapp';
 import { mergeTypeDefs, mergeResolvers } from '@graphql-tools/merge';

package/bundle/obf/src/templates/meteor/app/lib/main.js

@@ -1 +1,3 @@
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/lib';

package/bundle/obf/src/templates/meteor/app/lib/main.js.jsx

@@ -1 +1,3 @@
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/lib/index.jsx';

package/bundle/obf/src/templates/meteor/app/lib/main.js.ts

@@ -1 +1,3 @@
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/lib';

package/bundle/obf/src/templates/meteor/app/lib/main.js.tsx

@@ -1 +1,3 @@
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/lib/index';

package/bundle/obf/src/templates/meteor/app/server/main.js

@@ -8,4 +8,6 @@ if (enfoceCSP && !Meteor.isDevelopment) {
 }
 WebApp.addHtmlAttributeHook(() => ({ lang: Meteor.settings.language }));
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/server/index';

package/bundle/obf/src/templates/meteor/app/server/main.js.jsx

@@ -8,4 +8,6 @@ if (enfoceCSP && !Meteor.isDevelopment) {
 }
 WebApp.addHtmlAttributeHook(() => ({ lang: Meteor.settings.language }));
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/server/index';

package/bundle/obf/src/templates/meteor/app/server/main.js.ts

@@ -8,4 +8,6 @@ if (enfoceCSP && !Meteor.isDevelopment) {
 }
 WebApp.addHtmlAttributeHook(() => ({ lang: Meteor.settings.language }));
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/server/index';

package/bundle/obf/src/templates/meteor/app/server/main.js.tsx

@@ -8,4 +8,6 @@ if (enfoceCSP && !Meteor.isDevelopment) {
 }
 WebApp.addHtmlAttributeHook(() => ({ lang: Meteor.settings.language }));
 
+// See the Meteor docs for more information on directory structure
+// https://guide.meteor.com/structure#example-app-structure
 import '/imports/startup/server/index';

package/bundle/obf/src/templates/meteor/config/settings.json

@@ -1,6 +1,6 @@
 {
   "public": {
-    "logoutOnClose": true,
+    "logoutOnClose": false,
     "enableServiceWorker": false
   },
   "//server": "//Will not run on client",

package/bundle/obf/src/templates/meteor/publish/publish.js

@@ -1,3 +1,3 @@
-Meteor.publish('<%= name %>', () => {
-  return <%= collection %>.find();
+Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, () => {
+  // return <%= collection %>.find();
 });

package/bundle/obf/src/templates/meteor/publish/publish.js.ts

@@ -0,0 +1,3 @@
+Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, () => {
+  // return <%= collection %>.find();
+});

package/bundle/obf/src/templates/react/kit/auth/provider/authentication-provider.js.jsx

@@ -0,0 +1,281 @@
+import { Meteor } from 'meteor/meteor';
+import React, { createContext, useState, useEffect, useMemo } from 'react';
+import { Alert } from '@mui/material';
+
+// Authorization Context
+export const AuthContext = createContext({});
+
+/**
+ * Maka-CLI will replace the contents of these functions with
+ * a template that you can customize to fit your application's needs.
+ */
+const authenticateUser = async (username, password) => {
+  // Replace these with your actual authentication logic
+  // and define what constitutes as a valid user and permissions.
+  // These are just placeholders to demonstrate the concept.
+
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own authentication logic');
+  }
+  // Simulated user authentication
+  // Replace with API call or other logic
+  if (username === 'test' && password === 'password') {
+    localStorage.setItem('token', 'valid-token');
+    return { name: 'Test User', id: '12345' };
+  }
+  throw new Error('Invalid credentials');
+};
+
+const authenticateToken = async () => {
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own authentication logic');
+  }
+
+  // A token should either already exist as a result of the login process
+  // or another sso style login
+  const token = localStorage.getItem('token');
+  // Simulated token validation
+  // Replace with token validation logic
+  //
+  // Note: This is a very basic example of token validation.
+  // You should add additional logic to validate the token
+  // as well as handle token expiration, renewal, etc.
+  if (token === 'valid-token') {
+    return { name: 'Token User', id: '67890' };
+  }
+  throw new Error('Invalid token');
+};
+
+const getUserAuthorizations = async (user) => {
+  // Placeholder function to simulate fetching user permissions
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own permission logic');
+  }
+  // Simulate an API call to fetch permissions, or other logic
+  // such as parsing a JWT token to retrieve permissions
+  // Replace with your actual logic
+  if (user.id === '12345') {
+    return ['read', 'write', 'edit'];
+  }
+  return [];
+};
+
+const deauthenticateUser = async () => {
+  // Placeholder function to simulate deauthorizing a user
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own deauthorization logic');
+  }
+
+  // Simulate an API call to deauthorize a user
+  // Replace with your actual logic
+  // Note: This is a very basic example of deauthorization.
+  // You should add additional logic to deauthorize the user
+  // and handle any errors that may occur.
+  return true;
+};
+
+const sendForgotPasswordEmail = async (email) => {
+  // Placeholder function to simulate sending a password reset email
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own send forgot email logic');
+  }
+
+  // Simulate an API call to send a password reset email
+  // Replace with your actual logic
+  // Note: This is a very basic example of sending a password reset email.
+  // You should add additional logic to send the email
+  // and handle any errors that may occur.
+  console.log(`Sending password reset email to ${email}`);
+  return true;
+};
+
+const registerNewUser = async (email, password) => {
+  // Placeholder function to simulate registering a new user
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own registration logic');
+  }
+
+  console.log(`Registering new user with email ${email}`);
+  console.log(`Registering new user with password ${password.length} characters`);
+  return true;
+};
+
+const resetPasswordWithToken = async (token, password) => {
+  // Placeholder function to simulate resetting a password with a token
+  // TODO: Remove this once you've implemented your own authentication logic
+  if (Meteor.isProduction) {
+    throw new Error('You must implement your own password reset logic');
+  }
+
+  console.log(`Resetting password with token ${token}`);
+  console.log(`Resetting password with password ${password.length} characters`);
+  return true;
+};
+
+
+// Authorization Provider
+export const AuthProvider = ({ children, timeoutDuration = 3600000 }) => {
+  const [currentUser, setCurrentUser] = useState(null);
+  const [userAuthorizations, setUserAuthorizations] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [alert, setAlert] = useState({ show: false, message: '', severity: '' });
+
+  const setAlertMessage = (message, severity) => {
+    setAlert({ show: true, message, severity });
+    setTimeout(() => setAlert({ show: false, message: '', severity: '' }), 5000); // Auto-hide after 5 seconds
+  };
+
+  const logout = async () => {
+    try {
+      if (currentUser) {
+        await deauthenticateUser();
+        setCurrentUser(null);
+        setLoading(false);
+        setAlertMessage('Logout successful!', 'success');
+      }
+    } catch (error) {
+      setAlertMessage('Logout failed: ' + error.message, 'error');
+    }
+  };
+
+  const loginUserWithUsernameAndPassword = async (username, password) => {
+    try {
+      const user = await authenticateUser(username, password);
+      setCurrentUser(user);
+      setLoading(false);
+      setAlertMessage('Login successful!', 'success');
+      return user;
+    } catch (error) {
+      setLoading(false);
+      setCurrentUser(null);
+      setAlertMessage('Login failed: ' + error.message, 'error');
+      return null;
+    }
+  };
+
+  const login = async (credentials) => {
+    if (credentials.username && credentials.password) {
+      return loginUserWithUsernameAndPassword(credentials.username, credentials.password);
+    } else {
+      setLoading(false);
+      throw new Error('Invalid login credentials');
+    }
+  };
+
+  const loginUserWithToken = async () => {
+    try {
+      const user = await authenticateToken();
+      setCurrentUser(user);
+      setLoading(false);
+      return user;
+    } catch (error) {
+      setLoading(false);
+      setCurrentUser(null);
+      setAlertMessage('Login failed: ' + error.message, 'error');
+      return null;
+    }
+  };
+
+  const fetchUserAuthorizations = async (user) => {
+    const permissions = await getUserAuthorizations(user);
+    setUserAuthorizations(permissions);
+  };
+
+  const forgotPassword = async (email) => {
+    try {
+      await sendForgotPasswordEmail(email);
+      setAlertMessage('Please check your email.', 'success');
+      return true;
+    } catch (error) {
+      setAlertMessage('Error sending email: ' + error.message, 'error');
+      return false;
+    }
+  };
+
+  const register = async (email, password) => {
+    try {
+      const user = await registerNewUser(email, password);
+      setCurrentUser(user);
+      fetchUserAuthorizations(user);
+      setLoading(false);
+      setAlertMessage('Registration sucess, welcome!', 'success');
+      return user;
+    } catch (error) {
+      setAlertMessage('Register failed: ' + error.message, 'error');
+      return null;
+    }
+  };
+
+  const resetPassword = async (token, password) => {
+    try {
+      const user = await resetPasswordWithToken(token, password);
+      setCurrentUser(user);
+      fetchUserAuthorizations(user);
+      setLoading(false);
+      setAlertMessage('Password reset!', 'success');
+      return true;
+    } catch (error) {
+      setAlertMessage('Password reset failed: ' + error.message, 'error');
+      return false;
+    }
+  };
+
+  useEffect(() => {
+    let logoutTimer;
+
+    const setLogoutTimer = () => {
+      if (logoutTimer) {
+        clearTimeout(logoutTimer);
+      }
+      logoutTimer = setTimeout(logout, timeoutDuration);
+    };
+
+    if (currentUser) {
+      setLogoutTimer();
+      fetchUserAuthorizations(currentUser);
+    } else {
+      setLoading(true);
+      const renewedUser = loginUserWithToken();
+      if (renewedUser) {
+        setCurrentUser(renewedUser);
+        setLogoutTimer();
+        fetchUserAuthorizations(renewedUser);
+      } else {
+        setUserAuthorizations([]);
+      }
+    }
+
+    return () => {
+      clearTimeout(logoutTimer);
+    };
+  }, [currentUser, timeoutDuration]);
+
+  const contextValue = useMemo(() => ({
+    currentUser,
+    userAuthorizations,
+    login,
+    logout,
+    loading,
+    forgotPassword,
+    resetPassword,
+    register,
+  }), [currentUser, userAuthorizations, login, logout, loading, forgotPassword, resetPassword, register]);
+
+  return (
+    <AuthContext.Provider value={contextValue}>
+      {alert.show && (
+        <Alert severity={alert.severity} style={{ position: 'fixed', bottom: 20, right: 20, zIndex: 100000 }}>
+          {alert.message}
+        </Alert>
+      )}
+      {children}
+    </AuthContext.Provider>
+  );
+};
+