@maka/maka-cli 5.123.0 → 5.123.1

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

@@ -1,199 +1,199 @@
-import { Meteor } from 'meteor/meteor';
-import { Accounts } from 'meteor/accounts-base';
-import jwt from 'jsonwebtoken';
-import jwksClient from 'jwks-rsa';
-
-/**
- * Auth0 JWT Token Validator
- *
- * This module handles server-side validation of Auth0 JWT tokens
- * and creates/updates Meteor user accounts based on Auth0 user data.
- */
-
-interface Auth0TokenPayload {
-  sub: string; // Auth0 user ID
-  email?: string;
-  email_verified?: boolean;
-  name?: string;
-  nickname?: string;
-  picture?: string;
-  aud: string | string[];
-  iss: string;
-  exp: number;
-  iat: number;
-}
-
-/**
- * Normalize Auth0 domain by removing protocol and trailing slashes
- */
-const normalizeDomain = (domain: string): string => {
-  return domain
-    .replace(/^https?:\/\//, '') // Remove http:// or https://
-    .replace(/\/$/, ''); // Remove trailing slash
-};
-
-/**
- * Create JWKS client for verifying Auth0 tokens
- */
-const getJwksClient = () => {
-  const auth0Domain = Meteor.settings?.auth0?.domain;
-
-  if (!auth0Domain) {
-    throw new Meteor.Error('auth0-config-missing', 'Auth0 domain not configured');
-  }
-
-  const normalizedDomain = normalizeDomain(auth0Domain);
-
-  return jwksClient({
-    jwksUri: `https://${normalizedDomain}/.well-known/jwks.json`,
-    cache: true,
-    cacheMaxAge: 86400000, // 24 hours
-  });
-};
-
-/**
- * Get signing key for JWT verification
- */
-const getKey = (header: any, callback: any) => {
-  const client = getJwksClient();
-
-  client.getSigningKey(header.kid, (err, key) => {
-    if (err) {
-      callback(err);
-      return;
-    }
-    const signingKey = key?.getPublicKey();
-    callback(null, signingKey);
-  });
-};
-
-/**
- * Verify Auth0 JWT token
- */
-export const verifyAuth0Token = (token: string): Promise<Auth0TokenPayload> => {
-  return new Promise((resolve, reject) => {
-    const auth0Config = Meteor.settings?.auth0;
-
-    if (!auth0Config?.domain || !auth0Config?.clientId) {
-      reject(new Meteor.Error('auth0-config-missing', 'Auth0 configuration missing'));
-      return;
-    }
-
-    const normalizedDomain = normalizeDomain(auth0Config.domain);
-
-    jwt.verify(
-      token,
-      getKey,
-      {
-        audience: auth0Config.clientId,
-        issuer: `https://${normalizedDomain}/`,
-        algorithms: ['RS256'],
-      },
-      (err, decoded) => {
-        if (err) {
-          reject(new Meteor.Error('auth0-invalid-token', 'Invalid Auth0 token', err));
-          return;
-        }
-        resolve(decoded as Auth0TokenPayload);
-      }
-    );
-  });
-};
-
-/**
- * Find or create a Meteor user from Auth0 data
- */
-export const findOrCreateUserFromAuth0 = async (
-  tokenPayload: Auth0TokenPayload,
-  idToken: string,
-  accessToken?: string
-): Promise<string> => {
-  const auth0Id = tokenPayload.sub;
-  const email = tokenPayload.email;
-  const now = new Date();
-
-  // Try to find existing user by Auth0 ID
-  let user = await Meteor.users.findOneAsync({
-    'services.auth0.id': auth0Id,
-  });
-
-  if (user) {
-    // Update user profile and token data
-    await Meteor.users.updateAsync(user._id, {
-      $set: {
-        // Profile data (client-accessible)
-        'profile.auth0': {
-          name: tokenPayload.name,
-          picture: tokenPayload.picture,
-          email: email,
-          email_verified: tokenPayload.email_verified,
-        },
-        // Token data (server-only)
-        'services.auth0.id': auth0Id,
-        'services.auth0.idToken': idToken,
-        'services.auth0.accessToken': accessToken,
-        'services.auth0.expiresAt': new Date(tokenPayload.exp * 1000),
-        'services.auth0.issuedAt': new Date(tokenPayload.iat * 1000),
-      },
-    });
-    return user._id;
-  }
-
-  // Try to find by email if email exists
-  if (email) {
-    user = await Meteor.users.findOneAsync({
-      'emails.address': email,
-    });
-
-    if (user) {
-      // Link Auth0 account to existing user
-      await Meteor.users.updateAsync(user._id, {
-        $set: {
-          // Profile data (client-accessible)
-          'profile.auth0': {
-            name: tokenPayload.name,
-            picture: tokenPayload.picture,
-            email: email,
-            email_verified: tokenPayload.email_verified,
-          },
-          // Token data (server-only)
-          'services.auth0': {
-            id: auth0Id,
-            idToken: idToken,
-            accessToken: accessToken,
-            expiresAt: new Date(tokenPayload.exp * 1000),
-            issuedAt: new Date(tokenPayload.iat * 1000),
-          },
-        },
-      });
-      return user._id;
-    }
-  }
-
-  // Create new user
-  const userId = Accounts.insertUserDoc({}, {
-    emails: email ? [{ address: email, verified: tokenPayload.email_verified || false }] : [],
-    profile: {
-      name: tokenPayload.name || tokenPayload.nickname || 'Auth0 User',
-      // Auth0 profile data (client-accessible)
-      auth0: {
-        name: tokenPayload.name,
-        picture: tokenPayload.picture,
-        email: email,
-        email_verified: tokenPayload.email_verified,
-      },
-    },
-    services: {
-      // Token data (server-only)
-      auth0: {
-        id: auth0Id,
-        idToken: idToken,
-        accessToken: accessToken,
-        expiresAt: new Date(tokenPayload.exp * 1000),
-        issuedAt: new Date(tokenPayload.iat * 1000),
-      },
-    },
-  });
-
-  return userId;
-};
+import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import jwt from 'jsonwebtoken';
+import jwksClient from 'jwks-rsa';
+
+/**
+ * Auth0 JWT Token Validator
+ *
+ * This module handles server-side validation of Auth0 JWT tokens
+ * and creates/updates Meteor user accounts based on Auth0 user data.
+ */
+
+interface Auth0TokenPayload {
+  sub: string; // Auth0 user ID
+  email?: string;
+  email_verified?: boolean;
+  name?: string;
+  nickname?: string;
+  picture?: string;
+  aud: string | string[];
+  iss: string;
+  exp: number;
+  iat: number;
+}
+
+/**
+ * Normalize Auth0 domain by removing protocol and trailing slashes
+ */
+const normalizeDomain = (domain: string): string => {
+  return domain
+    .replace(/^https?:\/\//, '') // Remove http:// or https://
+    .replace(/\/$/, ''); // Remove trailing slash
+};
+
+/**
+ * Create JWKS client for verifying Auth0 tokens
+ */
+const getJwksClient = () => {
+  const auth0Domain = Meteor.settings?.auth0?.domain;
+
+  if (!auth0Domain) {
+    throw new Meteor.Error('auth0-config-missing', 'Auth0 domain not configured');
+  }
+
+  const normalizedDomain = normalizeDomain(auth0Domain);
+
+  return jwksClient({
+    jwksUri: `https://${normalizedDomain}/.well-known/jwks.json`,
+    cache: true,
+    cacheMaxAge: 86400000, // 24 hours
+  });
+};
+
+/**
+ * Get signing key for JWT verification
+ */
+const getKey = (header: any, callback: any) => {
+  const client = getJwksClient();
+
+  client.getSigningKey(header.kid, (err, key) => {
+    if (err) {
+      callback(err);
+      return;
+    }
+    const signingKey = key?.getPublicKey();
+    callback(null, signingKey);
+  });
+};
+
+/**
+ * Verify Auth0 JWT token
+ */
+export const verifyAuth0Token = (token: string): Promise<Auth0TokenPayload> => {
+  return new Promise((resolve, reject) => {
+    const auth0Config = Meteor.settings?.auth0;
+
+    if (!auth0Config?.domain || !auth0Config?.clientId) {
+      reject(new Meteor.Error('auth0-config-missing', 'Auth0 configuration missing'));
+      return;
+    }
+
+    const normalizedDomain = normalizeDomain(auth0Config.domain);
+
+    jwt.verify(
+      token,
+      getKey,
+      {
+        audience: auth0Config.clientId,
+        issuer: `https://${normalizedDomain}/`,
+        algorithms: ['RS256'],
+      },
+      (err, decoded) => {
+        if (err) {
+          reject(new Meteor.Error('auth0-invalid-token', 'Invalid Auth0 token', err));
+          return;
+        }
+        resolve(decoded as Auth0TokenPayload);
+      }
+    );
+  });
+};
+
+/**
+ * Find or create a Meteor user from Auth0 data
+ */
+export const findOrCreateUserFromAuth0 = async (
+  tokenPayload: Auth0TokenPayload,
+  idToken: string,
+  accessToken?: string
+): Promise<string> => {
+  const auth0Id = tokenPayload.sub;
+  const email = tokenPayload.email;
+  const now = new Date();
+
+  // Try to find existing user by Auth0 ID
+  let user = await Meteor.users.findOneAsync({
+    'services.auth0.id': auth0Id,
+  });
+
+  if (user) {
+    // Update user profile and token data
+    await Meteor.users.updateAsync(user._id, {
+      $set: {
+        // Profile data (client-accessible)
+        'profile.auth0': {
+          name: tokenPayload.name,
+          picture: tokenPayload.picture,
+          email: email,
+          email_verified: tokenPayload.email_verified,
+        },
+        // Token data (server-only)
+        'services.auth0.id': auth0Id,
+        'services.auth0.idToken': idToken,
+        'services.auth0.accessToken': accessToken,
+        'services.auth0.expiresAt': new Date(tokenPayload.exp * 1000),
+        'services.auth0.issuedAt': new Date(tokenPayload.iat * 1000),
+      },
+    });
+    return user._id;
+  }
+
+  // Try to find by email if email exists
+  if (email) {
+    user = await Meteor.users.findOneAsync({
+      'emails.address': email,
+    });
+
+    if (user) {
+      // Link Auth0 account to existing user
+      await Meteor.users.updateAsync(user._id, {
+        $set: {
+          // Profile data (client-accessible)
+          'profile.auth0': {
+            name: tokenPayload.name,
+            picture: tokenPayload.picture,
+            email: email,
+            email_verified: tokenPayload.email_verified,
+          },
+          // Token data (server-only)
+          'services.auth0': {
+            id: auth0Id,
+            idToken: idToken,
+            accessToken: accessToken,
+            expiresAt: new Date(tokenPayload.exp * 1000),
+            issuedAt: new Date(tokenPayload.iat * 1000),
+          },
+        },
+      });
+      return user._id;
+    }
+  }
+
+  // Create new user
+  const userId = Accounts.insertUserDoc({}, {
+    emails: email ? [{ address: email, verified: tokenPayload.email_verified || false }] : [],
+    profile: {
+      name: tokenPayload.name || tokenPayload.nickname || 'Auth0 User',
+      // Auth0 profile data (client-accessible)
+      auth0: {
+        name: tokenPayload.name,
+        picture: tokenPayload.picture,
+        email: email,
+        email_verified: tokenPayload.email_verified,
+      },
+    },
+    services: {
+      // Token data (server-only)
+      auth0: {
+        id: auth0Id,
+        idToken: idToken,
+        accessToken: accessToken,
+        expiresAt: new Date(tokenPayload.exp * 1000),
+        issuedAt: new Date(tokenPayload.iat * 1000),
+      },
+    },
+  });
+
+  return userId;
+};

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

@@ -1,138 +1,138 @@
-import { Meteor } from 'meteor/meteor';
-// import { Roles } from 'meteor/alanning:roles';
-import { Accounts } from 'meteor/accounts-base';
-
-class AuthService {
-  static getUserQuerySelector(username) {
-    // if the username is an email address, use the email field
-    if (username.indexOf('@') > -1) {
-      return { email: username };
-    } else {
-      return { username };
-    }
-  }
-
-  static async authenticateUser(username, password) {
-    // Implement Meteor-specific login logic
-    try {
-      const selector = AuthService.getUserQuerySelector(username);
-      return new Promise((resolve, reject) => {
-        Meteor.loginWithPassword(selector, password, (error) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(Meteor.user());
-          }
-        });
-      });
-
-    } catch (error) {
-      console.error('Meteor authentication failed:', error);
-      throw error;
-    }
-  }
-
-  static async authenticateToken() {
-    // Implement token validation logic using Meteor
-    try {
-      return new Promise((resolve, reject) => {
-        const token = localStorage.getItem('Meteor.loginToken');
-        if (token) {
-          Meteor.loginWithToken(token, (error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve(Meteor.user());
-            }
-          })
-        } else {
-          resolve(null);
-        }
-      });
-    } catch (error) {
-      console.error('Token validation failed:', error);
-      throw error;
-    }
-  }
-
-  static async getUserAuthorizations(userId) {
-    // Implement logic to fetch user permissions from Meteor
-    try {
-      return new Promise((resolve) => {
-        const roles = [];
-        resolve(roles);
-      });
-    } catch (error) {
-      console.error('Failed to fetch user permissions:', error);
-      throw error;
-    }
-  }
-
-  static async deauthenticateUser() {
-    // Implement logout logic using Meteor
-    try {
-      return new Promise((resolve, reject) => {
-        Meteor.logout((error) => {
-          if (error) {
-            reject(error);
-          }
-          resolve(true);
-        });
-      });
-    } catch (error) {
-      console.error('Logout failed:', error);
-    }
-  }
-
-  static async registerNewUser(username, password) {
-    try {
-      const selector = AuthService.getUserQuerySelector(username);
-      selector.password = password;
-
-      // Implement user registration logic using Meteor
-      await Accounts.createUserAsync(selector);
-      return Meteor.user();
-    } catch (error) {
-      console.error('Registration failed:', error);
-      throw error;
-    }
-  }
-
-  static async sendForgotPasswordEmail(email) {
-    try {
-      // Implement password reset logic using Meteor
-      return new Promise ((resolve, reject) => {
-        Accounts.forgotPassword({ email }, (error) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve();
-          }
-        });
-      });
-    } catch (error) {
-      console.error('Password reset failed:', error);
-      throw error;
-    }
-  }
-
-  static async resetPasswordWithToken(token, password) {
-    try {
-      // Implement password reset logic using Meteor
-      return new Promise ((resolve, reject) => {
-        Accounts.resetPassword(token, password, (error) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(Meteor.user());
-          }
-        });
-      });
-    } catch (error) {
-      console.error('Password reset failed:', error);
-      throw error;
-    }
-  }
-}
-
-export default AuthService;
+import { Meteor } from 'meteor/meteor';
+// import { Roles } from 'meteor/alanning:roles';
+import { Accounts } from 'meteor/accounts-base';
+
+class AuthService {
+  static getUserQuerySelector(username) {
+    // if the username is an email address, use the email field
+    if (username.indexOf('@') > -1) {
+      return { email: username };
+    } else {
+      return { username };
+    }
+  }
+
+  static async authenticateUser(username, password) {
+    // Implement Meteor-specific login logic
+    try {
+      const selector = AuthService.getUserQuerySelector(username);
+      return new Promise((resolve, reject) => {
+        Meteor.loginWithPassword(selector, password, (error) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve(Meteor.user());
+          }
+        });
+      });
+
+    } catch (error) {
+      console.error('Meteor authentication failed:', error);
+      throw error;
+    }
+  }
+
+  static async authenticateToken() {
+    // Implement token validation logic using Meteor
+    try {
+      return new Promise((resolve, reject) => {
+        const token = localStorage.getItem('Meteor.loginToken');
+        if (token) {
+          Meteor.loginWithToken(token, (error) => {
+            if (error) {
+              reject(error);
+            } else {
+              resolve(Meteor.user());
+            }
+          })
+        } else {
+          resolve(null);
+        }
+      });
+    } catch (error) {
+      console.error('Token validation failed:', error);
+      throw error;
+    }
+  }
+
+  static async getUserAuthorizations(userId) {
+    // Implement logic to fetch user permissions from Meteor
+    try {
+      return new Promise((resolve) => {
+        const roles = [];
+        resolve(roles);
+      });
+    } catch (error) {
+      console.error('Failed to fetch user permissions:', error);
+      throw error;
+    }
+  }
+
+  static async deauthenticateUser() {
+    // Implement logout logic using Meteor
+    try {
+      return new Promise((resolve, reject) => {
+        Meteor.logout((error) => {
+          if (error) {
+            reject(error);
+          }
+          resolve(true);
+        });
+      });
+    } catch (error) {
+      console.error('Logout failed:', error);
+    }
+  }
+
+  static async registerNewUser(username, password) {
+    try {
+      const selector = AuthService.getUserQuerySelector(username);
+      selector.password = password;
+
+      // Implement user registration logic using Meteor
+      await Accounts.createUserAsync(selector);
+      return Meteor.user();
+    } catch (error) {
+      console.error('Registration failed:', error);
+      throw error;
+    }
+  }
+
+  static async sendForgotPasswordEmail(email) {
+    try {
+      // Implement password reset logic using Meteor
+      return new Promise ((resolve, reject) => {
+        Accounts.forgotPassword({ email }, (error) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve();
+          }
+        });
+      });
+    } catch (error) {
+      console.error('Password reset failed:', error);
+      throw error;
+    }
+  }
+
+  static async resetPasswordWithToken(token, password) {
+    try {
+      // Implement password reset logic using Meteor
+      return new Promise ((resolve, reject) => {
+        Accounts.resetPassword(token, password, (error) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve(Meteor.user());
+          }
+        });
+      });
+    } catch (error) {
+      console.error('Password reset failed:', error);
+      throw error;
+    }
+  }
+}
+
+export default AuthService;