Consume @itwin/eslint-plugin 6.0.0, update linting, remove a pnpm override

change/@itwin-browser-authorization-69a191c7-350d-4edb-a17a-228073fdf82b.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: upgrade all packages to @itwin/eslint-plugin@6 and eslint@9",
+  "packageName": "@itwin/browser-authorization",
+  "email": "50554904+hl662@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@itwin-electron-authorization-98f9a445-c320-4be0-80db-e95428d6d6c5.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: upgrade all packages to @itwin/eslint-plugin@6 and eslint@9",
+  "packageName": "@itwin/electron-authorization",
+  "email": "50554904+hl662@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@itwin-node-cli-authorization-6f4e1cf7-176e-4825-837a-e3d1165ef264.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: upgrade all packages to @itwin/eslint-plugin@6 and eslint@9",
+  "packageName": "@itwin/node-cli-authorization",
+  "email": "50554904+hl662@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@itwin-oidc-signin-tool-7c897f77-e336-4c82-afab-51100b8fa1a4.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: upgrade all packages to @itwin/eslint-plugin@6 and eslint@9",
+  "packageName": "@itwin/oidc-signin-tool",
+  "email": "50554904+hl662@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@itwin-service-authorization-4908cf86-21af-4ac0-8ae8-cd3446c772ef.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: upgrade all packages to @itwin/eslint-plugin@6 and eslint@9",
+  "packageName": "@itwin/service-authorization",
+  "email": "50554904+hl662@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

package.json

@@ -40,9 +40,7 @@
   "pnpm": {
     "overrides": {
       "path-to-regexp": "0.1.12",
-      "minimatch@>=9.0.0 <9.0.7": ">=9.0.7",
-      "serialize-javascript@<=7.0.2": ">=7.0.3",
-      "flat-cache>flatted": ">=3.4.2"
+      "serialize-javascript@<=7.0.2": ">=7.0.3"
     }
   },
   "packageManager": "pnpm@9.15.9+sha512.68046141893c66fad01c079231128e9afb89ef87e2691d69e4d40eee228988295fd4682181bae55b58418c3a253bde65a505ec7c5f9403ece5cc3cd37dcf2531"

packages/browser/package.json

@@ -38,15 +38,15 @@
     "@itwin/build-tools": "^5.5.0",
     "@itwin/core-bentley": "^5.0.0",
     "@itwin/core-common": "^5.0.0",
-    "@itwin/eslint-plugin": "^4.1.1",
+    "@itwin/eslint-plugin": "^6.0.0",
     "@playwright/test": "~1.56.1",
     "@types/chai": "^4.3.20",
     "@types/mocha": "^8.2.3",
     "@types/node": "^20.19.1",
     "@types/sinon": "^10.0.20",
     "chai": "^4.5.0",
     "dotenv": "~16.0.3",
-    "eslint": "^8.57.1",
+    "eslint": "^9.11.1",
     "mocha": "^10.8.2",
     "nyc": "^17.1.0",
     "rimraf": "^3.0.2",

packages/browser/src/Client.ts

@@ -56,7 +56,7 @@ export class BrowserAuthorizationClient implements AuthorizationClient {
 
     this._basicSettings = {
       ...configuration,
-      authority: configuration.authority ?? getImsAuthority(), // eslint-disable-line deprecation/deprecation
+      authority: configuration.authority ?? getImsAuthority(), // eslint-disable-line @typescript-eslint/no-deprecated
     };
   }
 
@@ -237,7 +237,7 @@ export class BrowserAuthorizationClient implements AuthorizationClient {
     try {
       user = (await userManager.signinSilent()) ?? undefined; // calls events
       return user;
-    } catch (err) {
+    } catch {
       return undefined;
     }
   }
@@ -311,7 +311,7 @@ export class BrowserAuthorizationClient implements AuthorizationClient {
     const userManager = await this.getUserManager();
     try {
       await userManager.querySessionStatus();
-    } catch (err) {
+    } catch {
       // Access token is no longer valid in this session
       await userManager.removeUser();
       return false;

packages/browser/src/test/BrowserAuthorizationClient.test.ts

@@ -71,15 +71,15 @@ describe("BrowserAuthorizationClient", () => {
       const client = new BrowserAuthorizationClient(testConfigWithoutAuthority);
 
       // getImsAuthority manages the value of the default authority
-      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line deprecation/deprecation
+      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line @typescript-eslint/no-deprecated
     });
 
     it("default authority is used and when none is given and uses environment prefix", () => {
       process.env.IMJS_URL_PREFIX = "prefix-";
       const client = new BrowserAuthorizationClient(testConfigWithoutAuthority);
 
       // getImsAuthority manages the value of the default authority
-      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line deprecation/deprecation
+      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line @typescript-eslint/no-deprecated
     });
 
     it("_basicSettings contains passed in configuration", () => {
@@ -111,15 +111,15 @@ describe("BrowserAuthorizationClient", () => {
       const client = new BrowserAuthorizationClient(testConfigWithoutAuthority);
 
       // getImsAuthority manages the value of the default authority
-      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line deprecation/deprecation
+      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line @typescript-eslint/no-deprecated
     });
 
     it("default authority is used and when none is given and uses environment prefix", () => {
       process.env.IMJS_URL_PREFIX = "prefix-";
       const client = new BrowserAuthorizationClient(testConfigWithoutAuthority);
 
       // getImsAuthority manages the value of the default authority
-      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line deprecation/deprecation
+      assert.equal(client.authorityUrl, getImsAuthority()); // eslint-disable-line @typescript-eslint/no-deprecated
     });
 
     it('successfully sets "query" as response mode', () => {

packages/browser/src/test/utils.test.ts

@@ -10,24 +10,24 @@ describe("getImsAuthority", () => {
   it("has no prefix when no prefix is defined", async () => {
     process.env.IMJS_URL_PREFIX = "";
 
-    assert.equal(getImsAuthority(), "https://ims.bentley.com"); // eslint-disable-line deprecation/deprecation
+    assert.equal(getImsAuthority(), "https://ims.bentley.com"); // eslint-disable-line @typescript-eslint/no-deprecated
   });
 
   it("has correct prefix when prefix is defined", async () => {
     process.env.IMJS_URL_PREFIX = "prefix-";
 
-    assert.equal(getImsAuthority(), "https://prefix-ims.bentley.com"); // eslint-disable-line deprecation/deprecation
+    assert.equal(getImsAuthority(), "https://prefix-ims.bentley.com"); // eslint-disable-line @typescript-eslint/no-deprecated
   });
 
   it("replaces \"dev-\" prefix with \"qa-\"", async () => {
     process.env.IMJS_URL_PREFIX = "dev-";
 
-    assert.equal(getImsAuthority(), "https://qa-ims.bentley.com"); // eslint-disable-line deprecation/deprecation
+    assert.equal(getImsAuthority(), "https://qa-ims.bentley.com"); // eslint-disable-line @typescript-eslint/no-deprecated
   });
 
   it("does not modify \"qa-\" prefix", async () => {
     process.env.IMJS_URL_PREFIX = "qa-";
 
-    assert.equal(getImsAuthority(), "https://qa-ims.bentley.com"); // eslint-disable-line deprecation/deprecation
+    assert.equal(getImsAuthority(), "https://qa-ims.bentley.com"); // eslint-disable-line @typescript-eslint/no-deprecated
   });
 });

packages/browser/src/utils.ts

@@ -11,7 +11,7 @@
  * Returns the IMS authority URL.
  * A prefix will be prepended based on the value of the IMJS_URL_PREFIX environment variable.
  * The prefix "dev-" will automatically be converted to "qa-".
- * @deprecated in 1.1.x Please set the authority in `BrowserAuthorizationClientConfiguration` configuration object.
+ * @deprecated in 1.1.0. Please set the authority in `BrowserAuthorizationClientConfiguration` configuration object.
  */
 export function getImsAuthority(): string {
   try {
@@ -22,7 +22,7 @@ export function getImsAuthority(): string {
       prefix = "qa-";
 
     return `https://${prefix}ims.bentley.com`;
-  } catch (_) {
+  } catch {
     // swallow error
   }
 

packages/electron/package.json

@@ -52,7 +52,7 @@
     "@itwin/build-tools": "^5.5.0",
     "@itwin/core-bentley": "^5.0.0",
     "@itwin/core-common": "^5.0.0",
-    "@itwin/eslint-plugin": "^4.1.1",
+    "@itwin/eslint-plugin": "^6.0.0",
     "@playwright/test": "~1.56.1",
     "@types/chai": "4.3.14",
     "@types/chai-as-promised": "^7.1.8",
@@ -64,7 +64,7 @@
     "cpx2": "^5.0.0",
     "dotenv": "~16.0.3",
     "electron": "^41.0.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.11.1",
     "mocha": "^10.8.2",
     "nyc": "^17.1.0",
     "rimraf": "^3.0.2",

packages/electron/src/integration-test/integration.test.ts

@@ -25,8 +25,12 @@ const getElectronUserDataPath = (): string | undefined => {
   switch (process.platform) {
     case "darwin": // For MacOS
       return `${process.env.HOME}/Library/Application Support/Electron`;
-    case "win32": // For Windows
-      return `${process.env.APPDATA!}/Electron`;
+    case "win32": { // For Windows
+      const appData = process.env.APPDATA;
+      if (!appData)
+        throw new Error("APPDATA environment variable not set on Windows");
+      return `${appData}/Electron`;
+    }
     case "linux": // For Linux
       return undefined; // Linux uses the same path for both main and renderer processes, no need to manually resolve path.
     default:
@@ -80,7 +84,7 @@ test.beforeEach(async () => {
       args: ["./dist/integration-test/test-app/index.js"],
     });
     electronPage = await electronApp.firstWindow();
-  } catch (error) {
+  } catch {
   }
 });
 

packages/electron/src/integration-test/test-app/index.ts

@@ -39,16 +39,12 @@ void app.whenReady().then(async () => {
     channelClientPrefix: "prefixed",
   });
 
-  // TODO: revisit this lint problem later
-  // eslint-disable-next-line deprecation/deprecation
   app.on("activate", () => {
     if (BrowserWindow.getAllWindows().length === 0)
       createWindow();
   });
 });
 
-// TODO: revisit this lint problem later
-// eslint-disable-next-line deprecation/deprecation
 app.on("window-all-closed", () => {
   if (process.platform !== "darwin")
     app.quit();

packages/electron/src/integration-test/test-app/renderer.ts

@@ -21,23 +21,23 @@ const otherGetStatusButton = document.getElementById("otherGetStatus");
 signOutButton?.addEventListener("click", async () => {
   try {
     await auth.signOut();
-  } catch (error) {
+  } catch {
 
   }
 });
 
 signInButton?.addEventListener("click", async () => {
   try {
     await auth.signIn();
-  } catch (error) {
+  } catch {
 
   }
 });
 
 otherSignInButton?.addEventListener("click", async () => {
   try {
     await otherAuth.signIn();
-  } catch (error) {
+  } catch {
 
   }
 });

packages/electron/src/main/Client.ts

@@ -158,7 +158,7 @@ export class ElectronMainAuthorization implements AuthorizationClient {
 
   /**
    * Event raised whenever the access token changes on any instance of ElectronMainAuthorization
-   * @deprecated in 0.22 - please use the onUserStateChanged instance event instead.
+   * @deprecated in 0.22.0. Please use the onUserStateChanged instance event instead.
    */
   public static readonly onUserStateChanged = new BeEvent<
   (token: AccessToken) => void
@@ -307,7 +307,7 @@ export class ElectronMainAuthorization implements AuthorizationClient {
 
     this._accessToken = token;
     this.notifyFrontendAccessTokenChange(this._accessToken);
-    // eslint-disable-next-line deprecation/deprecation
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     ElectronMainAuthorization.onUserStateChanged.raiseEvent(this._accessToken);
     this.onUserStateChanged.raiseEvent(this._accessToken);
   }
@@ -378,7 +378,7 @@ export class ElectronMainAuthorization implements AuthorizationClient {
         await LoopbackWebServer.start(tryRedirectUri);
         redirectUri = tryRedirectUri;
         break;
-      } catch (e: unknown) {
+      } catch {
         // Most common error is EADDRINUSE (port already in use) - just continue with the next port
         continue;
       }
@@ -440,7 +440,7 @@ export class ElectronMainAuthorization implements AuthorizationClient {
             authRequest,
             authResponse,
             authError,
-          ).catch((e) => reject(e));
+          ).catch(reject);
 
           authorizationEvents.onAuthorizationResponseCompleted.raiseEvent(
             authError ? authError : undefined,
@@ -519,9 +519,11 @@ export class ElectronMainAuthorization implements AuthorizationClient {
     }
 
     // Phase 2: Swap the authorization code for the access token
+    if (!authRequest.internal)
+      throw new Error("Missing internal state in authorization request");
     const tokenResponse = await this.swapAuthorizationCodeForTokens(
       authResponse.code,
-      authRequest.internal!.code_verifier,
+      authRequest.internal.code_verifier,
       authRequest.redirectUri,
     );
     Logger.logTrace(
@@ -662,6 +664,8 @@ export class ElectronMainAuthorization implements AuthorizationClient {
       throw new Error(
         "Missing refresh token. First call signIn() and ensure it's successful",
       );
+    if (!this._configuration)
+      throw new Error("Not initialized. First call initialize()");
     assert(this._clientId !== "");
 
     const revokeTokenRequestJson: RevokeTokenRequestJson = {
@@ -676,7 +680,7 @@ export class ElectronMainAuthorization implements AuthorizationClient {
       tokenRequestor,
     );
     await tokenHandler.performRevokeTokenRequest(
-      this._configuration!,
+      this._configuration,
       revokeTokenRequest,
     );
 

packages/electron/src/main/LoopbackWebServer.ts

@@ -117,7 +117,7 @@ export class LoopbackWebServer {
     let authorizationError: AuthorizationErrorJson | null = null;
     let httpResponseContent: HtmlTemplateParams;
 
-    httpResponse.writeHead(200, { "Content-Type": "text/html" }); //  eslint-disable-line @typescript-eslint/naming-convention
+    httpResponse.writeHead(200, { "Content-Type": "text/html" });
 
     if (error) {
       authorizationError = { error, error_description: errorDescription ?? undefined, error_uri: errorUri ?? undefined, state }; // eslint-disable-line @typescript-eslint/naming-convention

packages/electron/src/main/TokenStore.ts

@@ -6,7 +6,7 @@
 
 import { safeStorage } from "electron";
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const Store = require("electron-store"); // eslint-disable-line @typescript-eslint/no-var-requires
+const Store = require("electron-store"); // eslint-disable-line @typescript-eslint/no-require-imports
 
 /**
  * Utility class used to store and read OAuth refresh tokens.

packages/electron/src/renderer/Client.ts

@@ -53,7 +53,7 @@ class ElectronAuthIPC {
     } else {
       // use the methods on window.itwinjs exposed by ElectronPreload.ts, or ipcRenderer directly if running with nodeIntegration=true (**only** for tests).
       // Note that `require("electron")` doesn't work with nodeIntegration=false - that's what it stops
-      this._ipcSocket = (window as any).itwinjs ?? require("electron").ipcRenderer; // eslint-disable-line @typescript-eslint/no-var-requires
+      this._ipcSocket = (window as any).itwinjs ?? require("electron").ipcRenderer; // eslint-disable-line @typescript-eslint/no-require-imports
     }
   }
 }