Merge pull request #362 from amplication/fix/seed-auth-auth0

refactor(auth): move auth-core seed event to auth plugins that need it

libs/auth-core/package.json

@@ -6,7 +6,6 @@
   "peerDependencies": {
     "@amplication/code-gen-types": "^2.0.23",
     "@amplication/code-gen-utils": "^0.0.9",
-    "@babel/types": "7.24.0",
     "ast-types": "0.14.2",
     "dotenv": "16.3.2",
     "lodash": "^4.17.21",

libs/auth-core/src/auth-core-plugin.spec.ts

@@ -2,7 +2,6 @@ import { EventNames, Events } from "@amplication/code-gen-types";
 import { AuthCorePlugin } from "./auth-core-plugin";
 import {
   afterCreateAppModule,
-  afterCreateSeed,
   afterCreateServerAuth,
   afterCreateServerPackageJson,
   beforeCreateAppModule,
@@ -15,7 +14,6 @@ import {
   beforeCreateEntityResolverToOneRelationMethods,
   beforeCreateResolverBaseModule,
   beforeCreateResolverModule,
-  beforeCreateSeed,
   beforeCreateServer,
   beforeCreateServerDotEnv,
   beforeCreateServerPackageJson,
@@ -84,10 +82,6 @@ describe("AuthCorePlugin", () => {
       CreateEntityResolverToOneRelationMethods: {
         before: beforeCreateEntityResolverToOneRelationMethods,
       },
-      CreateSeed: {
-        before: beforeCreateSeed,
-        after: afterCreateSeed,
-      },
       CreateServer: {
         before: beforeCreateServer,
       },
@@ -136,10 +130,6 @@ describe("AuthCorePlugin", () => {
       CreateEntityResolverToOneRelationMethods: {
         before: beforeCreateEntityResolverToOneRelationMethods,
       },
-      CreateSeed: {
-        before: beforeCreateSeed,
-        after: afterCreateSeed,
-      },
       CreateServer: {
         before: beforeCreateServer,
       },

libs/auth-core/src/auth-core-plugin.ts

@@ -5,7 +5,6 @@ import {
 } from "@amplication/code-gen-types";
 import {
   afterCreateAppModule,
-  afterCreateSeed,
   afterCreateServerAuth,
   beforeCreateAppModule,
   beforeCreateEntityControllerModule,
@@ -15,7 +14,6 @@ import {
   beforeCreateEntityResolverToOneRelationMethods,
   beforeCreateResolverBaseModule,
   beforeCreateResolverModule,
-  beforeCreateSeed,
   beforeCreateServer,
   beforeCreateServerDotEnv,
   beforeCreateServerPackageJson,
@@ -70,10 +68,6 @@ export abstract class AuthCorePlugin implements AmplicationPlugin {
       CreateEntityResolverToOneRelationMethods: {
         before: beforeCreateEntityResolverToOneRelationMethods,
       },
-      CreateSeed: {
-        before: beforeCreateSeed,
-        after: afterCreateSeed,
-      },
       CreateServer: {
         before: beforeCreateServer,
       },

libs/auth-core/src/core/user-entity.ts

@@ -4,7 +4,6 @@ import {
   EntityField,
   EnumEntityPermissionType,
   EnumEntityAction,
-  DsgContext,
 } from "@amplication/code-gen-types";
 
 export const USER_ENTITY_NAME = "User";

libs/auth-core/src/index.ts

@@ -7,7 +7,6 @@ export * from "./events/create-entity-resolver-base";
 export * from "./events/create-entity-resolver-to-many-relation-methods";
 export * from "./events/create-entity-resolver-to-one-relation-methods";
 export * from "./events/create-entity-resolver";
-export * from "./events/create-seeds";
 export * from "./events/create-server-app-module";
 export * from "./events/create-server-auth";
 export * from "./events/create-server-dotenv";

plugins/auth-basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-auth-basic",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "set basic auth for Amplication build",
   "main": "dist/index.js",
   "nx": {},

libs/auth-core/src/events/create-seeds.ts → plugins/auth-basic/src/events/createSeed.ts

@@ -1,20 +1,14 @@
-import {
-  DsgContext,
-  CreateSeedParams,
-  ModuleMap,
-} from "@amplication/code-gen-types";
+import { CreateSeedParams, DsgContext } from "@amplication/code-gen-types";
+import { addImports, importNames, interpolate } from "../util/ast";
 import { builders, namedTypes } from "ast-types";
-import { interpolate, importNames, addImports } from "../util/ast";
 import {
-  BlockStatement,
   IfStatement,
-  Statement,
   FunctionDeclaration,
+  BlockStatement,
+  Statement,
   Identifier,
   TSTypeAnnotation,
 } from "@babel/types";
-import { resolve } from "path";
-import { getStaticFiles } from "../util/file";
 
 export async function beforeCreateSeed(
   context: DsgContext,
@@ -175,18 +169,3 @@ export async function beforeCreateSeed(
 
   return eventParams;
 }
-
-export async function afterCreateSeed(
-  context: DsgContext,
-  eventParams: CreateSeedParams,
-  modules: ModuleMap
-): Promise<ModuleMap> {
-  const staticPath = resolve(__dirname, "./static/scripts");
-  const staticsFiles = await getStaticFiles(
-    context,
-    context.serverDirectories.scriptsDirectory,
-    staticPath
-  );
-  await modules.merge(staticsFiles);
-  return modules;
-}

plugins/auth-basic/src/index.ts

@@ -31,6 +31,7 @@ import {
   AUTH_ENTITY_FIELD_PASSWORD,
   AUTH_ENTITY_FIELD_USERNAME,
 } from "./constants";
+import { beforeCreateSeed } from "./events/createSeed";
 
 const ARGS_ID = builders.identifier("args");
 const PASSWORD_FIELD_ASYNC_METHODS = new Set(["create", "update"]);
@@ -61,6 +62,9 @@ class BasicAuthPlugin implements AmplicationPlugin {
       CreateEntityServiceBase: {
         before: this.beforeCreateEntityServiceBase,
       },
+      CreateSeed: {
+        before: beforeCreateSeed,
+      },
     };
   }
 

libs/auth-core/src/tests/beforeCreateSeed.spec.ts → plugins/auth-basic/src/tests/beforeCreateSeed.spec.ts

@@ -3,7 +3,7 @@ import { parse } from "@amplication/code-gen-utils";
 import { mock } from "jest-mock-extended";
 import { prettyPrint } from "recast";
 import { name } from "../../package.json";
-import { beforeCreateSeed } from "../events/create-seeds";
+import { beforeCreateSeed } from "../events/createSeed";
 
 describe("Testing beforeCreateSeed hook", () => {
   let context: DsgContext;

plugins/auth-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-auth-core",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "set auth for Amplication build",
   "main": "dist/index.js",
   "nx": {},