fix: util mock tests with yarn2

.circleci/config.base.yml

@@ -107,7 +107,6 @@ jobs:
     executor: l_xlarge
     steps:
       - checkout
-      - run: yarn config set npmRegistryServer https://registry.npmjs.org
       - run: yarn --immutable
       - run: yarn production-build
       - run:
@@ -133,7 +132,6 @@ jobs:
     executor: l_xlarge
     steps:
       - checkout
-      - run: yarn config set npmRegistryServer https://registry.npmjs.org
       - run: yarn install --immutable
       - run:
           name: Build tests

.vscode/extensions.json

@@ -1,10 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": [
-    "dbaeumer.vscode-eslint",
-    "Orta.vscode-jest",
-    "arcanis.vscode-zipfs",
-    "esbenp.prettier-vscode"
-  ]
+  "recommendations": ["dbaeumer.vscode-eslint", "Orta.vscode-jest", "arcanis.vscode-zipfs", "esbenp.prettier-vscode"]
 }

.vscode/settings.json

@@ -1,19 +1,12 @@
 {
-  "editor.rulers": [
-    140
-  ],
+  "editor.rulers": [140],
   "files.exclude": {
     "**/.git": true,
     "**/build": true
   },
   "files.insertFinalNewline": true,
   "editor.formatOnSave": true,
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "eslint.lintTask.enable": true,
   "eslint.packageManager": "yarn",
   "eslint.quiet": false,

.yarnrc.yml

@@ -17,13 +17,13 @@ nmMode: hardlinks-local
 nodeLinker: node-modules
 
 npmRegistryServer: 'https://registry.npmjs.org'
-unsafeHttpWhitelist:
-  - 'localhost'
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
     spec: '@yarnpkg/plugin-typescript'
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: '@yarnpkg/plugin-workspace-tools'
+unsafeHttpWhitelist:
+  - localhost
 
 yarnPath: .yarn/releases/yarn-3.5.0.cjs

lerna.json

@@ -1,7 +1,5 @@
 {
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "independent",
   "npmClient": "yarn",
   "useWorkspaces": true,

nx.json

@@ -5,14 +5,7 @@
     "default": {
       "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": [
-          "build",
-          "test",
-          "lint",
-          "package",
-          "prepare",
-          "extract-api"
-        ],
+        "cacheableOperations": ["build", "test", "lint", "package", "prepare", "extract-api"],
         "parallel": 8
       }
     }
@@ -35,71 +28,33 @@
   },
   "targetDefaults": {
     "build": {
-      "inputs": [
-        "default",
-        "^production"
-      ],
-      "dependsOn": [
-        "^build"
-      ]
+      "inputs": ["default", "^production"],
+      "dependsOn": ["^build"]
     },
     "build-tests": {
-      "inputs": [
-        "default",
-        "^production"
-      ],
-      "dependsOn": [
-        "build",
-        "^build"
-      ]
+      "inputs": ["default", "^production"],
+      "dependsOn": ["build", "^build"]
     },
     "prepare": {
-      "inputs": [
-        "default",
-        "^default"
-      ],
-      "dependsOn": [
-        "^prepare"
-      ]
+      "inputs": ["default", "^default"],
+      "dependsOn": ["^prepare"]
     },
     "package": {
-      "inputs": [
-        "default",
-        "^default"
-      ],
-      "dependsOn": [
-        "^package"
-      ]
+      "inputs": ["default", "^default"],
+      "dependsOn": ["^package"]
     },
     "smoketest": {
-      "inputs": [
-        "default",
-        "^production"
-      ],
-      "dependsOn": [
-        "build"
-      ]
+      "inputs": ["default", "^production"],
+      "dependsOn": ["build"]
     },
     "test": {
-      "inputs": [
-        "default",
-        "^production"
-      ],
-      "dependsOn": [
-        "build"
-      ]
+      "inputs": ["default", "^production"],
+      "dependsOn": ["build"]
     },
     "extract-api": {
-      "dependsOn": [
-        "build"
-      ],
-      "inputs": [
-        "{projectRoot}/src/**/*",
-        "!{projectRoot}/src/__tests__/**/*"
-      ],
-      "outputs": [
-        "{projectRoot}/API.md"
-      ]
+      "dependsOn": ["build"],
+      "inputs": ["{projectRoot}/src/**/*", "!{projectRoot}/src/__tests__/**/*"],
+      "outputs": ["{projectRoot}/API.md"]
     }
   },
   "affected": {

package.json

@@ -10,14 +10,14 @@
     "build": "lerna run build",
     "check-version-conflicts:beta": "yarn ts-node ./scripts/check-version.ts beta",
     "check-version-conflicts:release": "yarn ts-node ./scripts/check-version.ts",
-    "clean": "lerna run clean && lerna exec yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
+    "clean": "lerna run clean && yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
     "cloud-e2e-with-rc": "CURR_BRANCH=$(git branch | awk '/\\*/{printf \"%s\", $2}') && UPSTREAM_BRANCH=run-e2e-with-rc/$USER/$CURR_BRANCH && git push $(git remote -v | grep aws-amplify/amplify-cli | head -n1 | awk '{print $1;}') $CURR_BRANCH:$UPSTREAM_BRANCH --no-verify --force-with-lease && echo \"\n\n 🏃 E2E test are running at:\nhttps://app.circleci.com/pipelines/github/aws-amplify/amplify-cli?branch=$UPSTREAM_BRANCH\"",
     "cloud-e2e": "CURR_BRANCH=$(git branch | awk '/\\*/{printf \"%s\", $2}') && UPSTREAM_BRANCH=run-e2e/$USER/$CURR_BRANCH && git push $(git remote -v | grep aws-amplify/amplify-cli | head -n1 | awk '{print $1;}') $CURR_BRANCH:$UPSTREAM_BRANCH --no-verify --force-with-lease && echo \"\n\n 🏃 E2E test are running at:\nhttps://app.circleci.com/pipelines/github/aws-amplify/amplify-cli?branch=$UPSTREAM_BRANCH\"",
     "commit": "git-cz",
     "coverage:collect": "ts-node ./scripts/collect-test-coverage.ts",
     "coverage": "codecov || exit 0",
     "e2e": "lerna run e2e",
-    "extract-api": "lerna run extract-api",
+    "extract-api": "lerna run extract-api --concurrency 4",
     "extract-formatting-changes": "yarn ts-node ./scripts/extract-formatting-changes.ts",
     "finish-release": "ts-node ./scripts/finish-release.ts",
     "link-aa-dev": "mkdir -p .bin/ && cd packages/amplify-app && ln -s \"$(pwd)/bin/amplify-app\" ../../.bin/amplify-app-dev && cd ../../",
@@ -49,7 +49,7 @@
     "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .circleci/config.yml",
     "test-changed": "lerna run test --since dev",
     "test-ci": "lerna run test --concurrency 4 -- --ci -i",
-    "test": "lerna run test",
+    "test": "lerna run test --concurrency 1",
     "update-data-packages": "./scripts/update-data-dependencies.sh && yarn",
     "update-test-timing-data": "ts-node ./scripts/cci-get-job-metrics.ts && ts-node ./scripts/cci-extract-test-timings-from-job-metrics.ts",
     "update-versions": "lerna version --yes --no-commit-hooks --no-push --exact --conventional-commits --no-git-tag-version",

packages/amplify-category-auth/package.json

@@ -56,6 +56,7 @@
     "@aws-sdk/client-cognito-identity-provider": "^3.303.0",
     "@types/mime-types": "^2.1.1",
     "cloudform-types": "^4.2.0",
+    "jest": "^29.5.0",
     "rimraf": "^3.0.2"
   },
   "jest": {

packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts

@@ -82,10 +82,10 @@ describe('generateCognitoStackResources', () => {
     cognitoStack.createOAuthCustomResource();
     expect(cognitoStack.oAuthCustomResource).toBeDefined();
     expect(
-cognitoStack.
-oAuthCustomResource!.node!.dependencies!.map((dep: any) => dep.logicalId).
-map((logicalIdToken) => /testCognitoStack\.([^.]+)\.Default/.exec(logicalIdToken)![1])).
-toMatchInlineSnapshot(`
+      cognitoStack
+        .oAuthCustomResource!.node!.dependencies!.map((dep: any) => dep.logicalId)
+        .map((logicalIdToken) => /testCognitoStack\.([^.]+)\.Default/.exec(logicalIdToken)![1]),
+    ).toMatchInlineSnapshot(`
 [
   "HostedUICustomResourceInputs",
   "HostedUIProvidersCustomResourceInputs",

packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/index.test.ts

@@ -1,7 +1,9 @@
 import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { updateConfigOnEnvInit } from '../../../provider-utils/awscloudformation/index';
+import { getOAuthObjectFromCognito } from '../../../provider-utils/awscloudformation/utils/get-oauth-secrets-from-cognito';
 
 jest.mock('@aws-amplify/amplify-environment-parameters');
+jest.mock('../../../provider-utils/awscloudformation/utils/get-oauth-secrets-from-cognito');
 jest.mock('@aws-amplify/amplify-cli-core', () => ({
   ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   JSONUtilities: {
@@ -18,12 +20,14 @@ jest.mock('@aws-amplify/amplify-cli-core', () => ({
 const pluginInstanceMock = jest.fn();
 const loadResourceParametersMock = jest.fn().mockReturnValue({
   hostedUIProviderMeta:
-    '[{"ProviderName":"Facebook","authorize_scopes":"email,public_profile","AttributeMapping":{"email":"email","username":"id"}},{"ProviderName":"LoginWithAmazon","authorize_scopes":"profile profile:user_id","AttributeMapping":{"email":"email","username":"user_id"}},{"ProviderName":"Google","authorize_scopes":"openid email profile","AttributeMapping":{"email":"email","username":"sub"}}]',
+    '[{"ProviderName":"Facebook","authorize_scopes":"email,public_profile","AttributeMapping":{"email":"email","username":"id"}},{"ProviderName":"LoginWithAmazon","authorize_scopes":"profile profile:user_id","AttributeMapping":{"email":"email","username":"user_id"}},{"ProviderName":"Google","authorize_scopes":"openid email profile","AttributeMapping":{"email":"email","username":"sub"}},{"ProviderName":"SignInWithApple","authorize_scopes":"openid email profile","AttributeMapping":{"email":"email","username":"sub"}}]',
 });
 const pluginInstance = {
   loadResourceParameters: loadResourceParametersMock,
 };
 
+const getOAuthObjectFromCognitoMock = getOAuthObjectFromCognito as jest.MockedFunction<typeof getOAuthObjectFromCognito>;
+
 // mock context
 let mockContext = {
   amplify: {
@@ -61,8 +65,106 @@ let mockContext = {
   },
 } as unknown as $TSContext;
 
-test('throws amplify error when auth headless params are missing during pull', async () => {
-  expect(() => updateConfigOnEnvInit(mockContext, 'auth', 'Cognito')).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"auth headless is missing the following inputParameters facebookAppIdUserPool, facebookAppSecretUserPool, loginwithamazonAppIdUserPool, loginwithamazonAppSecretUserPool, googleAppIdUserPool, googleAppSecretUserPool"`,
-  );
+describe('import checks', () => {
+  test('throws amplify error when auth headless params are missing during pull', async () => {
+    expect(() => updateConfigOnEnvInit(mockContext, 'auth', 'Cognito')).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"auth headless is missing the following inputParameters facebookAppIdUserPool, facebookAppSecretUserPool, loginwithamazonAppIdUserPool, loginwithamazonAppSecretUserPool, googleAppIdUserPool, googleAppSecretUserPool"`,
+    );
+  });
+});
+
+describe('update config when amplify pull headless command', () => {
+  test('throws amplify error when auth headless params are missing during pull', async () => {
+    mockContext.input.command = 'pull';
+    getOAuthObjectFromCognitoMock.mockResolvedValue(undefined);
+    expect(() => updateConfigOnEnvInit(mockContext, 'auth', 'Cognito')).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"auth headless is missing the following inputParameters facebookAppIdUserPool, facebookAppSecretUserPool, loginwithamazonAppIdUserPool, loginwithamazonAppSecretUserPool, googleAppIdUserPool, googleAppSecretUserPool"`,
+    );
+  });
+
+  test('works when secrets are fetched from userpool', async () => {
+    mockContext.input.command = 'pull';
+    getOAuthObjectFromCognitoMock.mockResolvedValue([
+      {
+        client_id: 'mockClientFacebook',
+        client_secret: 'mockSecretFacebook',
+        ProviderName: 'Facebook',
+      },
+      {
+        client_id: 'mockClientGoogle',
+        client_secret: 'mockSecretGoogle',
+        ProviderName: 'Google',
+      },
+      {
+        client_id: 'mockClientLoginWithAmazon',
+        client_secret: 'mockSecretLoginWithAmazon',
+        ProviderName: 'LoginWithAmazon',
+      },
+      {
+        client_id: 'mockClientSignInWithApple',
+        team_id: 'mockTeamIdSignInWithApple',
+        key_id: 'mockKeyIdSignInWithApple',
+        private_key: 'mockPrivayKeySignInWithApple',
+        ProviderName: 'SignInWithApple',
+      },
+    ]);
+    const params = await updateConfigOnEnvInit(mockContext, 'auth', 'Cognito');
+    expect(params).toMatchInlineSnapshot(`
+      {
+        "hostedUIProviderCreds": "[{"ProviderName":"Facebook"},{"ProviderName":"LoginWithAmazon"},{"ProviderName":"Google"},{"ProviderName":"SignInWithApple"}]",
+      }
+    `);
+  });
+
+  test('works when secrets are present in deployment params', async () => {
+    mockContext.input.command = 'pull';
+    getOAuthObjectFromCognitoMock.mockResolvedValue(undefined);
+    mockContext.amplify.loadEnvResourceParameters = jest.fn().mockReturnValue({
+      hostedUIProviderCreds:
+        '[{"ProviderName":"Facebook","client_id":"sdcsdc","client_secret":"bfdsvsr"},{"ProviderName":"Google","client_id":"avearver","client_secret":"vcvereger"},{"ProviderName":"LoginWithAmazon","client_id":"vercvdsavcer","client_secret":"revfdsavrtv"},{"ProviderName":"SignInWithApple","client_id":"vfdvergver","team_id":"ervervre","key_id":"vfdavervfer","private_key":"vaveb"}]',
+    });
+    const params = await updateConfigOnEnvInit(mockContext, 'auth', 'Cognito');
+    expect(params).toMatchInlineSnapshot(`
+      {
+        "hostedUIProviderCreds": "[{"ProviderName":"Facebook"},{"ProviderName":"LoginWithAmazon"},{"ProviderName":"Google"},{"ProviderName":"SignInWithApple"}]",
+      }
+    `);
+  });
+
+  test('test works when secrets are present in context input params', async () => {
+    mockContext.input.command = 'pull';
+    getOAuthObjectFromCognitoMock.mockResolvedValue(undefined);
+    mockContext.amplify.loadEnvResourceParameters = jest.fn().mockReturnValue('[]');
+    mockContext.exeInfo = {
+      inputParams: {
+        yes: true,
+        categories: {
+          auth: {
+            facebookAppIdUserPool: 'mockfacebookAppIdUserPool',
+            facebookAppSecretUserPool: 'facebookAppSecretUserPool',
+            googleAppIdUserPool: 'googleAppIdUserPool',
+            googleAppSecretUserPool: 'googleAppSecretUserPool',
+            loginwithamazonAppIdUserPool: 'loginwithamazonAppIdUserPool',
+            loginwithamazonAppSecretUserPool: 'loginwithamazonAppSecretUserPool',
+            signinwithappleClientIdUserPool: 'signinwithappleClientIdUserPool',
+            signinwithappleTeamIdUserPool: 'signinwithappleTeamIdUserPool',
+            signinwithappleKeyIdUserPool: 'signinwithappleKeyIdUserPool',
+            signinwithapplePrivateKeyUserPool: 'signinwithapplePrivateKeyUserPool',
+          },
+        },
+      },
+      localEnvInfo: {
+        projectPath: 'mockProjectPath',
+        defaultEditor: 'vscode',
+        envName: 'dev',
+        noUpdateBackend: false,
+      },
+    };
+    const params = await updateConfigOnEnvInit(mockContext, 'auth', 'Cognito');
+    expect(params).toMatchInlineSnapshot(`
+      {
+        "hostedUIProviderCreds": "[{"ProviderName":"Facebook","client_id":"mockfacebookAppIdUserPool","client_secret":"facebookAppSecretUserPool"},{"ProviderName":"LoginWithAmazon","client_id":"loginwithamazonAppIdUserPool","client_secret":"loginwithamazonAppSecretUserPool"},{"ProviderName":"Google","client_id":"googleAppIdUserPool","client_secret":"googleAppSecretUserPool"},{"ProviderName":"SignInWithApple","client_id":"signinwithappleClientIdUserPool","team_id":"signinwithappleTeamIdUserPool","key_id":"signinwithappleKeyIdUserPool","private_key":"signinwithapplePrivateKeyUserPool"}]",
+      }
+    `);
+  });
 });

packages/amplify-category-auth/src/provider-utils/awscloudformation/import/index.ts

@@ -897,7 +897,7 @@ const createEnvSpecificResourceParameters = (
   return envSpecificResourceParameters;
 };
 
-const createOAuthCredentials = (identityProviders: IdentityProviderType[]): string => {
+export const createOAuthCredentials = (identityProviders: IdentityProviderType[]): string => {
   const credentials = identityProviders.map((idp) => {
     if (idp.ProviderName === 'SignInWithApple') {
       return {

packages/amplify-category-auth/src/provider-utils/awscloudformation/index.ts

@@ -10,6 +10,7 @@ import { getAddAuthHandler, getUpdateAuthHandler } from './handlers/resource-han
 import { getSupportedServices } from '../supported-services';
 import { importResource, importedAuthEnvInit } from './import';
 import { AuthContext } from '../../context';
+import { getOAuthObjectFromCognito } from './utils/get-oauth-secrets-from-cognito';
 
 export { importResource } from './import';
 
@@ -133,6 +134,14 @@ export const updateConfigOnEnvInit = async (context: $TSContext, category: any,
 
   if (hostedUIProviderMeta) {
     currentEnvSpecificValues = getOAuthProviderKeys(currentEnvSpecificValues, resourceParams);
+    const authParamsFromCognito = await getOAuthObjectFromCognito(context, resourceParams.userPoolName);
+    // fill in the OAuthProvider Keys from userpool if missing from currentEnvValues
+    if (authParamsFromCognito) {
+      currentEnvSpecificValues = {
+        ...getOAuthProviderKeys({ hostedUIProviderCreds: JSON.stringify(authParamsFromCognito) }, resourceParams),
+        ...currentEnvSpecificValues,
+      };
+    }
   }
 
   // legacy headless mode (only supports init)