@maka/maka-cli 5.3.15 → 5.3.17

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.15",
+  "version": "5.3.17",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",

package/bundle/typescript/src/commands/create.js

@@ -520,7 +520,7 @@ Command.create({
         }
         //npmInstallList.push('bcrypt');
         npmInstallList.push('@babel/core@^7');
-        npmInstallList.push('@babel/runtime@latest');
+        npmInstallList.push('@babel/runtime@^7');
         npmInstallList.push('@babel/plugin-transform-react-jsx@^7');
         // install react and react router if using...react.
         if (config.engines.client === 'react') {

package/bundle/typescript/src/commands/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/create.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/generators/kits/auth/basic-meteor.auth.gen.js

@@ -144,9 +144,14 @@ Generator.create({
                 content: `
         useTracker(() => {
           if (Meteor.isClient) {
-            if (Meteor.user() && !currentUser) {
-              setCurrentUser(Meteor.user());
-              fetchUserAuthorizations(Meteor.user());
+            const meteorUser = Meteor.user();
+            if (meteorUser && !currentUser) {
+              const user = {
+                id: meteorUser._id,
+                name: meteorUser.username || meteorUser.emails?.[0]?.address || meteorUser._id,
+              };
+              setCurrentUser(user);
+              fetchUserAuthorizations(user);
             }
           }
         });

package/bundle/typescript/src/generators/kits/auth/basic-meteor.auth.gen.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic-meteor.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/basic-meteor.auth.gen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"basic-meteor.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/basic-meteor.auth.gen.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/generators/kits/auth/provider.auth.gen.js

@@ -75,8 +75,8 @@ Generator.create({
         await this.scaffold.injectIntoCodeBlock({
             filePath: `${routesPathFromApp}.${jsEngine}`,
             content: `
-      const { currentUser, loading } = useContext(AuthContext);
-      return { currentUser, loading };
+      const auth = useContext(AuthContext);
+      return { currentUser: auth?.currentUser ?? null, loading: auth?.loading ?? false };
       `,
             begin: ['const useAuth', 'function useAuth'],
             replace: true
@@ -124,7 +124,7 @@ Generator.create({
                 filePath: `${serverIndexPathFromApp}.${jsEngine}`,
                 aboveContent: `<AuthProvider>`,
                 belowContent: `</AuthProvider>`,
-                targetString: `<AppRoutes history={history}/>`,
+                targetString: `<AppRoutes />`,
                 indentAdjustment: 2,
                 targetIndentAdjustment: 6
             });

package/bundle/typescript/src/generators/kits/auth/provider.auth.gen.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/provider.auth.gen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/provider.auth.gen.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/templates/meteor/app/maka.d.ts

@@ -26,6 +26,28 @@ declare module 'meteor/maka:react-tracker' {
   export const withTracker: any;
 }
 
+// alanning:roles is a widely-used community Atmosphere package with no
+// official types.
+declare module 'meteor/alanning:roles' {
+  export namespace Roles {
+    function getRolesForUser(userId: string, options?: any): string[];
+    function userIsInRole(userId: string, roles: string | string[], group?: string): boolean;
+    function addUsersToRoles(userIds: string | string[], roles: string | string[], group?: string): void;
+    function removeUsersFromRoles(userIds: string | string[], roles: string | string[], group?: string): void;
+    function createRole(role: string, options?: any): string;
+  }
+}
+
+// Meteor.roleAssignment is the Mongo collection alanning:roles publishes
+// role/user links through -- an @types/meteor gap, additive only.
+declare module 'meteor/meteor' {
+  import { Mongo } from 'meteor/mongo';
+
+  namespace Meteor {
+    var roleAssignment: Mongo.Collection<any>;
+  }
+}
+
 declare module 'meteor/maka:http' {
     export const HTTP: {
     /**

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

@@ -1,3 +1,7 @@
-Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, () => {
+import { Meteor } from 'meteor/meteor';
+
+// A regular function (not an arrow function) is required here so Meteor can
+// bind `this` to the subscription context (this.userId, this.stop(), etc).
+Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, function () {
   // return <%= collection %>.find();
 });

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

@@ -1,3 +1,7 @@
-Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, () => {
+import { Meteor } from 'meteor/meteor';
+
+// A regular function (not an arrow function) is required here so Meteor can
+// bind `this` to the subscription context (this.userId, this.stop(), etc).
+Meteor.publish(<% if (globalPublish) { %>null<% } else { %>'<%= name %>'<% } %>, function () {
   // return <%= collection %>.find();
 });

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

@@ -74,7 +74,6 @@ const deauthenticateUser = async () => {
   // 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) => {
@@ -102,7 +101,7 @@ const registerNewUser = async (email, password) => {
 
   console.log(`Registering new user with email ${email}`);
   console.log(`Registering new user with password ${password.length} characters`);
-  return true;
+  return { name: email, id: 'new-user' };
 };
 
 const resetPasswordWithToken = async (token, password) => {
@@ -114,7 +113,7 @@ const resetPasswordWithToken = async (token, password) => {
 
   console.log(`Resetting password with token ${token}`);
   console.log(`Resetting password with password ${password.length} characters`);
-  return true;
+  return { name: 'Token User', id: 'reset-user' };
 };
 
 
@@ -201,7 +200,9 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }) => {
     try {
       const user = await registerNewUser(email, password);
       setCurrentUser(user);
-      fetchUserAuthorizations(user);
+      if (user) {
+        fetchUserAuthorizations(user);
+      }
       setLoading(false);
       setAlertMessage('Registration sucess, welcome!', 'success');
       return user;
@@ -215,7 +216,9 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }) => {
     try {
       const user = await resetPasswordWithToken(token, password);
       setCurrentUser(user);
-      fetchUserAuthorizations(user);
+      if (user) {
+        fetchUserAuthorizations(user);
+      }
       setLoading(false);
       setAlertMessage('Password reset!', 'success');
       return true;
@@ -237,10 +240,8 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }) => {
 
     const checkUserAndSetData = async () => {
       if (currentUser) {
-        // Assuming currentUser is a promise, await it
-        const user = await currentUser;
         setLogoutTimer();
-        fetchUserAuthorizations(user);
+        fetchUserAuthorizations(currentUser);
       } else {
         setLoading(true);
         try {

package/bundle/typescript/src/templates/react/kit/auth/provider/authentication-provider.js.tsx

@@ -4,7 +4,7 @@ import React, { createContext, useState, useEffect, ReactNode, useMemo } from 'r
 // Define types for user and credentials
 // These are just placeholders to demonstrate the concept.
 // TODO: Define a user for your application
-interface User {
+export interface User {
   name: string;
   id: string;
 }
@@ -21,20 +21,28 @@ interface AuthProviderProps {
   timeoutDuration?: number;
 }
 
-// Authorization Context
-export const AuthContext = createContext<{
+interface AuthContextValue {
   currentUser: User | null;
   userAuthorizations: string[];
-  login: (credentials: Credentials) => Promise<void>;
-  logout: () => void;
+  login: (credentials: Credentials) => Promise<User | null>;
+  logout: () => Promise<void>;
   loading: boolean;
-} | null>({});
+  forgotPassword: (email: string) => Promise<boolean>;
+  resetPassword: (token: string, password: string) => Promise<boolean>;
+  register: (email: string, password: string) => Promise<User | null>;
+}
+
+// Authorization Context
+export const AuthContext = createContext<AuthContextValue | null>(null);
+
+// catch (error) is typed `unknown` under strict mode -- narrow before reading .message.
+const getErrorMessage = (error: unknown): string => (error instanceof Error ? error.message : String(error));
 
 /**
  * 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: string, password: string): Promise<User> => {
+const authenticateUser = async (username: string, password: string): Promise<User | null> => {
   // 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.
@@ -52,7 +60,7 @@ const authenticateUser = async (username: string, password: string): Promise<Use
   throw new Error('Invalid credentials');
 };
 
-const authenticateToken = async (): Promise<User> => {
+const authenticateToken = async (): Promise<User | null> => {
   // TODO: Remove this once you've implemented your own authentication logic
   if (Meteor.isProduction) {
     throw new Error('You must implement your own authentication logic');
@@ -89,7 +97,7 @@ const getUserAuthorizations = async (user: User): Promise<string[]> => {
   return [];
 };
 
-const deauthenticateUser = async (): Promise<boolean> => {
+const deauthenticateUser = async (): Promise<void> => {
   // Placeholder function to simulate deauthorizing a user
   // TODO: Remove this once you've implemented your own authentication logic
   if (Meteor.isProduction) {
@@ -101,7 +109,6 @@ const deauthenticateUser = async (): Promise<boolean> => {
   // 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: string) => {
@@ -120,7 +127,7 @@ const sendForgotPasswordEmail = async (email: string) => {
   return true;
 };
 
-const registerNewUser = async (email: string, password: string) => {
+const registerNewUser = async (email: string, password: string): Promise<User | null> => {
   // Placeholder function to simulate registering a new user
   // TODO: Remove this once you've implemented your own authentication logic
   if (Meteor.isProduction) {
@@ -129,10 +136,10 @@ const registerNewUser = async (email: string, password: string) => {
 
   console.log(`Registering new user with email ${email}`);
   console.log(`Registering new user with password ${password.length} characters`);
-  return true;
+  return { name: email, id: 'new-user' };
 };
 
-const resetPasswordWithToken = async (token: string, password: string) => {
+const resetPasswordWithToken = async (token: string, password: string): Promise<User | null> => {
   // Placeholder function to simulate resetting a password with a token
   // TODO: Remove this once you've implemented your own authentication logic
   if (Meteor.isProduction) {
@@ -141,7 +148,7 @@ const resetPasswordWithToken = async (token: string, password: string) => {
 
   console.log(`Resetting password with token ${token}`);
   console.log(`Resetting password with password ${password.length} characters`);
-  return true;
+  return { name: 'Token User', id: 'reset-user' };
 };
 
 
@@ -166,7 +173,7 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
         setAlertMessage('Logout successful!', 'success');
       }
     } catch (error) {
-      setAlertMessage('Logout failed: ' + error.message, 'error');
+      setAlertMessage('Logout failed: ' + getErrorMessage(error), 'error');
     }
   };
 
@@ -182,7 +189,7 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
     } catch (error) {
       setLoading(false);
       setCurrentUser(null);
-      setAlertMessage('Login failed: ' + error.message, 'error');
+      setAlertMessage('Login failed: ' + getErrorMessage(error), 'error');
       return null;
     }
   };
@@ -209,7 +216,7 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
     } catch (error) {
       setLoading(false);
       setCurrentUser(null);
-      setAlertMessage('Login failed: ' + error.message, 'error');
+      setAlertMessage('Login failed: ' + getErrorMessage(error), 'error');
       return null;
     }
   };
@@ -227,7 +234,7 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
       setAlertMessage('Please check your email.', 'success');
       return true;
     } catch (error) {
-      setAlertMessage('Error sending email: ' + error.message, 'error');
+      setAlertMessage('Error sending email: ' + getErrorMessage(error), 'error');
       return false;
     }
   };
@@ -236,32 +243,36 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
     try {
       const user = await registerNewUser(email, password);
       setCurrentUser(user);
-      fetchUserAuthorizations(user); // Fetch permissions when a user logs in
+      if (user) {
+        fetchUserAuthorizations(user); // Fetch permissions when a user logs in
+      }
       setAlertMessage('Registration sucess, welcome!', 'success');
       setLoading(false);
       return user;
     } catch (error) {
-      setAlertMessage('Register failed: ' + error.message, 'error');
+      setAlertMessage('Register failed: ' + getErrorMessage(error), 'error');
       return null;
     }
   };
 
-  const resetPassword = async (token, password) => {
+  const resetPassword = async (token: string, password: string) => {
     try {
       const user = await resetPasswordWithToken(token, password);
       setCurrentUser(user);
-      fetchUserAuthorizations(user); // Fetch permissions when a user logs in
+      if (user) {
+        fetchUserAuthorizations(user); // Fetch permissions when a user logs in
+      }
       setAlertMessage('Password reset!', 'success');
       setLoading(false);
       return true;
     } catch (error) {
-      setAlertMessage('Password reset failed: ' + error.message, 'error');
+      setAlertMessage('Password reset failed: ' + getErrorMessage(error), 'error');
       return false;
     }
   };
 
   useEffect(() => {
-    let logoutTimer;
+    let logoutTimer: ReturnType<typeof setTimeout>;
 
     const setLogoutTimer = () => {
       if (logoutTimer) {
@@ -272,10 +283,8 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
 
     const checkUserAndSetData = async () => {
       if (currentUser) {
-        // Assuming currentUser is a promise, await it
-        const user = await currentUser;
         setLogoutTimer();
-        fetchUserAuthorizations(user);
+        fetchUserAuthorizations(currentUser);
       } else {
         setLoading(true);
         try {

package/bundle/typescript/src/templates/react/kit/auth/service/meteor-auth-service.js.tsx

@@ -2,8 +2,22 @@ import { Meteor } from 'meteor/meteor';
 import { Roles } from 'meteor/alanning:roles';
 import { Accounts } from 'meteor/accounts-base';
 
+import { User } from './authentication-provider';
+
+// Meteor.User carries Meteor's own fields (_id, username, emails, profile...);
+// the generic AuthProvider only needs the minimal { id, name } shape.
+const toUser = (meteorUser: Meteor.User | null): User | null => {
+  if (!meteorUser) return null;
+  return {
+    id: meteorUser._id,
+    name: meteorUser.username || meteorUser.emails?.[0]?.address || meteorUser._id,
+  };
+};
+
+type UserSelector = { username: string } | { email: string };
+
 class AuthService {
-  static getUserQuerySelector(username) {
+  static getUserQuerySelector(username: string): UserSelector {
     // if the username is an email address, use the email field
     if (username.indexOf('@') > -1) {
       return { email: username };
@@ -12,16 +26,16 @@ class AuthService {
     }
   }
 
-  static async authenticateUser(username, password) {
+  static async authenticateUser(username: string, password: string): Promise<User | null> {
     // Implement Meteor-specific login logic
     try {
       const selector = AuthService.getUserQuerySelector(username);
-      return new Promise((resolve, reject) => {
+      return new Promise<User | null>((resolve, reject) => {
         Meteor.loginWithPassword(selector, password, (error) => {
           if (error) {
             reject(error);
           } else {
-            resolve(Meteor.user());
+            resolve(toUser(Meteor.user()));
           }
         });
       });
@@ -32,17 +46,17 @@ class AuthService {
     }
   }
 
-  static async authenticateToken() {
+  static async authenticateToken(): Promise<User | null> {
     // Implement token validation logic using Meteor
     try {
-      return new Promise((resolve, reject) => {
+      return new Promise<User | null>((resolve, reject) => {
         const token = localStorage.getItem('Meteor.loginToken');
         if (token) {
           Meteor.loginWithToken(token, (error) => {
             if (error) {
               reject(error);
             }
-            resolve(Meteor.user());
+            resolve(toUser(Meteor.user()));
           })
         }
         resolve(null);
@@ -53,10 +67,10 @@ class AuthService {
     }
   }
 
-  static async getUserAuthorizations(userId) {
+  static async getUserAuthorizations(userId: string): Promise<string[]> {
     // Implement logic to fetch user permissions from Meteor
     try {
-      return new Promise((resolve) => {
+      return new Promise<string[]>((resolve) => {
         const roles = Roles.getRolesForUser(userId);
         resolve(roles);
       });
@@ -66,10 +80,10 @@ class AuthService {
     }
   }
 
-  static async deauthenticateUser() {
+  static async deauthenticateUser(): Promise<boolean> {
     // Implement logout logic using Meteor
     try {
-      return new Promise((resolve, reject) => {
+      return new Promise<boolean>((resolve, reject) => {
         Meteor.logout((error) => {
           if (error) {
             reject(error);
@@ -79,27 +93,28 @@ class AuthService {
       });
     } catch (error) {
       console.error('Logout failed:', error);
+      return false;
     }
   }
 
-  static async registerNewUser(username: string, password: string) {
+  static async registerNewUser(username: string, password: string): Promise<User | null> {
     try {
       const selector = AuthService.getUserQuerySelector(username);
-      selector.password = password;
 
       // Implement user registration logic using Meteor
-      const user = await Accounts.createUserAsync(selector);
-      return user;
+      // createUserAsync returns the new user's id and logs them in
+      await Accounts.createUserAsync({ ...selector, password });
+      return toUser(Meteor.user());
     } catch (error) {
       console.error('Registration failed:', error);
       throw error;
     }
   }
 
-  static async sendForgotPasswordEmail(email: string) {
+  static async sendForgotPasswordEmail(email: string): Promise<boolean> {
     try {
       // Implement password reset logic using Meteor
-      return new Promise ((resolve, reject) => {
+      return new Promise<boolean>((resolve, reject) => {
         Accounts.forgotPassword({ email }, (error) => {
           if (error) {
             reject(error);
@@ -114,18 +129,20 @@ class AuthService {
     }
   }
 
-  static async resetPasswordWithToken(token: string, password: string) {
+  static async resetPasswordWithToken(token: string, password: string): Promise<User | null> {
     try {
       // Implement password reset logic using Meteor
-      return new Promise ((resolve, reject) => {
+      await new Promise<void>((resolve, reject) => {
         Accounts.resetPassword(token, password, (error) => {
           if (error) {
             reject(error);
           } else {
-            resolve(true);
+            resolve();
           }
         });
       });
+      // resetPassword logs the user in on success
+      return toUser(Meteor.user());
     } catch (error) {
       console.error('Password reset failed:', error);
       throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.15",
+  "version": "5.3.17",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",