chore(auth): enable eslint and remove tslint (#13052)

* chore(auth): enable eslint and remove tslint * chore(auth): run yarn lint:fix * chore(auth): manual fix of eslint reported errors
aws-amplify · Feb 28, 2024 · f049a9e · f049a9e
1 parent 4b67d4d
commit f049a9e
Show file tree

Hide file tree

Showing 102 changed files with 834 additions and 718 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -43,7 +43,7 @@ module.exports = {
 		// 'packages/api',
 		'packages/api-graphql',
 		// 'packages/api-rest',
-		'packages/auth',
+		// 'packages/auth',
 		// 'packages/aws-amplify',
 		// 'packages/core',
 		'packages/datastore',

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -25,7 +25,8 @@
 		"clean": "npm run clean:size && rimraf lib-esm lib dist",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
-		"lint": "tslint '{src}/**/*.ts' && npm run ts-coverage",
+		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 91.18"
 	},
 	"typesVersions": {

diff --git a/packages/auth/src/Errors.ts b/packages/auth/src/Errors.ts
@@ -3,8 +3,9 @@
 
 // TODO: delete this module when the Auth class is removed.
 
-import { AuthErrorMessages, AuthErrorTypes } from './types/Auth';
 import { ConsoleLogger } from '@aws-amplify/core';
+
+import { AuthErrorMessages, AuthErrorTypes } from './types/Auth';
 import { AuthErrorStrings } from './common/AuthErrorStrings';
 
 const logger = new ConsoleLogger('AuthError');

diff --git a/packages/auth/src/common/AuthErrorStrings.ts b/packages/auth/src/common/AuthErrorStrings.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AmplifyErrorMap } from '@aws-amplify/core/internals/utils';
+
 import { AuthValidationErrorCode } from '../errors/types/validation';
 
 export const validationErrorMap: AmplifyErrorMap<AuthValidationErrorCode> = {

diff --git a/packages/auth/src/errors/constants.ts b/packages/auth/src/errors/constants.ts
@@ -26,4 +26,5 @@ export const invalidOriginException = new AuthError({
 });
 export const OAUTH_SIGNOUT_EXCEPTION = 'OAuthSignOutException';
 export const TOKEN_REFRESH_EXCEPTION = 'TokenRefreshException';
-export const UNEXPECTED_SIGN_IN_INTERRUPTION_EXCEPTION = 'UnexpectedSignInInterruptionException';
+export const UNEXPECTED_SIGN_IN_INTERRUPTION_EXCEPTION =
+	'UnexpectedSignInInterruptionException';
diff --git a/packages/auth/src/errors/utils/assertServiceError.ts b/packages/auth/src/errors/utils/assertServiceError.ts
@@ -1,12 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { AuthError } from '../AuthError';
 import {
 	AmplifyErrorCode,
 	ServiceError,
 } from '@aws-amplify/core/internals/utils';
 
+import { AuthError } from '../AuthError';
+
 export function assertServiceError(
 	error: unknown,
 ): asserts error is ServiceError {

diff --git a/packages/auth/src/providers/cognito/apis/autoSignIn.ts b/packages/auth/src/providers/cognito/apis/autoSignIn.ts
@@ -97,6 +97,8 @@ const initialAutoSignIn: AutoSignInCallback =
  *
  * ```
  */
+// TODO(Eslint): can this be refactored not using `let` on exported member?
+// eslint-disable-next-line import/no-mutable-exports
 export let autoSignIn: AutoSignInCallback = initialAutoSignIn;
 
 /**

diff --git a/packages/auth/src/providers/cognito/apis/confirmResetPassword.ts b/packages/auth/src/providers/cognito/apis/confirmResetPassword.ts
@@ -3,9 +3,10 @@
 
 import { Amplify } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { ConfirmResetPasswordInput } from '../types';
@@ -64,7 +65,7 @@ export async function confirmResetPassword(
 			Password: newPassword,
 			ClientMetadata: metadata,
 			ClientId: authConfig.userPoolClientId,
-			UserContextData: UserContextData,
+			UserContextData,
 		},
 	);
 }
diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -1,10 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { Amplify } from '@aws-amplify/core';
+import { assertTokenProviderConfig } from '@aws-amplify/core/internals/utils';
+
 import {
-	VerifySoftwareTokenException,
-	RespondToAuthChallengeException,
 	AssociateSoftwareTokenException,
+	RespondToAuthChallengeException,
+	VerifySoftwareTokenException,
 } from '../types/errors';
 import { ConfirmSignInInput, ConfirmSignInOutput } from '../types';
 import {
@@ -23,18 +26,12 @@ import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { AuthErrorCodes } from '../../../common/AuthErrorStrings';
-import { Amplify, Hub } from '@aws-amplify/core';
-import {
-	AMPLIFY_SYMBOL,
-	assertTokenProviderConfig,
-} from '@aws-amplify/core/internals/utils';
 import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
 import {
 	ChallengeName,
 	ChallengeParameters,
 } from '../utils/clients/CognitoIdentityProvider/types';
 import { tokenOrchestrator } from '../tokenProvider';
-import { getCurrentUser } from './getCurrentUser';
 import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
 
 /**
@@ -89,9 +86,9 @@ export async function confirmSignIn(
 	try {
 		const {
 			Session,
-			ChallengeName,
+			ChallengeName: handledChallengeName,
 			AuthenticationResult,
-			ChallengeParameters,
+			ChallengeParameters: handledChallengeParameters,
 		} = await handleChallengeName(
 			username,
 			challengeName as ChallengeName,
@@ -107,7 +104,7 @@ export async function confirmSignIn(
 		setActiveSignInState({
 			signInSession: Session,
 			username,
-			challengeName: ChallengeName as ChallengeName,
+			challengeName: handledChallengeName as ChallengeName,
 			signInDetails,
 		});
 
@@ -133,8 +130,8 @@ export async function confirmSignIn(
 		}
 
 		return getSignInResult({
-			challengeName: ChallengeName as ChallengeName,
-			challengeParameters: ChallengeParameters as ChallengeParameters,
+			challengeName: handledChallengeName as ChallengeName,
+			challengeParameters: handledChallengeParameters as ChallengeParameters,
 		});
 	} catch (error) {
 		assertServiceError(error);

diff --git a/packages/auth/src/providers/cognito/apis/confirmSignUp.ts b/packages/auth/src/providers/cognito/apis/confirmSignUp.ts
@@ -3,10 +3,11 @@
 
 import { Amplify } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
 	HubInternal,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { ConfirmSignUpInput, ConfirmSignUpOutput } from '../types';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
@@ -85,7 +86,9 @@ export async function confirmSignUp(
 				!isAutoSignInStarted() ||
 				!isAutoSignInUserUsingConfirmSignUp(username)
 			) {
-				return resolve(signUpOut);
+				resolve(signUpOut);
+
+				return;
 			}
 
 			const stopListener = HubInternal.listen<AutoSignInEventData>(

diff --git a/packages/auth/src/providers/cognito/apis/confirmUserAttribute.ts b/packages/auth/src/providers/cognito/apis/confirmUserAttribute.ts
@@ -3,9 +3,10 @@
 
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { verifyUserAttribute } from '../utils/clients/CognitoIdentityProvider';

diff --git a/packages/auth/src/providers/cognito/apis/deleteUser.ts b/packages/auth/src/providers/cognito/apis/deleteUser.ts
@@ -3,17 +3,19 @@
 
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { assertAuthTokens } from '../utils/types';
 import { deleteUser as serviceDeleteUser } from '../utils/clients/CognitoIdentityProvider';
 import { DeleteUserException } from '../types/errors';
 import { tokenOrchestrator } from '../tokenProvider';
-import { signOut } from './signOut';
 import { getAuthUserAgentValue } from '../../../utils';
 
+import { signOut } from './signOut';
+
 /**
  * Deletes a user from the user pool while authenticated.
  *

diff --git a/packages/auth/src/providers/cognito/apis/deleteUserAttributes.ts b/packages/auth/src/providers/cognito/apis/deleteUserAttributes.ts
@@ -3,9 +3,10 @@
 
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { deleteUserAttributes as deleteUserAttributesClient } from '../utils/clients/CognitoIdentityProvider';
 import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { assertAuthTokens } from '../utils/types';

diff --git a/packages/auth/src/providers/cognito/apis/fetchDevices.ts b/packages/auth/src/providers/cognito/apis/fetchDevices.ts
@@ -3,9 +3,10 @@
 
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
 import { FetchDevicesOutput } from '../types';
 import { listDevices } from '../utils/clients/CognitoIdentityProvider';
 import { DeviceType } from '../utils/clients/CognitoIdentityProvider/types';
@@ -43,6 +44,7 @@ export async function fetchDevices(): Promise<FetchDevicesOutput> {
 			Limit: MAX_DEVICES,
 		},
 	);
+
 	return parseDevicesResponse(response.Devices ?? []);
 }
 
@@ -62,10 +64,12 @@ const parseDevicesResponse = async (
 					if (Name && Value) {
 						attrs[Name] = Value;
 					}
+
 					return attrs;
 				},
 				{},
 			);
+
 			return {
 				id,
 				attributes,

diff --git a/packages/auth/src/providers/cognito/apis/fetchMFAPreference.ts b/packages/auth/src/providers/cognito/apis/fetchMFAPreference.ts
@@ -1,15 +1,16 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { FetchMFAPreferenceOutput } from '../types';
-import { getMFAType, getMFATypes } from '../utils/signInHelpers';
-import { GetUserException } from '../types/errors';
-import { getUser } from '../utils/clients/CognitoIdentityProvider';
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
+import { FetchMFAPreferenceOutput } from '../types';
+import { getMFAType, getMFATypes } from '../utils/signInHelpers';
+import { GetUserException } from '../types/errors';
+import { getUser } from '../utils/clients/CognitoIdentityProvider';
 import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { assertAuthTokens } from '../utils/types';
 import { getAuthUserAgentValue } from '../../../utils';

diff --git a/packages/auth/src/providers/cognito/apis/fetchUserAttributes.ts b/packages/auth/src/providers/cognito/apis/fetchUserAttributes.ts
@@ -2,7 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Amplify } from '@aws-amplify/core';
+
 import { FetchUserAttributesOutput } from '../types';
+import { GetUserException } from '../types/errors';
+
 import { fetchUserAttributes as fetchUserAttributesInternal } from './internal/fetchUserAttributes';
 
 /**

diff --git a/packages/auth/src/providers/cognito/apis/forgetDevice.ts b/packages/auth/src/providers/cognito/apis/forgetDevice.ts
@@ -1,13 +1,14 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { forgetDevice as serviceForgetDevice } from '../utils/clients/CognitoIdentityProvider';
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
-import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
+import { forgetDevice as serviceForgetDevice } from '../utils/clients/CognitoIdentityProvider';
+import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
 import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { tokenOrchestrator } from '../tokenProvider';
 import { ForgetDeviceInput } from '../types';

diff --git a/packages/auth/src/providers/cognito/apis/getCurrentUser.ts b/packages/auth/src/providers/cognito/apis/getCurrentUser.ts
@@ -2,7 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Amplify } from '@aws-amplify/core';
+
 import { GetCurrentUserOutput } from '../types';
+import { InitiateAuthException } from '../types/errors';
+
 import { getCurrentUser as getCurrentUserInternal } from './internal/getCurrentUser';
 
 /**

diff --git a/packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts b/packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts
@@ -7,6 +7,7 @@ import {
 	assertTokenProviderConfig,
 	fetchAuthSession,
 } from '@aws-amplify/core/internals/utils';
+
 import { getUser } from '../../utils/clients/CognitoIdentityProvider';
 import { getRegion } from '../../utils/clients/CognitoIdentityProvider/utils';
 import { assertAuthTokens } from '../../utils/types';

diff --git a/packages/auth/src/providers/cognito/apis/internal/getCurrentUser.ts b/packages/auth/src/providers/cognito/apis/internal/getCurrentUser.ts
@@ -3,10 +3,11 @@
 
 import { AmplifyClassV6, AuthTokens } from '@aws-amplify/core';
 import { assertTokenProviderConfig } from '@aws-amplify/core/internals/utils';
+
 import { assertAuthTokens } from '../../utils/types';
 import {
-	CognitoAuthSignInDetails,
 	AuthUser,
+	CognitoAuthSignInDetails,
 	GetCurrentUserOutput,
 } from '../../types';
 
@@ -29,6 +30,7 @@ export const getCurrentUser = async (
 	if (signInDetails) {
 		authUser.signInDetails = signInDetails;
 	}
+
 	return authUser;
 };
 

diff --git a/packages/auth/src/providers/cognito/apis/rememberDevice.ts b/packages/auth/src/providers/cognito/apis/rememberDevice.ts
@@ -1,13 +1,14 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { updateDeviceStatus } from '../utils/clients/CognitoIdentityProvider';
 import { Amplify, fetchAuthSession } from '@aws-amplify/core';
-import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
 import {
-	assertTokenProviderConfig,
 	AuthAction,
+	assertTokenProviderConfig,
 } from '@aws-amplify/core/internals/utils';
+
+import { updateDeviceStatus } from '../utils/clients/CognitoIdentityProvider';
+import { assertAuthTokens, assertDeviceMetadata } from '../utils/types';
 import { getRegion } from '../utils/clients/CognitoIdentityProvider/utils';
 import { tokenOrchestrator } from '../tokenProvider';
 import { UpdateDeviceStatusException } from '../../cognito/types/errors';