@quadient/skillshare 1.8.0 → 1.8.1

package/README.md

@@ -41,6 +41,10 @@ skillshare teams access readOnly
 skillshare teams logout
 ```
 
+Starting with 1.8.1, Teams uses the Microsoft account object id that Skillshare records at
+web sign-in, not the Skillshare user id. If the server does not know it yet, `teams login`
+opens one more Skillshare sign-in in the browser to link the account.
+
 Use `teams login local` for localhost or `--server <https-origin>` for another host.
 `login` accepts `--server` too. Browser options: `--browser chrome|msedge|chromium`,
 `--headless`, and `--browser-profile <dedicated-profile-directory>`.

package/dist/index.js

@@ -1,4 +1,4 @@
-import { assertCredentialDestination, runTeamsCommand } from './teams.js';
+import { assertCredentialDestination, resolveTeamsObjectId, runTeamsCommand } from './teams.js';
 import { formatUnknownCommand, parseCliArgs } from './cli-args.js';
 import { findCommand, readCliVersion, renderCommandHelp, renderUsage } from './help.js';
 import { inspectInstallTarget, installFilesAtomically } from './install-files.js';
@@ -122,7 +122,15 @@ async function main() {
             assertCredentialDestination(baseUrl);
             if (!options.token && !await loadSession(baseUrl))
                 await login(baseUrl);
-            await runTeamsCommand(await createClient(baseUrl, options.token), options.positionals, options.flags, APP_DIR);
+            const teamsClient = await createClient(baseUrl, options.token);
+            const action = options.positionals[0];
+            if (!options.token && (action === 'login' || action === 'watch')
+                && !resolveTeamsObjectId(await teamsClient.get('/api/auth/me'))) {
+                // A browser sign-in lets the server record the Entra object id for this account.
+                console.log('Linking your Microsoft account to Skillshare. Sign in once more in the browser.');
+                await login(baseUrl);
+            }
+            await runTeamsCommand(teamsClient, options.positionals, options.flags, APP_DIR);
             return;
         }
         case 'git': {

package/dist/teams-auth.js

@@ -16,7 +16,7 @@ export function decodeTeamsJwt(value) {
 /** Select only credentials belonging to the Skillshare account. No full browser state leaves this machine. */
 export function extractTeamsSession(state, expectedObjectId, now = Date.now(), allowExpired = false) {
     if (!uuid.test(expectedObjectId))
-        throw new Error('Skillshare must be signed in with a Microsoft account before connecting Teams.');
+        throw new Error('The Microsoft account object id is missing. Sign in to Skillshare in the browser, then run skillshare teams login again.');
     const stores = state.origins.filter(origin => origins.has(origin.origin));
     const entries = stores.flatMap(origin => origin.localStorage.flatMap(item => {
         try {

package/dist/teams.js

@@ -7,6 +7,17 @@ import { pipeline } from 'node:stream/promises';
 import { captureTeamsLogin } from './teams-auth.js';
 import { watchTeamsConnection } from './teams-watch.js';
 const root = '/api/mcps/providers/teams';
+const guid = /^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i;
+/**
+ * Skillshare identifies users by the pairwise subject; Teams credentials carry the Entra
+ * object id, which the server records at web sign-in. Older servers only return a GUID id.
+ */
+export function resolveTeamsObjectId(account) {
+    if (account.entraObjectId && guid.test(account.entraObjectId))
+        return account.entraObjectId;
+    return guid.test(account.id) ? account.id : null;
+}
+export const UNLINKED_ACCOUNT_MESSAGE = 'Skillshare does not know your Microsoft account yet. Run "skillshare login" (or open Skillshare in the browser and sign in), then run "skillshare teams login" again.';
 async function expectOk(response) {
     if (response.ok)
         return;
@@ -23,11 +34,15 @@ export async function runTeamsCommand(client, args, flags, appDirectory) {
     const action = args[0];
     if (action === 'login' || action === 'watch') {
         const user = await client.get('/api/auth/me');
+        const resolvedObjectId = resolveTeamsObjectId(user);
+        if (!resolvedObjectId)
+            throw new Error(UNLINKED_ACCOUNT_MESSAGE);
+        const objectId = resolvedObjectId;
         const key = createHash('sha256').update(client.baseUrl + '\0' + user.id).digest('hex').slice(0, 24);
         const profileDirectory = flags['browser-profile'] ? resolve(flags['browser-profile']) : join(appDirectory, 'teams', key, 'browser-profile');
         const abort = new AbortController();
         async function connect(connectionId) {
-            const session = await captureTeamsLogin({ profileDirectory, objectId: user.id, browser: flags.browser,
+            const session = await captureTeamsLogin({ profileDirectory, objectId, browser: flags.browser,
                 headless: action === 'watch' ? flags.headless !== 'false' : flags.headless === 'true', recover: action === 'watch',
                 signal: abort.signal, timeoutMs: action === 'watch' ? 90_000 : undefined, onProgress: console.log });
             const headers = { 'Content-Type': 'application/json' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadient/skillshare",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Skillshare CLI for installing and publishing Quadient skills",
   "type": "module",
   "bin": {