new build version

okta · Jan 12, 2023 · 680cbe8 · 680cbe8
1 parent 78de9fc
commit 680cbe8
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 53 deletions.
diff --git a/scripts/setup-dockolith.sh b/scripts/setup-dockolith.sh
@@ -4,7 +4,7 @@ DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 source $DIR/setup.sh
 
 # Monolith version to test against
-DEFAULT_BUILDVERSION="2022.12.2-begin-259-gdeb54c572369"
+DEFAULT_BUILDVERSION="2023.01.0-begin-178-g3c9d16dc4c1a"
 export MONOLITH_BUILDVERSION="${MONOLITH_BUILDVERSION:-$DEFAULT_BUILDVERSION}"
 
 set +e

diff --git a/test/support/monolith/create-e2e-env.ts b/test/support/monolith/create-e2e-env.ts
@@ -9,6 +9,49 @@ async function bootstrap() {
   const subDomain = process.env.TEST_ORG_SUBDOMAIN || 'authjs-test-' + Date.now();
   const outputFilePath = path.join(__dirname, '../../../', 'testenv.local');
 
+  const options = {
+    enableFFs: [
+      'API_ACCESS_MANAGEMENT',
+      'ENG_ENABLE_SSU_FOR_OIE',
+    ],
+    disableFFs: [
+      'REQUIRE_PKCE_FOR_OIDC_APPS'
+    ],
+    users: [
+      {
+        firstName: 'Saml',
+        lastName: 'Jackson',
+        email: '[email protected]',
+        password: 'Abcd1234'
+      },
+      {
+        firstName: 'Alexander',
+        lastName: 'Hamilton',
+        email: '[email protected]',
+        password: 'Abcd1234'
+      }
+    ],
+    apps: [
+      {
+        label: 'AUTHJS WEB APP',
+        appType: 'web',
+        interactionCode: true
+      },
+      {
+        label: 'AUTHJS SPA APP',
+        appType: 'browser',
+        interactionCode: true,
+        refreshToken: true
+      }
+    ],
+    origins: [
+      {
+        name: 'AuthJS Test App',
+        origin: 'http://localhost:8080',
+      }
+    ]
+  };
+
   console.error(`Bootstrap starting: ${subDomain}`);
 
   const config = await dockolith.createTestOrg({
@@ -29,6 +72,16 @@ async function bootstrap() {
   await dockolith.enableOIE(orgId);
   await dockolith.activateOrgFactor(config, 'okta_email');
   await dockolith.disableStepUpForPasswordRecovery(config);
+  await dockolith.enableEmbeddedLogin(config);
+
+  // Set Feature flags
+  console.error('Setting feature flags...');
+  for (const option of options.enableFFs) {
+    await dockolith.enableFeatureFlag(config, orgId, option);
+  }
+  for (const option of options.disableFFs) {
+    await dockolith.disableFeatureFlag(config, orgId, option);
+  }
 
   // Enable interaction_code grant on the default authorization server
   const authServer = await dockolith.getDefaultAuthorizationServer(config);
@@ -78,58 +131,6 @@ async function bootstrap() {
   };
   catchAll.update(spaPolicy.id);
 
-  const options = {
-    enableFFs: [
-      'API_ACCESS_MANAGEMENT',
-      'ENG_ENABLE_SSU_FOR_OIE',
-    ],
-    disableFFs: [
-      'REQUIRE_PKCE_FOR_OIDC_APPS'
-    ],
-    users: [
-      {
-        firstName: 'Saml',
-        lastName: 'Jackson',
-        email: '[email protected]',
-        password: 'Abcd1234'
-      },
-      {
-        firstName: 'Alexander',
-        lastName: 'Hamilton',
-        email: '[email protected]',
-        password: 'Abcd1234'
-      }
-    ],
-    apps: [
-      {
-        label: 'AUTHJS WEB APP',
-        appType: 'web',
-        interactionCode: true
-      },
-      {
-        label: 'AUTHJS SPA APP',
-        appType: 'browser',
-        interactionCode: true,
-        refreshToken: true
-      }
-    ],
-    origins: [
-      {
-        name: 'AuthJS Test App',
-        origin: 'http://localhost:8080',
-      }
-    ]
-  };
-
-  // Set Feature flags
-  console.error('Setting feature flags...');
-  for (const option of options.enableFFs) {
-    await dockolith.enableFeatureFlag(config, orgId, option);
-  }
-  for (const option of options.disableFFs) {
-    await dockolith.disableFeatureFlag(config, orgId, option);
-  }
-
   // Add Trusted origins
   for (const option of options.origins) {
     await oktaClient.listOrigins().each(async (origin) => {