@makolabs/ripple 1.7.2 → 1.7.4

package/dist/funcs/user-management.remote.js

@@ -145,7 +145,7 @@ async function verifyApiKeyToken(apiKey) {
         };
     }
 }
-async function createUserPermissions(userId, permissions, clientId = CLIENT_ID) {
+async function createUserPermissions(email, permissions, clientId = CLIENT_ID) {
     if (permissions.length === 0) {
         return null;
     }
@@ -153,7 +153,7 @@ async function createUserPermissions(userId, permissions, clientId = CLIENT_ID)
         method: 'POST',
         body: JSON.stringify({
             client_id: clientId,
-            sub: userId,
+            sub: email,
             scopes: permissions
         })
     });
@@ -242,7 +242,7 @@ export const createUser = command('unchecked', async (userData) => {
         }
         if (permissions && permissions.length > 0) {
             try {
-                const adminKeyResult = await createUserPermissions(result.id, permissions);
+                const adminKeyResult = await createUserPermissions(emailAddress, permissions);
                 const apiKey = adminKeyResult?.data?.key;
                 if (adminKeyResult && apiKey) {
                     const updatedUser = await makeClerkRequest(`/users/${result.id}`, {
@@ -333,9 +333,9 @@ export const deleteUsers = command('unchecked', async (userIds) => {
         throw new Error(`Failed to delete users: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
 });
-async function fetchUserPermissions(userId) {
+async function fetchUserPermissions(email) {
     try {
-        const userData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${userId}`);
+        const userData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${email}`);
         if (userData?.data?.data && Array.isArray(userData.data.data)) {
             userData.data.data = userData.data.data.filter((key) => key.status === 'active');
         }
@@ -355,7 +355,7 @@ async function fetchUserPermissions(userId) {
         console.error('[fetchUserPermissions] Error fetching user permissions:', error);
         try {
             const allKeysData = await makeAdminRequest('/admin/keys');
-            const userKey = allKeysData.data.data.find((key) => key.sub === userId && key.client_id === CLIENT_ID && key.status === 'active');
+            const userKey = allKeysData.data.data.find((key) => key.sub === email && key.client_id === CLIENT_ID && key.status === 'active');
             if (userKey) {
                 const permissions = Array.isArray(userKey.scopes) ? userKey.scopes : [userKey.scopes];
                 return permissions;
@@ -370,7 +370,13 @@ async function fetchUserPermissions(userId) {
 }
 export const getUserPermissions = query('unchecked', async (userId) => {
     try {
-        const permissions = await fetchUserPermissions(userId);
+        // Fetch user from Clerk to get email
+        const user = await makeClerkRequest(`/users/${userId}`);
+        const email = user.email_addresses?.[0]?.email_address;
+        if (!email) {
+            throw new Error('User has no email address');
+        }
+        const permissions = await fetchUserPermissions(email);
         // Ensure permissions array is serializable
         return JSON.parse(JSON.stringify(permissions));
     }
@@ -420,20 +426,25 @@ export const updateUserPermissions = command('unchecked', async (options) => {
         if (permissions.length === 0) {
             throw new Error('At least one permission scope is required');
         }
+        // Fetch user from Clerk to get email
+        const user = await makeClerkRequest(`/users/${userId}`);
+        const email = user.email_addresses?.[0]?.email_address;
+        if (!email) {
+            throw new Error('User has no email address');
+        }
         // Fetch user's active keys
-        const allKeysData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${userId}`);
+        const allKeysData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${email}`);
         const userKeys = (allKeysData?.data?.data || []).filter((key) => key.status === 'active');
         if (userKeys.length === 0) {
             // No active key exists, create new one
-            const newKeyResult = await createUserPermissions(userId, permissions);
+            const newKeyResult = await createUserPermissions(email, permissions);
             const newApiKey = newKeyResult?.data?.key;
             if (newApiKey) {
-                const currentUser = await makeClerkRequest(`/users/${userId}`);
                 await makeClerkRequest(`/users/${userId}`, {
                     method: 'PATCH',
                     body: JSON.stringify({
                         private_metadata: {
-                            ...(currentUser.private_metadata || {}),
+                            ...(user.private_metadata || {}),
                             mako_api_key: newApiKey
                         }
                     })
@@ -496,19 +507,24 @@ export const generateApiKey = command('unchecked', async (options) => {
         if (options.permissions.length === 0) {
             throw new Error('At least one permission scope is required');
         }
+        // Fetch user from Clerk to get email
+        const user = await makeClerkRequest(`/users/${options.userId}`);
+        const email = user.email_addresses?.[0]?.email_address;
+        if (!email) {
+            throw new Error('User has no email address');
+        }
         // Check if user has existing active key
-        const allKeysData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${options.userId}`);
+        const allKeysData = await makeAdminRequest(`/admin/keys?client_id=${CLIENT_ID}&sub=${email}`);
         const userKeys = (allKeysData?.data?.data || []).filter((key) => key.status === 'active');
         let newApiKey;
         let wasRotated = false;
         let oldApiKey;
-        let currentUser = null;
+        let currentUser = user;
         let verificationWarning;
         if (userKeys.length > 0 && options.revokeOld) {
             // Use rotate endpoint (per Mako Auth API spec)
             const keyId = userKeys[0].id;
             // Get the old API key from Clerk's private_metadata
-            currentUser = await makeClerkRequest(`/users/${options.userId}`);
             oldApiKey = currentUser?.private_metadata?.mako_api_key;
             const rotateResult = await makeAdminRequest(`/admin/keys/${keyId}/rotate`, {
                 method: 'POST',
@@ -559,7 +575,7 @@ export const generateApiKey = command('unchecked', async (options) => {
         }
         else {
             // Create new key if none exists or revokeOld is false
-            const createData = await createUserPermissions(options.userId, options.permissions);
+            const createData = await createUserPermissions(email, options.permissions);
             if (!createData) {
                 throw new Error('Failed to create admin key');
             }

package/dist/user-management/UserTable.svelte

@@ -139,7 +139,7 @@
 				{getUserDisplayName(user)}
 			</div>
 			<div class="text-default-500 text-xs">
-				{user.username || String(user.id).slice(0, 8) + '...'}
+				{user.username || user.id}
 			</div>
 		</div>
 	</div>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@makolabs/ripple",
-	"version": "1.7.2",
+	"version": "1.7.4",
 	"description": "Simple Svelte 5 powered component library ✨",
 	"license": "SEE LICENSE IN LICENSE",
 	"repository": {