fix: update CWP template

webiny · Oct 26, 2021 · 4e63c3c · 4e63c3c
1 parent 59c5dea
commit 4e63c3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/packages/cwp-template-aws/template/common/apps/admin/code/src/plugins/index.ts b/packages/cwp-template-aws/template/common/apps/admin/code/src/plugins/index.ts
@@ -1,4 +1,5 @@
 import { plugins } from "@webiny/plugins";
+import { plugins as tenancyPlugins } from "@webiny/app-tenancy";
 import welcomeScreenPlugins from "@webiny/app-plugin-admin-welcome-screen";
 import routeNotFound from "./routeNotFound";
 import basePlugins from "./base";
@@ -44,6 +45,10 @@ plugins.register([
      * Enables storing content (pages, forms, content, ...) in multiple locales.
      */
     i18nContentPlugins,
+    /**
+     * Tenant installation.
+     */
+    tenancyPlugins(),
     /**
      * Security app and authentication plugins.
      */

diff --git a/packages/cwp-template-aws/template/common/apps/admin/code/webiny.config.ts b/packages/cwp-template-aws/template/common/apps/admin/code/webiny.config.ts
@@ -7,7 +7,8 @@ const API_MAP = {
     REACT_APP_GRAPHQL_API_URL: "${apiUrl}/graphql",
     REACT_APP_API_URL: "${apiUrl}",
     REACT_APP_USER_POOL_ID: "${cognitoUserPoolId}",
-    REACT_APP_USER_POOL_WEB_CLIENT_ID: "${cognitoAppClientId}"
+    REACT_APP_USER_POOL_WEB_CLIENT_ID: "${cognitoAppClientId}",
+    REACT_APP_USER_POOL_PASSWORD_POLICY: "${cognitoUserPoolPasswordPolicy}"
 };
 
 const NO_ENV_MESSAGE = `Please specify the environment via the "--env" argument, for example: "--env dev".`;

diff --git a/...es/cwp-template-aws/template/ddb-es/api/code/pageBuilder/exportPages/process/src/index.ts b/...es/cwp-template-aws/template/ddb-es/api/code/pageBuilder/exportPages/process/src/index.ts
@@ -3,8 +3,6 @@ import { createHandler } from "@webiny/handler-aws";
 import i18nPlugins from "@webiny/api-i18n/graphql";
 import i18nDynamoDbStorageOperations from "@webiny/api-i18n-ddb";
 import i18nContentPlugins from "@webiny/api-i18n-content/plugins";
-import adminUsersPlugins from "@webiny/api-security-admin-users";
-import securityAdminUsersDynamoDbStorageOperations from "@webiny/api-security-admin-users-so-ddb";
 import pageBuilderPlugins from "@webiny/api-page-builder/graphql";
 import pageBuilderDynamoDbElasticsearchPlugins from "@webiny/api-page-builder-so-ddb-es";
 import pageBuilderImportExportPlugins from "@webiny/api-page-builder-import-export/graphql";
@@ -34,20 +32,15 @@ export const handler = createHandler({
         elasticSearch({ endpoint: `https://${process.env.ELASTIC_SEARCH_ENDPOINT}` }),
         dbPlugins({
             table: process.env.DB_TABLE,
-            driver: new DynamoDbDriver({
-                documentClient
-            })
+            driver: new DynamoDbDriver({ documentClient })
         }),
-        securityPlugins(),
+        securityPlugins({ documentClient }),
         i18nPlugins(),
         i18nDynamoDbStorageOperations(),
         i18nContentPlugins(),
         fileManagerPlugins(),
         fileManagerDynamoDbElasticStorageOperation(),
-        // Add File storage S3 plugin for API file manager.
         fileManagerS3(),
-        adminUsersPlugins(),
-        securityAdminUsersDynamoDbStorageOperations(),
         pageBuilderPlugins(),
         pageBuilderDynamoDbElasticsearchPlugins(),
         pageBuilderImportExportPlugins({