diff --git a/sdk/identity/identity-cache-persistence/src/index.ts b/sdk/identity/identity-cache-persistence/src/index.ts index 33616f94933c..93480700fb0f 100644 --- a/sdk/identity/identity-cache-persistence/src/index.ts +++ b/sdk/identity/identity-cache-persistence/src/index.ts @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { IdentityPlugin } from "@azure/identity"; - import { AzurePluginContext } from "../../identity/src/plugins/provider"; +import { IdentityPlugin } from "@azure/identity"; import { createPersistenceCachePlugin } from "./provider"; /** diff --git a/sdk/identity/identity-cache-persistence/src/platforms.ts b/sdk/identity/identity-cache-persistence/src/platforms.ts index 9259c4113b03..601e8c1ed2a0 100644 --- a/sdk/identity/identity-cache-persistence/src/platforms.ts +++ b/sdk/identity/identity-cache-persistence/src/platforms.ts @@ -4,16 +4,14 @@ /* eslint-disable tsdoc/syntax */ import * as path from "path"; - import { - KeychainPersistence, - FilePersistence, DataProtectionScope, + FilePersistence, FilePersistenceWithDataProtection, + KeychainPersistence, LibSecretPersistence, IPersistence as Persistence } from "@azure/msal-node-extensions"; - import { TokenCachePersistenceOptions } from "@azure/identity"; /** diff --git a/sdk/identity/identity-cache-persistence/src/provider.ts b/sdk/identity/identity-cache-persistence/src/provider.ts index bbad7ddf910b..32be099bbbc6 100644 --- a/sdk/identity/identity-cache-persistence/src/provider.ts +++ b/sdk/identity/identity-cache-persistence/src/provider.ts @@ -1,10 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { ICachePlugin as CachePlugin } from "@azure/msal-node"; -import { PersistenceCachePlugin, IPersistence as Persistence } from "@azure/msal-node-extensions"; - import { MsalPersistenceOptions, msalPersistencePlatforms } from "./platforms"; +import { IPersistence as Persistence, PersistenceCachePlugin } from "@azure/msal-node-extensions"; +import { ICachePlugin as CachePlugin } from "@azure/msal-node"; /** * This is used to gain access to the underlying Persistence instance, which we use for testing diff --git a/sdk/identity/identity-cache-persistence/test/internal/node/clientCertificateCredential.spec.ts b/sdk/identity/identity-cache-persistence/test/internal/node/clientCertificateCredential.spec.ts index 7cd190521a32..2df28636ec68 100644 --- a/sdk/identity/identity-cache-persistence/test/internal/node/clientCertificateCredential.spec.ts +++ b/sdk/identity/identity-cache-persistence/test/internal/node/clientCertificateCredential.spec.ts @@ -3,20 +3,17 @@ /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */ -import Sinon from "sinon"; -import assert from "assert"; import * as path from "path"; - -import { env, isPlaybackMode } from "@azure-tools/test-recorder"; -import { ConfidentialClientApplication } from "@azure/msal-node"; - import { ClientCertificateCredential, TokenCachePersistenceOptions } from "../../../../identity/src"; import { MsalTestCleanup, msalNodeTestSetup } from "../../../../identity/test/msalTestUtils"; +import { env, isPlaybackMode } from "@azure-tools/test-recorder"; +import { ConfidentialClientApplication } from "@azure/msal-node"; import { MsalNode } from "../../../../identity/src/msal/nodeFlows/msalNodeCommon"; - +import Sinon from "sinon"; +import assert from "assert"; import { createPersistence } from "./setup.spec"; const ASSET_PATH = "assets"; diff --git a/sdk/identity/identity-cache-persistence/test/internal/node/clientSecretCredential.spec.ts b/sdk/identity/identity-cache-persistence/test/internal/node/clientSecretCredential.spec.ts index d0e65cc9946e..e40fe1deef75 100644 --- a/sdk/identity/identity-cache-persistence/test/internal/node/clientSecretCredential.spec.ts +++ b/sdk/identity/identity-cache-persistence/test/internal/node/clientSecretCredential.spec.ts @@ -3,17 +3,14 @@ /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */ -import Sinon from "sinon"; -import assert from "assert"; - -import { env } from "@azure-tools/test-recorder"; -import { ConfidentialClientApplication } from "@azure/msal-node"; - import { ClientSecretCredential, TokenCachePersistenceOptions } from "../../../../identity/src"; import { MsalTestCleanup, msalNodeTestSetup } from "../../../../identity/test/msalTestUtils"; +import { ConfidentialClientApplication } from "@azure/msal-node"; import { MsalNode } from "../../../../identity/src/msal/nodeFlows/msalNodeCommon"; - +import Sinon from "sinon"; +import assert from "assert"; import { createPersistence } from "./setup.spec"; +import { env } from "@azure-tools/test-recorder"; const scope = "https://graph.microsoft.com/.default"; diff --git a/sdk/identity/identity-cache-persistence/test/internal/node/deviceCodeCredential.spec.ts b/sdk/identity/identity-cache-persistence/test/internal/node/deviceCodeCredential.spec.ts index 073ddabb9723..fd52ea77dc0f 100644 --- a/sdk/identity/identity-cache-persistence/test/internal/node/deviceCodeCredential.spec.ts +++ b/sdk/identity/identity-cache-persistence/test/internal/node/deviceCodeCredential.spec.ts @@ -3,17 +3,14 @@ /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */ -import Sinon from "sinon"; -import assert from "assert"; - -import { PublicClientApplication } from "@azure/msal-node"; -import { isLiveMode } from "@azure-tools/test-recorder"; - import { DeviceCodeCredential, TokenCachePersistenceOptions } from "../../../../identity/src"; import { MsalTestCleanup, msalNodeTestSetup } from "../../../../identity/test/msalTestUtils"; import { MsalNode } from "../../../../identity/src/msal/nodeFlows/msalNodeCommon"; - +import { PublicClientApplication } from "@azure/msal-node"; +import Sinon from "sinon"; +import assert from "assert"; import { createPersistence } from "./setup.spec"; +import { isLiveMode } from "@azure-tools/test-recorder"; describe("DeviceCodeCredential (internal)", function(this: Mocha.Suite) { let cleanup: MsalTestCleanup; diff --git a/sdk/identity/identity-cache-persistence/test/internal/node/usernamePasswordCredential.spec.ts b/sdk/identity/identity-cache-persistence/test/internal/node/usernamePasswordCredential.spec.ts index 48cdcce246d6..f438fddbeeb9 100644 --- a/sdk/identity/identity-cache-persistence/test/internal/node/usernamePasswordCredential.spec.ts +++ b/sdk/identity/identity-cache-persistence/test/internal/node/usernamePasswordCredential.spec.ts @@ -3,17 +3,14 @@ /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */ -import Sinon from "sinon"; -import assert from "assert"; - -import { env } from "@azure-tools/test-recorder"; -import { PublicClientApplication } from "@azure/msal-node"; - -import { UsernamePasswordCredential, TokenCachePersistenceOptions } from "../../../../identity/src"; import { MsalTestCleanup, msalNodeTestSetup } from "../../../../identity/test/msalTestUtils"; +import { TokenCachePersistenceOptions, UsernamePasswordCredential } from "../../../../identity/src"; import { MsalNode } from "../../../../identity/src/msal/nodeFlows/msalNodeCommon"; - +import { PublicClientApplication } from "@azure/msal-node"; +import Sinon from "sinon"; +import assert from "assert"; import { createPersistence } from "./setup.spec"; +import { env } from "@azure-tools/test-recorder"; describe("UsernamePasswordCredential (internal)", function(this: Mocha.Suite) { let cleanup: MsalTestCleanup;