@maka/maka-cli 5.3.14 → 5.3.16

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.14",
+  "version": "5.3.16",
   "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/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/imports/startup/lib/routes.js.tsx

@@ -15,14 +15,14 @@ const PrivateRoute = () => {
 };
 
 const AppRoutes = () => (
-  <>
+  <Routes>
     <Route path="/" element={<Component.MainLayout />}>
       <Route index element={<Component.Home />} />
       <Route path="*" element={<Component.NotFound />} />
       <Route element={<PrivateRoute />}>
       </Route>
     </Route>
-  </>
+  </Routes>
 );
 
 export default AppRoutes;

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

@@ -10,7 +10,6 @@ import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { onPageLoad } from 'meteor/server-render';
 import { StaticRouter } from 'react-router-dom/server';
-import { createMemoryHistory } from 'history';
 <% if (config.engines.graphql === 'apollo') { %>
 import { createMeteorNetworkInterface, meteorClientConfig } from 'meteor/apollo';
 import { ApolloClient, ApolloProvider, renderToStringWithData } from '@apollo/client';
@@ -37,24 +36,22 @@ function createEmotionCache() {
 }
 
 onPageLoad((sink) => {
-    const history = createMemoryHistory(sink.request.url.pathname);
+    const request = sink.request;
     // Create a sheets instance.
     const cache = createEmotionCache();
     const { extractCriticalToChunks, constructStyleTagsFromChunks } =
       createEmotionServer(cache);
 
     const App = (props) => (
-        <StaticRouter
-            location={props.location}
-            context={{}}>
-            <AppRoutes history={history}/>
+        <StaticRouter location={props.location}>
+            <AppRoutes/>
         </StaticRouter>
     );<% if (config.engines.theme === 'material') { if (config.engines.graphql === 'apollo') { %>
     renderToStringWithData(
       <ApolloProvider client={client}>
         <ThemeProvider theme={theme}>
           <CssBaseline />
-          <App location={sink.request.url} />
+          <App location={request.url} />
         </ThemeProvider>
       </ApolloProvider>
     ).then((content) => {
@@ -67,7 +64,7 @@ onPageLoad((sink) => {
     const html = renderToStaticMarkup(
       <ThemeProvider theme={theme}>
         <CssBaseline />
-        <App location={sink.request.url} />
+        <App location={request.url} />
       </ThemeProvider>
     );
     const emotionChunks = extractCriticalToChunks(html);
@@ -78,7 +75,7 @@ onPageLoad((sink) => {
     <% } } else { if (config.engines.graphql === 'apollo') { %>
     renderToStringWithData(
       <ApolloProvider client={client}>
-        <App location={sink.request.url} />
+        <App location={request.url} />
       </ApolloProvider>
     ).then((content) => {
       const emotionChunks = extractCriticalToChunks(html);
@@ -88,7 +85,7 @@ onPageLoad((sink) => {
       sink.renderIntoElementById('app', content);
     });<% } else { %>
     const html = renderToStaticMarkup(
-      <App location={sink.request.url} />
+      <App location={request.url} />
     );
     const emotionChunks = extractCriticalToChunks(html);
     const emotionCss = constructStyleTagsFromChunks(emotionChunks);

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

@@ -10,7 +10,6 @@ import * as React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { onPageLoad } from 'meteor/server-render';
 import { StaticRouter } from 'react-router-dom/server';
-import { createMemoryHistory } from 'history';
 <% if (config.engines.graphql === 'apollo') { %>
 import { createMeteorNetworkInterface, meteorClientConfig } from 'meteor/apollo';
 import { ApolloClient, ApolloProvider, renderToStringWithData } from '@apollo/client';
@@ -37,24 +36,25 @@ function createEmotionCache() {
 }
 
 onPageLoad((sink) => {
-    const history = createMemoryHistory(sink.request.url.pathname);
+    // sink is typed ClientSink | ServerSink by @types/meteor; onPageLoad's
+    // callback only ever runs on the server, where it's always a ServerSink,
+    // but that's not something the union type alone can express.
+    const request = (sink as any).request;
     // Create a sheets instance.
     const cache = createEmotionCache();
     const { extractCriticalToChunks, constructStyleTagsFromChunks } =
       createEmotionServer(cache);
 
-    const App = (props) => (
-        <StaticRouter
-            location={props.location}
-            context={{}}>
-            <AppRoutes history={history}/>
+    const App = (props: { location: string }) => (
+        <StaticRouter location={props.location}>
+            <AppRoutes/>
         </StaticRouter>
     );<% if (config.engines.theme === 'material') { if (config.engines.graphql === 'apollo') { %>
     renderToStringWithData(
       <ApolloProvider client={client}>
         <ThemeProvider theme={theme}>
           <CssBaseline />
-          <App location={sink.request.url} />
+          <App location={request.url} />
         </ThemeProvider>
       </ApolloProvider>
     ).then((content) => {
@@ -67,7 +67,7 @@ onPageLoad((sink) => {
     const html = renderToStaticMarkup(
       <ThemeProvider theme={theme}>
         <CssBaseline />
-        <App location={sink.request.url} />
+        <App location={request.url} />
       </ThemeProvider>
     );
     const emotionChunks = extractCriticalToChunks(html);
@@ -78,7 +78,7 @@ onPageLoad((sink) => {
     <% } } else { if (config.engines.graphql === 'apollo') { %>
     renderToStringWithData(
       <ApolloProvider client={client}>
-        <App location={sink.request.url} />
+        <App location={request.url} />
       </ApolloProvider>
     ).then((content) => {
       const emotionChunks = extractCriticalToChunks(html);
@@ -88,7 +88,7 @@ onPageLoad((sink) => {
       sink.renderIntoElementById('app', content);
     });<% } else { %>
     const html = renderToStaticMarkup(
-      <App location={sink.request.url} />
+      <App location={request.url} />
     );
     const emotionChunks = extractCriticalToChunks(html);
     const emotionCss = constructStyleTagsFromChunks(emotionChunks);

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.14",
+  "version": "5.3.16",
   "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.",