Merge pull request #52 from pnp/spshooter-with-executescript

SP Shooter with executescript & deps update

Author: tavikukko

iframe-sandbox-app/src/popup/PopUp.tsx

@@ -34,9 +34,9 @@ const PopUp = () => {
         target: { tabId: tabs[0].id },
         world: 'MAIN',
         func: () => {
-          return (window as any)._spPageContextInfo || (window as any).moduleLoaderPromise.then((e: any) => {
+          return (window as any)._spPageContextInfo || ((window as any).moduleLoaderPromise ? (window as any).moduleLoaderPromise.then((e: any) => {
             return (window as any)._spPageContextInfo = e.context._pageContext._legacyPageContext;
-          })
+          }) : null);
         },
       }).then(injectionResults => {
         if (injectionResults[0].result) {

package-lock.json

@@ -1,31 +1,31 @@
 {
   "name": "sp-editor",
-  "version": "6.6.0",
+  "version": "6.6.1",
   "private": true,
   "homepage": ".",
   "dependencies": {
-    "@azure/msal-browser": "^2.32.2",
-    "@azure/msal-react": "^1.5.2",
-    "@fluentui/date-time-utilities": "^8.5.4",
-    "@fluentui/react": "^8.104.8",
+    "@azure/msal-browser": "^2.37.0",
+    "@azure/msal-react": "^1.5.7",
+    "@fluentui/date-time-utilities": "^8.5.10",
+    "@fluentui/react": "^8.109.2",
     "@ionic/react": "^5.8.4",
     "@ionic/react-router": "^5.8.4",
-    "@microsoft/mgt": "^2.9.0",
-    "@microsoft/mgt-react": "^2.9.0",
-    "@microsoft/microsoft-graph-client": "^3.0.4",
+    "@microsoft/mgt": "^2.10.1",
+    "@microsoft/mgt-react": "^2.10.1",
+    "@microsoft/microsoft-graph-client": "^3.0.5",
     "@minoru/react-dnd-treeview": "^3.4.0",
     "@uifabric/theme-samples": "^7.5.29",
-    "gsap": "^3.11.3",
+    "gsap": "^3.11.5",
     "gulp-remove-line": "^1.0.4",
     "ionicons": "^6.0.4",
-    "monaco-editor": "^0.34.1",
+    "monaco-editor": "^0.36.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-live": "^2.3.0",
     "react-redux": "^7.2.6",
     "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
-    "redux": "^4.2.0",
+    "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "textarea-caret": "^3.1.0",
     "typesafe-actions": "^5.1.0",
@@ -52,14 +52,14 @@
     ]
   },
   "devDependencies": {
-    "@pnp/core": "^3.11.0",
-    "@pnp/graph": "^3.11.0",
-    "@pnp/logging": "^3.11.0",
-    "@pnp/msaljsclient": "^3.11.0",
-    "@pnp/nodejs": "^3.11.0",
-    "@pnp/queryable": "^3.11.0",
-    "@pnp/sp": "^3.11.0",
-    "@pnp/sp-admin": "^3.11.0",
+    "@pnp/core": "^3.14.0",
+    "@pnp/graph": "^3.14.0",
+    "@pnp/logging": "^3.14.0",
+    "@pnp/msaljsclient": "^3.14.0",
+    "@pnp/nodejs": "^3.14.0",
+    "@pnp/queryable": "^3.14.0",
+    "@pnp/sp": "^3.14.0",
+    "@pnp/sp-admin": "^3.14.0",
     "@types/chrome": "0.0.204",
     "@types/jest": "29.2.4",
     "@types/jscodeshift": "^0.11.6",

package.json

@@ -36,6 +36,8 @@ export declare abstract class ClientApplication {
     private hybridAuthCodeResponses;
     protected performanceClient: IPerformanceClient;
     protected initialized: boolean;
+    private ssoSilentMeasurement?;
+    private acquireTokenByCodeAsyncMeasurement?;
     /**
      * @constructor
      * Constructor for the PublicClientApplication used to instantiate the PublicClientApplication object
@@ -88,6 +90,7 @@ export declare abstract class ClientApplication {
      * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
      */
     acquireTokenPopup(request: PopupRequest): Promise<AuthenticationResult>;
+    private trackPageVisibilityWithMeasurement;
     /**
      * This function uses a hidden iframe to fetch an authorization code from the eSTS. There are cases where this may not work:
      * - Any browser using a form of Intelligent Tracking Prevention
@@ -171,10 +174,10 @@ export declare abstract class ClientApplication {
      * (the account object is created at the time of successful login)
      * or null when no matching account is found.
      * This API is provided for convenience but getAccountById should be used for best reliability
-     * @param userName
+     * @param username
      * @returns The account object stored in MSAL
      */
-    getAccountByUsername(userName: string): AccountInfo | null;
+    getAccountByUsername(username: string): AccountInfo | null;
     /**
      * Returns the signed in account matching homeAccountId.
      * (the account object is created at the time of successful login)

public/@azure/msal-browser/app/ClientApplication.d.ts

@@ -11,6 +11,7 @@ import { SilentRequest } from "../request/SilentRequest";
  */
 export declare class PublicClientApplication extends ClientApplication implements IPublicClientApplication {
     private activeSilentTokenRequests;
+    private astsAsyncMeasurement?;
     /**
      * @constructor
      * Constructor for the PublicClientApplication used to instantiate the PublicClientApplication object
@@ -58,6 +59,7 @@ export declare class PublicClientApplication extends ClientApplication implement
      * @returns {Promise.<AuthenticationResult>} - a promise that is fulfilled when this function has completed, or rejected if an error was raised. Returns the {@link AuthResponse} object
      */
     acquireTokenSilent(request: SilentRequest): Promise<AuthenticationResult>;
+    private trackPageVisibility;
     /**
      * Silently acquire an access token for a given set of scopes. Will use cached token if available, otherwise will attempt to acquire a new token from the network via refresh token.
      * @param {@link (SilentRequest:type)}

public/@azure/msal-browser/app/PublicClientApplication.d.ts

@@ -1,29 +1,32 @@
-import { Logger, AuthenticationScheme } from "@azure/msal-common";
+import { Logger, AuthenticationScheme, IPerformanceClient } from "@azure/msal-common";
 import { NativeExtensionRequestBody } from "./NativeRequest";
 import { BrowserConfiguration } from "../../config/Configuration";
 export declare class NativeMessageHandler {
     private extensionId;
     private extensionVersion;
     private logger;
-    private handshakeTimeoutMs;
+    private readonly handshakeTimeoutMs;
     private responseId;
     private timeoutId;
     private resolvers;
     private handshakeResolvers;
     private messageChannel;
-    private windowListener;
-    constructor(logger: Logger, handshakeTimeoutMs: number, extensionId?: string);
+    private readonly windowListener;
+    private readonly performanceClient;
+    private readonly handshakeEvent;
+    constructor(logger: Logger, handshakeTimeoutMs: number, performanceClient: IPerformanceClient, extensionId?: string);
     /**
      * Sends a given message to the extension and resolves with the extension response
      * @param body
      */
     sendMessage(body: NativeExtensionRequestBody): Promise<object>;
     /**
      * Returns an instance of the MessageHandler that has successfully established a connection with an extension
-     * @param logger
-     * @param handshakeTimeoutMs
+     * @param {Logger} logger
+     * @param {number} handshakeTimeoutMs
+     * @param {IPerformanceClient} performanceClient
      */
-    static createProvider(logger: Logger, handshakeTimeoutMs: number): Promise<NativeMessageHandler>;
+    static createProvider(logger: Logger, handshakeTimeoutMs: number, performanceClient: IPerformanceClient): Promise<NativeMessageHandler>;
     /**
      * Send handshake request helper.
      */

public/@azure/msal-browser/broker/nativeBroker/NativeMessageHandler.d.ts

@@ -1,4 +1,4 @@
-import { CommonAuthorizationCodeRequest, ICrypto, AccountEntity, IdTokenEntity, AccessTokenEntity, RefreshTokenEntity, AppMetadataEntity, CacheManager, ServerTelemetryEntity, ThrottlingEntity, Logger, AuthorityMetadataEntity, AccountInfo, ValidCredentialType } from "@azure/msal-common";
+import { CommonAuthorizationCodeRequest, ICrypto, AccountEntity, IdTokenEntity, AccessTokenEntity, RefreshTokenEntity, AppMetadataEntity, CacheManager, ServerTelemetryEntity, ThrottlingEntity, Logger, AuthorityMetadataEntity, AccountInfo, ValidCredentialType, TokenKeys, CredentialType } from "@azure/msal-common";
 import { CacheOptions } from "../config/Configuration";
 import { BrowserCacheLocation, InteractionType } from "../utils/BrowserConstants";
 import { MemoryStorage } from "./MemoryStorage";
@@ -23,10 +23,11 @@ export declare class BrowserCacheManager extends CacheManager {
      */
     protected setupBrowserStorage(cacheLocation: BrowserCacheLocation | string): IWindowStorage<string>;
     /**
-     *
+     * Returns a window storage class implementing the IWindowStorage interface that corresponds to the configured temporaryCacheLocation.
+     * @param temporaryCacheLocation
      * @param cacheLocation
      */
-    protected setupTemporaryCacheStorage(cacheLocation: BrowserCacheLocation | string): IWindowStorage<string>;
+    protected setupTemporaryCacheStorage(temporaryCacheLocation: BrowserCacheLocation | string, cacheLocation: BrowserCacheLocation | string): IWindowStorage<string>;
     /**
      * Migrate all old cache entries to new schema. No rollback supported.
      * @param storeAuthStateInCookie
@@ -39,6 +40,12 @@ export declare class BrowserCacheManager extends CacheManager {
      * @param storeAuthStateInCookie
      */
     protected migrateCacheEntry(newKey: string, value: string | null): void;
+    /**
+     * Searches all cache entries for MSAL accounts and creates the account key map
+     * This is used to migrate users from older versions of MSAL which did not create the map.
+     * @returns
+     */
+    private createKeyMaps;
     /**
      * Parses passed value as JSON object, JSON.parse() will throw an error.
      * @param input
@@ -66,6 +73,58 @@ export declare class BrowserCacheManager extends CacheManager {
      * @param value
      */
     setAccount(account: AccountEntity): void;
+    /**
+     * Returns the array of account keys currently cached
+     * @returns
+     */
+    getAccountKeys(): Array<string>;
+    /**
+     * Add a new account to the key map
+     * @param key
+     */
+    addAccountKeyToMap(key: string): void;
+    /**
+     * Remove an account from the key map
+     * @param key
+     */
+    removeAccountKeyFromMap(key: string): void;
+    /**
+     * Extends inherited removeAccount function to include removal of the account key from the map
+     * @param key
+     */
+    removeAccount(key: string): Promise<void>;
+    /**
+     * Removes given idToken from the cache and from the key map
+     * @param key
+     */
+    removeIdToken(key: string): void;
+    /**
+     * Removes given accessToken from the cache and from the key map
+     * @param key
+     */
+    removeAccessToken(key: string): Promise<void>;
+    /**
+     * Removes given refreshToken from the cache and from the key map
+     * @param key
+     */
+    removeRefreshToken(key: string): void;
+    /**
+     * Gets the keys for the cached tokens associated with this clientId
+     * @returns
+     */
+    getTokenKeys(): TokenKeys;
+    /**
+     * Adds the given key to the token key map
+     * @param key
+     * @param type
+     */
+    addTokenKey(key: string, type: CredentialType): void;
+    /**
+     * Removes the given key from the token key map
+     * @param key
+     * @param type
+     */
+    removeTokenKey(key: string, type: CredentialType): void;
     /**
      * generates idToken entity from a string
      * @param idTokenKey
@@ -190,7 +249,7 @@ export declare class BrowserCacheManager extends CacheManager {
      * Will also clear the cookie item if storeAuthStateInCookie is set to true.
      * @param key
      */
-    removeItem(key: string): boolean;
+    removeItem(key: string): void;
     /**
      * Checks whether key is in cache.
      * @param key

public/@azure/msal-browser/cache/BrowserCacheManager.d.ts

@@ -63,9 +63,13 @@ export declare type BrowserAuthOptions = {
  */
 export declare type CacheOptions = {
     /**
-     * Used to specify the cacheLocation user wants to set. Valid values are "localStorage" and "sessionStorage"
+     * Used to specify the cacheLocation user wants to set. Valid values are "localStorage", "sessionStorage" and "memoryStorage".
      */
     cacheLocation?: BrowserCacheLocation | string;
+    /**
+     * Used to specify the temporaryCacheLocation user wants to set. Valid values are "localStorage", "sessionStorage" and "memoryStorage".
+     */
+    temporaryCacheLocation?: BrowserCacheLocation | string;
     /**
      * If set, MSAL stores the auth request state required for validation of the auth flows in the browser cookies. By default this flag is set to false.
      */
@@ -74,6 +78,10 @@ export declare type CacheOptions = {
      * If set, MSAL sets the "Secure" flag on cookies so they can only be sent over HTTPS. By default this flag is set to false.
      */
     secureCookies?: boolean;
+    /**
+     * If set, MSAL will attempt to migrate cache entries from older versions on initialization. By default this flag is set to true if cacheLocation is localStorage, otherwise false.
+     */
+    cacheMigrationEnabled?: boolean;
 };
 export declare type BrowserSystemOptions = SystemOptions & {
     /**

public/@azure/msal-browser/config/Configuration.d.ts

@@ -151,6 +151,10 @@ export declare const BrowserAuthErrorMessage: {
         code: string;
         desc: string;
     };
+    spaCodeAndNativeAccountPresent: {
+        code: string;
+        desc: string;
+    };
     databaseUnavailable: {
         code: string;
         desc: string;
@@ -341,6 +345,10 @@ export declare class BrowserAuthError extends AuthError {
      * Create an error when an authorization code or native account ID is required but not provided
      */
     static createAuthCodeOrNativeAccountIdRequiredError(): BrowserAuthError;
+    /**
+     * Create an error when both authorization code and native account ID are provided
+     */
+    static createSpaCodeAndNativeAccountIdPresentError(): BrowserAuthError;
     /**
      * Create an error when IndexedDB is unavailable
      */