pxt-core 9.0.6 → 9.0.7

package/built/pxt.js

@@ -97876,6 +97876,7 @@ var pxt;
         const AUTH_LOGIN_STATE_KEY = "login-state"; // stored in local storage.
         const AUTH_USER_STATE_KEY = "user-state"; // stored in local storage.
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
+        const INTERACTIVE_LOGIN_UNTIL = "interactive-login-until"; // hint whether to prompt user or try SSO first.
         let authDisabled = false;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             highContrast: false,
@@ -97901,19 +97902,29 @@ var pxt;
         // Last known auth token state. This is provided as a convenience for legacy methods that cannot be made async.
         // Preference hasAuthTokenAsync() over taking a dependency on this cached value.
         auth.cachedHasAuthToken = false;
-        async function getAuthTokenAsync() {
-            let token;
+        async function setLocalStorageValueAsync(key, value) {
+            if (!!value)
+                return await pxt.storage.shared.setAsync(AUTH_CONTAINER, key, value);
+            else
+                return await pxt.storage.shared.delAsync(AUTH_CONTAINER, key);
+        }
+        async function getLocalStorageValueAsync(key) {
             try {
-                token = await pxt.storage.shared.getAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY);
+                return await pxt.storage.shared.getAsync(AUTH_CONTAINER, key);
+            }
+            catch (_a) {
+                return undefined;
             }
-            catch (_a) { }
+        }
+        async function getAuthTokenAsync() {
+            const token = await getLocalStorageValueAsync(CSRF_TOKEN_KEY);
             auth.cachedHasAuthToken = !!token;
             return token;
         }
         auth.getAuthTokenAsync = getAuthTokenAsync;
         async function setAuthTokenAsync(token) {
             auth.cachedHasAuthToken = !!token;
-            return await pxt.storage.shared.setAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY, token);
+            return await setLocalStorageValueAsync(CSRF_TOKEN_KEY, token);
         }
         async function hasAuthTokenAsync() {
             return !!(await getAuthTokenAsync());
@@ -97921,7 +97932,7 @@ var pxt;
         auth.hasAuthTokenAsync = hasAuthTokenAsync;
         async function delAuthTokenAsync() {
             auth.cachedHasAuthToken = false;
-            return await pxt.storage.shared.delAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY);
+            return await setLocalStorageValueAsync(CSRF_TOKEN_KEY, undefined);
         }
         async function getUserStateAsync() {
             let userState;
@@ -97984,16 +97995,20 @@ var pxt;
                     idp,
                     persistent
                 };
+                // Should the user be prompted to interactively login, or can we try to silently login?
+                const interactiveUntil = parseInt(await getLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL));
+                const interactiveLogin = (interactiveUntil || 0) > Date.now();
                 // Redirect to the login endpoint.
                 const loginUrl = pxt.Util.stringifyQueryString('/api/auth/login', {
                     response_type: "token",
                     provider: idp,
                     persistent,
-                    redirect_uri: `${window.location.origin}${window.location.pathname}?authcallback=1&state=${loginState.key}`
+                    redirect_uri: `${window.location.origin}${window.location.pathname}?authcallback=1&state=${loginState.key}`,
+                    prompt: interactiveLogin ? "select_account" : "silent"
                 });
                 const apiResult = await this.apiAsync(loginUrl);
                 if (apiResult.success) {
-                    loginState.authCodeVerifier = apiResult.resp.authCodeVerifier;
+                    loginState.authCodeVerifier = apiResult.resp.authCodeVerifier; // will be undefined unless configured for the target
                     await pxt.storage.shared.setAsync(AUTH_CONTAINER, AUTH_LOGIN_STATE_KEY, loginState);
                     pxt.tickEvent('auth.login.start', { 'provider': idp });
                     window.location.href = apiResult.resp.loginUrl;
@@ -98012,13 +98027,15 @@ var pxt;
                 if (!hasIdentity()) {
                     return;
                 }
-                // Clear local auth state so we can no longer make authenticated requests.
-                await this.clearAuthStateAsync();
                 await AuthClient.staticLogoutAsync(continuationHash);
                 try {
-                    await this.onSignedOut();
+                    await this.onStateCleared();
                 }
                 catch (_a) { }
+                try {
+                    await this.onSignedOut();
+                }
+                catch (_b) { }
             }
             /**
              * Sign out the user and clear the auth token cookie.
@@ -98028,19 +98045,39 @@ var pxt;
                     return;
                 }
                 pxt.tickEvent('auth.logout');
-                // Tell backend to clear the http-only auth cookie. Ignore errors here, we want to clear local state even if the backend rejects this request.
+                // Indicate that for the next minute, signin should be interactive.
+                // Use case: SSO signed in with the wrong account. User wants to sign in with a different account.
+                await setLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL, (Date.now() + 60000).toString());
+                continuationHash = continuationHash ? continuationHash.startsWith('#') ? continuationHash : `#${continuationHash}` : "";
+                const clientRedirect = `${window.location.origin}${window.location.pathname}${window.location.search}${continuationHash}`;
+                // Tell backend to clear the http-only auth cookie.
+                let logoutUri = "";
                 try {
-                    await AuthClient.staticApiAsync('/api/auth/logout');
+                    const uri = pxt.Util.stringifyQueryString('/api/auth/logout', {
+                        redirect_uri: clientRedirect,
+                        authcallback: '1'
+                    });
+                    const apiResult = await AuthClient.staticApiAsync(uri);
+                    if (apiResult.success) {
+                        logoutUri = apiResult.resp.logoutUrl;
+                    }
+                }
+                catch (_a) {
+                    // Ignore errors.
                 }
-                catch (_a) { }
                 // Clear local auth state so we can no longer make authenticated requests.
                 await delAuthTokenAsync();
                 await delUserStateAsync();
-                // Redirect to home screen
                 if (pxt.BrowserUtils.hasWindow()) {
-                    const hash = continuationHash ? continuationHash.startsWith('#') ? continuationHash : `#${continuationHash}` : "";
-                    window.location.href = `${window.location.origin}${window.location.pathname}${window.location.search}${hash}`;
-                    location.reload();
+                    if (logoutUri) {
+                        // Redirect to logout endpoint
+                        window.location.href = logoutUri;
+                    }
+                    else {
+                        // Redirect to home screen
+                        window.location.href = clientRedirect;
+                        location.reload();
+                    }
                 }
             }
             async deleteProfileAsync() {
@@ -98436,6 +98473,8 @@ var pxt;
                 // without its cookie-based counterpart. When "Remember me" is false,
                 // the cookie is not persisted.
                 await setAuthTokenAsync(authToken);
+                // Clear interactive login flag. Next auth request will try silent SSO first.
+                await setLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL, undefined);
                 pxt.tickEvent('auth.login.success', { 'provider': loginState.idp });
             } while (false);
             // Clear url parameters and redirect to the callback location.
@@ -155234,6 +155273,13 @@ var pxsim;
         }
     }
     pxsim.Runtime = Runtime;
+    function setParentMuteState(state) {
+        Runtime.postMessage({
+            type: "setmutebuttonstate",
+            state
+        });
+    }
+    pxsim.setParentMuteState = setParentMuteState;
     class PerfCounter {
         constructor(name) {
             this.name = name;
@@ -155906,7 +155952,7 @@ var pxsim;
             }
         }
         handleMessage(msg, source) {
-            var _a;
+            var _a, _b, _c;
             switch (msg.type || '') {
                 case 'ready': {
                     const frameid = msg.frameid;
@@ -155969,6 +156015,9 @@ var pxsim;
                     if (this.options.onTopLevelCodeEnd)
                         this.options.onTopLevelCodeEnd();
                     break;
+                case 'setmutebuttonstate':
+                    (_c = (_b = this.options).onMuteButtonStateChange) === null || _c === void 0 ? void 0 : _c.call(_b, msg.state);
+                    break;
                 default:
                     this.postMessage(msg, source);
                     break;
@@ -156373,6 +156422,10 @@ var pxsim;
                 ctx.resume();
         }
         AudioContextManager.mute = mute;
+        function isMuted() {
+            return _mute;
+        }
+        AudioContextManager.isMuted = isMuted;
         function stopTone() {
             setCurrentToneGain(0);
             _frequency = 0;

package/built/pxteditor.d.ts

@@ -36,6 +36,11 @@ declare namespace pxt.editor {
         HeaderOnly = "errorListHeader",
         Expanded = "errorListExpanded"
     }
+    enum MuteState {
+        Muted = "muted",
+        Unmuted = "unmuted",
+        Disabled = "disabled"
+    }
     interface IAppProps {
     }
     interface IAppState {
@@ -64,7 +69,7 @@ declare namespace pxt.editor {
         showParts?: boolean;
         fullscreen?: boolean;
         showMiniSim?: boolean;
-        mute?: boolean;
+        mute?: MuteState;
         embedSimView?: boolean;
         editorPosition?: {
             lineNumber: number;
@@ -275,7 +280,7 @@ declare namespace pxt.editor {
         toggleTrace(intervalSpeed?: number): void;
         setTrace(enabled: boolean, intervalSpeed?: number): void;
         toggleMute(): void;
-        setMute(on: boolean): void;
+        setMute(state: MuteState): void;
         openInstructions(): void;
         closeFlyout(): void;
         printCode(): void;

package/built/pxteditor.js

@@ -19,6 +19,12 @@ var pxt;
             ErrorListState["HeaderOnly"] = "errorListHeader";
             ErrorListState["Expanded"] = "errorListExpanded";
         })(ErrorListState = editor.ErrorListState || (editor.ErrorListState = {}));
+        let MuteState;
+        (function (MuteState) {
+            MuteState["Muted"] = "muted";
+            MuteState["Unmuted"] = "unmuted";
+            MuteState["Disabled"] = "disabled";
+        })(MuteState = editor.MuteState || (editor.MuteState = {}));
         let FilterState;
         (function (FilterState) {
             FilterState[FilterState["Hidden"] = 0] = "Hidden";

package/built/pxtlib.js

@@ -190,6 +190,7 @@ var pxt;
         const AUTH_LOGIN_STATE_KEY = "login-state"; // stored in local storage.
         const AUTH_USER_STATE_KEY = "user-state"; // stored in local storage.
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
+        const INTERACTIVE_LOGIN_UNTIL = "interactive-login-until"; // hint whether to prompt user or try SSO first.
         let authDisabled = false;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             highContrast: false,
@@ -215,19 +216,29 @@ var pxt;
         // Last known auth token state. This is provided as a convenience for legacy methods that cannot be made async.
         // Preference hasAuthTokenAsync() over taking a dependency on this cached value.
         auth.cachedHasAuthToken = false;
-        async function getAuthTokenAsync() {
-            let token;
+        async function setLocalStorageValueAsync(key, value) {
+            if (!!value)
+                return await pxt.storage.shared.setAsync(AUTH_CONTAINER, key, value);
+            else
+                return await pxt.storage.shared.delAsync(AUTH_CONTAINER, key);
+        }
+        async function getLocalStorageValueAsync(key) {
             try {
-                token = await pxt.storage.shared.getAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY);
+                return await pxt.storage.shared.getAsync(AUTH_CONTAINER, key);
+            }
+            catch (_a) {
+                return undefined;
             }
-            catch (_a) { }
+        }
+        async function getAuthTokenAsync() {
+            const token = await getLocalStorageValueAsync(CSRF_TOKEN_KEY);
             auth.cachedHasAuthToken = !!token;
             return token;
         }
         auth.getAuthTokenAsync = getAuthTokenAsync;
         async function setAuthTokenAsync(token) {
             auth.cachedHasAuthToken = !!token;
-            return await pxt.storage.shared.setAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY, token);
+            return await setLocalStorageValueAsync(CSRF_TOKEN_KEY, token);
         }
         async function hasAuthTokenAsync() {
             return !!(await getAuthTokenAsync());
@@ -235,7 +246,7 @@ var pxt;
         auth.hasAuthTokenAsync = hasAuthTokenAsync;
         async function delAuthTokenAsync() {
             auth.cachedHasAuthToken = false;
-            return await pxt.storage.shared.delAsync(AUTH_CONTAINER, CSRF_TOKEN_KEY);
+            return await setLocalStorageValueAsync(CSRF_TOKEN_KEY, undefined);
         }
         async function getUserStateAsync() {
             let userState;
@@ -298,16 +309,20 @@ var pxt;
                     idp,
                     persistent
                 };
+                // Should the user be prompted to interactively login, or can we try to silently login?
+                const interactiveUntil = parseInt(await getLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL));
+                const interactiveLogin = (interactiveUntil || 0) > Date.now();
                 // Redirect to the login endpoint.
                 const loginUrl = pxt.Util.stringifyQueryString('/api/auth/login', {
                     response_type: "token",
                     provider: idp,
                     persistent,
-                    redirect_uri: `${window.location.origin}${window.location.pathname}?authcallback=1&state=${loginState.key}`
+                    redirect_uri: `${window.location.origin}${window.location.pathname}?authcallback=1&state=${loginState.key}`,
+                    prompt: interactiveLogin ? "select_account" : "silent"
                 });
                 const apiResult = await this.apiAsync(loginUrl);
                 if (apiResult.success) {
-                    loginState.authCodeVerifier = apiResult.resp.authCodeVerifier;
+                    loginState.authCodeVerifier = apiResult.resp.authCodeVerifier; // will be undefined unless configured for the target
                     await pxt.storage.shared.setAsync(AUTH_CONTAINER, AUTH_LOGIN_STATE_KEY, loginState);
                     pxt.tickEvent('auth.login.start', { 'provider': idp });
                     window.location.href = apiResult.resp.loginUrl;
@@ -326,13 +341,15 @@ var pxt;
                 if (!hasIdentity()) {
                     return;
                 }
-                // Clear local auth state so we can no longer make authenticated requests.
-                await this.clearAuthStateAsync();
                 await AuthClient.staticLogoutAsync(continuationHash);
                 try {
-                    await this.onSignedOut();
+                    await this.onStateCleared();
                 }
                 catch (_a) { }
+                try {
+                    await this.onSignedOut();
+                }
+                catch (_b) { }
             }
             /**
              * Sign out the user and clear the auth token cookie.
@@ -342,19 +359,39 @@ var pxt;
                     return;
                 }
                 pxt.tickEvent('auth.logout');
-                // Tell backend to clear the http-only auth cookie. Ignore errors here, we want to clear local state even if the backend rejects this request.
+                // Indicate that for the next minute, signin should be interactive.
+                // Use case: SSO signed in with the wrong account. User wants to sign in with a different account.
+                await setLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL, (Date.now() + 60000).toString());
+                continuationHash = continuationHash ? continuationHash.startsWith('#') ? continuationHash : `#${continuationHash}` : "";
+                const clientRedirect = `${window.location.origin}${window.location.pathname}${window.location.search}${continuationHash}`;
+                // Tell backend to clear the http-only auth cookie.
+                let logoutUri = "";
                 try {
-                    await AuthClient.staticApiAsync('/api/auth/logout');
+                    const uri = pxt.Util.stringifyQueryString('/api/auth/logout', {
+                        redirect_uri: clientRedirect,
+                        authcallback: '1'
+                    });
+                    const apiResult = await AuthClient.staticApiAsync(uri);
+                    if (apiResult.success) {
+                        logoutUri = apiResult.resp.logoutUrl;
+                    }
+                }
+                catch (_a) {
+                    // Ignore errors.
                 }
-                catch (_a) { }
                 // Clear local auth state so we can no longer make authenticated requests.
                 await delAuthTokenAsync();
                 await delUserStateAsync();
-                // Redirect to home screen
                 if (pxt.BrowserUtils.hasWindow()) {
-                    const hash = continuationHash ? continuationHash.startsWith('#') ? continuationHash : `#${continuationHash}` : "";
-                    window.location.href = `${window.location.origin}${window.location.pathname}${window.location.search}${hash}`;
-                    location.reload();
+                    if (logoutUri) {
+                        // Redirect to logout endpoint
+                        window.location.href = logoutUri;
+                    }
+                    else {
+                        // Redirect to home screen
+                        window.location.href = clientRedirect;
+                        location.reload();
+                    }
                 }
             }
             async deleteProfileAsync() {
@@ -750,6 +787,8 @@ var pxt;
                 // without its cookie-based counterpart. When "Remember me" is false,
                 // the cookie is not persisted.
                 await setAuthTokenAsync(authToken);
+                // Clear interactive login flag. Next auth request will try silent SSO first.
+                await setLocalStorageValueAsync(INTERACTIVE_LOGIN_UNTIL, undefined);
                 pxt.tickEvent('auth.login.success', { 'provider': loginState.idp });
             } while (false);
             // Clear url parameters and redirect to the callback location.

package/built/pxtsim.d.ts

@@ -556,6 +556,10 @@ declare namespace pxsim {
         part: "background-color" | "button-stroke" | "text-color" | "button-fill" | "dpad-fill";
         color: string;
     }
+    interface SetMuteButtonStateMessage extends SimulatorMessage {
+        type: "setmutebuttonstate";
+        state: "muted" | "unmuted" | "disabled";
+    }
     namespace multiplayer {
         type MessageBase = {
             type: "multiplayer";
@@ -1255,6 +1259,7 @@ declare namespace pxsim {
         cleanScheduledExpired(): void;
         registerUserInteraction(): void;
     }
+    function setParentMuteState(state: "muted" | "unmuted" | "disabled"): void;
     class PerfCounter {
         name: string;
         start: number;
@@ -1279,6 +1284,7 @@ declare namespace pxsim {
         onSimulatorReady?: () => void;
         onSimulatorCommand?: (msg: pxsim.SimulatorCommandMessage) => void;
         onTopLevelCodeEnd?: () => void;
+        onMuteButtonStateChange?: (state: "muted" | "unmuted" | "disabled") => void;
         simUrl?: string;
         stoppedClass?: string;
         invalidatedClass?: string;
@@ -1493,6 +1499,7 @@ declare namespace pxsim {
         function isAudioElementActive(): boolean;
         let soundEventCallback: (ev: "playinstructions" | "muteallchannels", data?: Uint8Array) => void;
         function mute(mute: boolean): void;
+        function isMuted(): boolean;
         function stopAll(): void;
         function stop(): void;
         function onStopAll(handler: () => void): void;

package/built/pxtsim.js

@@ -5992,6 +5992,13 @@ var pxsim;
         }
     }
     pxsim.Runtime = Runtime;
+    function setParentMuteState(state) {
+        Runtime.postMessage({
+            type: "setmutebuttonstate",
+            state
+        });
+    }
+    pxsim.setParentMuteState = setParentMuteState;
     class PerfCounter {
         constructor(name) {
             this.name = name;
@@ -6664,7 +6671,7 @@ var pxsim;
             }
         }
         handleMessage(msg, source) {
-            var _a;
+            var _a, _b, _c;
             switch (msg.type || '') {
                 case 'ready': {
                     const frameid = msg.frameid;
@@ -6727,6 +6734,9 @@ var pxsim;
                     if (this.options.onTopLevelCodeEnd)
                         this.options.onTopLevelCodeEnd();
                     break;
+                case 'setmutebuttonstate':
+                    (_c = (_b = this.options).onMuteButtonStateChange) === null || _c === void 0 ? void 0 : _c.call(_b, msg.state);
+                    break;
                 default:
                     this.postMessage(msg, source);
                     break;
@@ -7131,6 +7141,10 @@ var pxsim;
                 ctx.resume();
         }
         AudioContextManager.mute = mute;
+        function isMuted() {
+            return _mute;
+        }
+        AudioContextManager.isMuted = isMuted;
         function stopTone() {
             setCurrentToneGain(0);
             _frequency = 0;