m365-cli 0.1.3 → 0.1.4

package/config/default.json

@@ -7,6 +7,7 @@
     "https://graph.microsoft.com/Calendars.ReadWrite",
     "https://graph.microsoft.com/Files.ReadWrite.All",
     "https://graph.microsoft.com/Sites.ReadWrite.All",
+    "https://graph.microsoft.com/User.Read",
     "offline_access"
   ],
   "graphApiUrl": "https://graph.microsoft.com/v1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "m365-cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Microsoft 365 CLI - Manage Mail, Calendar, and OneDrive from the command line",
   "type": "module",
   "files": [
@@ -14,7 +14,8 @@
     "m365": "./bin/m365.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "vitest",
+    "test:run": "vitest run",
     "link": "npm link",
     "unlink": "npm unlink -g m365-cli"
   },
@@ -42,5 +43,8 @@
   },
   "dependencies": {
     "commander": "^12.0.0"
+  },
+  "devDependencies": {
+    "vitest": "^4.0.18"
   }
 }

package/src/commands/mail.js

@@ -5,6 +5,26 @@ import { outputMailList, outputMailDetail, outputSendResult, outputAttachmentLis
 import { handleError } from '../utils/error.js';
 import { isTrustedSender, addTrustedSender, removeTrustedSender, listTrustedSenders, getWhitelistFilePath } from '../utils/trusted-senders.js';
 
+// Cache for current user's email
+let currentUserEmailCache = null;
+let currentUserEmailWarningShown = false;
+
+async function getCurrentUserEmail() {
+  if (currentUserEmailCache) return currentUserEmailCache;
+  
+  try {
+    const user = await graphClient.getCurrentUser();
+    currentUserEmailCache = user.mail || user.userPrincipalName || null;
+    return currentUserEmailCache;
+  } catch (error) {
+    if (!currentUserEmailWarningShown) {
+      console.error('Warning: Failed to get current user email (need User.Read permission):', error.message);
+      currentUserEmailWarningShown = true;
+    }
+    return null;
+  }
+}
+
 /**
  * Mail commands
  */
@@ -18,12 +38,14 @@ export async function listMails(options) {
     
     const mails = await graphClient.mail.list({ top, folder });
     
+    const currentUserEmail = await getCurrentUserEmail();
+    
     // Mark untrusted senders
     const mailsWithTrustStatus = mails.map(mail => {
       const senderEmail = mail.from?.emailAddress?.address;
       return {
         ...mail,
-        isTrusted: senderEmail ? isTrustedSender(senderEmail) : false,
+        isTrusted: senderEmail ? isTrustedSender(senderEmail, currentUserEmail) : false,
       };
     });
     
@@ -46,9 +68,11 @@ export async function readMail(id, options) {
     
     const mail = await graphClient.mail.get(id);
     
+    const currentUserEmail = await getCurrentUserEmail();
+    
     // Check whitelist unless --force is used
     const senderEmail = mail.from?.emailAddress?.address;
-    const trusted = senderEmail ? isTrustedSender(senderEmail) : false;
+    const trusted = senderEmail ? isTrustedSender(senderEmail, currentUserEmail) : false;
     
     if (!trusted && !force) {
       // Filter content for untrusted senders
@@ -182,12 +206,22 @@ export async function searchMails(query, options) {
     
     const mails = await graphClient.mail.search(query, { top });
     
+    const currentUserEmail = await getCurrentUserEmail();
+    
+    const mailsWithTrustStatus = mails.map(mail => {
+      const senderEmail = mail.from?.emailAddress?.address;
+      return {
+        ...mail,
+        isTrusted: senderEmail ? isTrustedSender(senderEmail, currentUserEmail) : false,
+      };
+    });
+    
     if (!json) {
       console.log(`🔍 Search results for: "${query}"`);
       console.log('');
     }
     
-    outputMailList(mails, { json, top });
+    outputMailList(mailsWithTrustStatus, { json, top });
   } catch (error) {
     handleError(error, { json: options.json });
   }

package/src/graph/client.js

@@ -103,6 +103,21 @@ class GraphClient {
   async delete(endpoint, options = {}) {
     return this.request(endpoint, { ...options, method: 'DELETE' });
   }
+
+  /**
+   * Get current user profile
+   */
+  async getCurrentUser() {
+    return this.get('/me', {
+      queryParams: { '$select': 'id,displayName,mail,userPrincipalName' },
+    });
+  }
+
+  /**
+   * Mail endpoints
+   */
+  mail = {
+  }
   
   /**
    * Mail endpoints

package/src/utils/trusted-senders.js

@@ -50,18 +50,27 @@ export function loadTrustedSenders() {
 /**
  * Check if a sender is trusted
  * @param {string} senderEmail - Email address to check
+ * @param {string} [currentUserEmail] - Current user's email address (to trust own emails)
  * @returns {boolean} True if sender is trusted
  */
-export function isTrustedSender(senderEmail) {
+export function isTrustedSender(senderEmail, currentUserEmail) {
   if (!senderEmail) {
     return false;
   }
   
+  // Check if sender is the current user (own emails are trusted)
+  if (currentUserEmail) {
+    const normalizedSender = senderEmail.toLowerCase().trim();
+    const normalizedCurrentUser = currentUserEmail.toLowerCase().trim();
+    if (normalizedSender === normalizedCurrentUser) {
+      return true;
+    }
+  }
+  
   // Handle Exchange DN format (internal mail)
   // These are formatted like: /O=EXCHANGELABS/OU=.../CN=RECIPIENTS/CN=...
   if (senderEmail.startsWith('/O=EXCHANGELABS') || senderEmail.startsWith('/O=EXCHANGE')) {
     // Internal organization mail - consider trusted
-    // In a production environment, you might want to be more selective
     return true;
   }
   
@@ -71,7 +80,7 @@ export function isTrustedSender(senderEmail) {
   for (const entry of trustedSenders) {
     const normalized = entry.toLowerCase();
     
-  // Domain match (e.g., @example.com)
+    // Domain match (e.g., @example.com)
     if (normalized.startsWith('@')) {
       const domain = normalized.substring(1);
       if (normalizedEmail.endsWith(`@${domain}`)) {
@@ -117,10 +126,10 @@ export function addTrustedSender(email) {
       writeFileSync(path, readFileSync(path, 'utf-8') + line, 'utf-8');
     } else {
       // Create new file with header
-      const header = `# M365 Trusted Senders Whitelist\n
-# One email address or domain per line\n
-# Lines starting with @ match entire domains (e.g. @example.com)\n
-# Senders not in this list will have their email body filtered out\n
+      const header = `# M365 Trusted Senders Whitelist
+# One email address or domain per line
+# Lines starting with @ match entire domains (e.g. @example.com)
+# Senders not in this list will have their email body filtered out
 
 `;
       writeFileSync(path, header + email + '\n', 'utf-8');