From ca8c1f0146697322ab72308a5253628e2a9d9dd0 Mon Sep 17 00:00:00 2001 From: Daniel Bankhead Date: Wed, 12 Jun 2024 14:22:34 -0700 Subject: [PATCH] chore: Fix lint issues (#1826) * chore: Fix lint issues * chore: fix copyright --- browser-test/test.oauth2.ts | 3 --- samples/oauth2-codeVerifier.js | 6 +++++- samples/oauth2.js | 6 +++++- samples/puppeteer/oauth2-test.js | 13 ++++++++++--- samples/verifyIdToken.js | 6 +++++- src/crypto/browser/crypto.ts | 9 ++------- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/browser-test/test.oauth2.ts b/browser-test/test.oauth2.ts index 5626575d..e7b9cb9a 100644 --- a/browser-test/test.oauth2.ts +++ b/browser-test/test.oauth2.ts @@ -160,10 +160,8 @@ describe('Browser OAuth2 tests', () => { '}'; const envelope = JSON.stringify({kid: 'keyid', alg: 'RS256'}); let data = - // eslint-disable-next-line node/no-unsupported-features/node-builtins base64js.fromByteArray(new TextEncoder().encode(envelope)) + '.' + - // eslint-disable-next-line node/no-unsupported-features/node-builtins base64js.fromByteArray(new TextEncoder().encode(idToken)); const algo = { name: 'RSASSA-PKCS1-v1_5', @@ -181,7 +179,6 @@ describe('Browser OAuth2 tests', () => { const signature = await window.crypto.subtle.sign( algo, cryptoKey, - // eslint-disable-next-line node/no-unsupported-features/node-builtins new TextEncoder().encode(data) ); data += '.' + base64js.fromByteArray(new Uint8Array(signature)); diff --git a/samples/oauth2-codeVerifier.js b/samples/oauth2-codeVerifier.js index d91b7fa1..37065042 100644 --- a/samples/oauth2-codeVerifier.js +++ b/samples/oauth2-codeVerifier.js @@ -20,7 +20,11 @@ const open = require('open'); const destroyer = require('server-destroy'); // Download your OAuth2 configuration from the Google Developer Console. -const keys = require('./oauth2.keys.json'); +/** + * @example + * require('./oauth2.keys.json'); + */ +const keys = {}; /** * Start by acquiring a pre-authenticated oAuth2 client. diff --git a/samples/oauth2.js b/samples/oauth2.js index 5d177a5d..a10fab2b 100644 --- a/samples/oauth2.js +++ b/samples/oauth2.js @@ -20,7 +20,11 @@ const open = require('open'); const destroyer = require('server-destroy'); // Download your OAuth2 configuration from the Google -const keys = require('./oauth2.keys.json'); +/** + * @example + * require('./oauth2.keys.json'); + */ +const keys = {}; /** * Start by acquiring a pre-authenticated oAuth2 client. diff --git a/samples/puppeteer/oauth2-test.js b/samples/puppeteer/oauth2-test.js index 0d4d6228..71fa5908 100644 --- a/samples/puppeteer/oauth2-test.js +++ b/samples/puppeteer/oauth2-test.js @@ -1,4 +1,4 @@ -// Copyright 2018, Google, LLC +// Copyright 2018 Google LLC // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -22,7 +22,11 @@ const puppeteer = require('puppeteer'); const url = require('url'); const http = require('http'); -const keys = require('../oauth2.keys.json'); +/** + * @example + * require('../oauth2.keys.json'); + */ +const keys = {}; /** * Keep a config.keys.json with a username and password @@ -31,8 +35,11 @@ const keys = require('../oauth2.keys.json'); * "username": "your-user-name@gmail.com", * "password": "your-password" * } + * + * @example + * require('../config.keys.json'); */ -const config = require('../config.keys.json'); +const config = {}; async function main() { const oAuth2Client = await getAuthenticatedClient(); diff --git a/samples/verifyIdToken.js b/samples/verifyIdToken.js index 89269892..bb9f0dc1 100644 --- a/samples/verifyIdToken.js +++ b/samples/verifyIdToken.js @@ -20,7 +20,11 @@ const open = require('open'); const destroyer = require('server-destroy'); // Download your OAuth2 configuration from the Google -const keys = require('./oauth2.keys.json'); +/** + * @example + * require('./oauth2.keys.json'); + */ +const keys = {}; /** * Start by acquiring a pre-authenticated oAuth2 client. diff --git a/src/crypto/browser/crypto.ts b/src/crypto/browser/crypto.ts index e46096f7..df584ef1 100644 --- a/src/crypto/browser/crypto.ts +++ b/src/crypto/browser/crypto.ts @@ -39,7 +39,6 @@ export class BrowserCrypto implements Crypto { // To calculate SHA256 digest using SubtleCrypto, we first // need to convert an input string to an ArrayBuffer: - // eslint-disable-next-line node/no-unsupported-features/node-builtins const inputBuffer = new TextEncoder().encode(str); // Result is ArrayBuffer as well. @@ -74,7 +73,7 @@ export class BrowserCrypto implements Crypto { name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}, }; - // eslint-disable-next-line node/no-unsupported-features/node-builtins + const dataArray = new TextEncoder().encode(data); const signatureArray = base64js.toByteArray( BrowserCrypto.padBase64(signature) @@ -103,7 +102,7 @@ export class BrowserCrypto implements Crypto { name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}, }; - // eslint-disable-next-line node/no-unsupported-features/node-builtins + const dataArray = new TextEncoder().encode(data); const cryptoKey = await window.crypto.subtle.importKey( 'jwk', @@ -121,13 +120,11 @@ export class BrowserCrypto implements Crypto { decodeBase64StringUtf8(base64: string): string { const uint8array = base64js.toByteArray(BrowserCrypto.padBase64(base64)); - // eslint-disable-next-line node/no-unsupported-features/node-builtins const result = new TextDecoder().decode(uint8array); return result; } encodeBase64StringUtf8(text: string): string { - // eslint-disable-next-line node/no-unsupported-features/node-builtins const uint8array = new TextEncoder().encode(text); const result = base64js.fromByteArray(uint8array); return result; @@ -145,7 +142,6 @@ export class BrowserCrypto implements Crypto { // To calculate SHA256 digest using SubtleCrypto, we first // need to convert an input string to an ArrayBuffer: - // eslint-disable-next-line node/no-unsupported-features/node-builtins const inputBuffer = new TextEncoder().encode(str); // Result is ArrayBuffer as well. @@ -175,7 +171,6 @@ export class BrowserCrypto implements Crypto { ? key : String.fromCharCode(...new Uint16Array(key)); - // eslint-disable-next-line node/no-unsupported-features/node-builtins const enc = new TextEncoder(); const cryptoKey = await window.crypto.subtle.importKey( 'raw',