reerer (Amplication build vccba2qe)

.amplication/ignored/server/.env

@@ -5,5 +5,4 @@ DB_URL=postgres://admin:admin@localhost:5432/my-db
 DB_USER=admin
 DB_PASSWORD=admin
 DB_PORT=5432
-JWT_SECRET_KEY=Change_ME!!!
-JWT_EXPIRATION=2d
+DB_NAME=my-db

admin-ui/src/api/user/User.ts

@@ -8,4 +8,6 @@ export type User = {
   lastName: string | null;
   username: string;
   roles: JsonValue;
+  age: string | null;
+  course: string | null;
 };

admin-ui/src/api/user/UserCreateInput.ts

@@ -6,4 +6,6 @@ export type UserCreateInput = {
   username: string;
   password: string;
   roles: InputJsonValue;
+  age?: string | null;
+  course?: string | null;
 };

admin-ui/src/api/user/UserOrderByInput.ts

@@ -9,4 +9,6 @@ export type UserOrderByInput = {
   username?: SortOrder;
   password?: SortOrder;
   roles?: SortOrder;
+  age?: SortOrder;
+  course?: SortOrder;
 };

admin-ui/src/api/user/UserUpdateInput.ts

@@ -6,4 +6,6 @@ export type UserUpdateInput = {
   username?: string;
   password?: string;
   roles?: InputJsonValue;
+  age?: string | null;
+  course?: string | null;
 };

admin-ui/src/api/user/UserWhereInput.ts

@@ -6,4 +6,6 @@ export type UserWhereInput = {
   firstName?: StringNullableFilter;
   lastName?: StringNullableFilter;
   username?: StringFilter;
+  age?: StringNullableFilter;
+  course?: StringNullableFilter;
 };

admin-ui/src/user/UserCreate.tsx

@@ -25,6 +25,8 @@ export const UserCreate = (props: CreateProps): React.ReactElement => {
           optionText="label"
           optionValue="value"
         />
+        <TextInput label="age" source="age" />
+        <TextInput label="course" source="course" />
       </SimpleForm>
     </Create>
   );

admin-ui/src/user/UserEdit.tsx

@@ -23,6 +23,8 @@ export const UserEdit = (props: EditProps): React.ReactElement => {
           optionText="label"
           optionValue="value"
         />
+        <TextInput label="age" source="age" />
+        <TextInput label="course" source="course" />
       </SimpleForm>
     </Edit>
   );

admin-ui/src/user/UserList.tsx

@@ -19,6 +19,8 @@ export const UserList = (props: ListProps): React.ReactElement => {
         <TextField label="Last Name" source="lastName" />
         <TextField label="Username" source="username" />
         <TextField label="Roles" source="roles" />
+        <TextField label="age" source="age" />
+        <TextField label="course" source="course" />
       </Datagrid>
     </List>
   );

admin-ui/src/user/UserShow.tsx

@@ -18,6 +18,8 @@ export const UserShow = (props: ShowProps): React.ReactElement => {
         <TextField label="Last Name" source="lastName" />
         <TextField label="Username" source="username" />
         <TextField label="Roles" source="roles" />
+        <TextField label="age" source="age" />
+        <TextField label="course" source="course" />
       </SimpleShowLayout>
     </Show>
   );

server/package.json

@@ -39,12 +39,7 @@
     "npm-run-all": "4.1.5",
     "reflect-metadata": "0.1.13",
     "swagger-ui-express": "4.3.0",
-    "ts-node": "9.1.1",
-    "@nestjs/jwt": "^10.0.2",
-    "@nestjs/passport": "^9.0.0",
-    "passport": "0.6.0",
-    "passport-http": "0.3.0",
-    "passport-jwt": "4.0.1"
+    "ts-node": "9.1.1"
   },
   "devDependencies": {
     "@nestjs/cli": "8.2.5",
@@ -61,9 +56,7 @@
     "supertest": "4.0.2",
     "ts-jest": "27.0.3",
     "type-fest": "0.11.0",
-    "typescript": "4.2.3",
-    "@types/passport-http": "0.3.9",
-    "@types/passport-jwt": "3.0.8"
+    "typescript": "4.2.3"
   },
   "jest": {
     "preset": "ts-jest",

server/prisma/schema.prisma

@@ -16,4 +16,6 @@ model User {
   username  String   @unique
   password  String
   roles     Json
+  age       String?
+  course    String?
 }

server/scripts/seed.ts

@@ -1,8 +1,6 @@
 import * as dotenv from "dotenv";
 import { PrismaClient } from "@prisma/client";
 import { customSeed } from "./customSeed";
-import { Salt, parseSalt } from "../src/auth/password.service";
-import { hash } from "bcrypt";
 
 if (require.main === module) {
   dotenv.config();
@@ -12,34 +10,12 @@ if (require.main === module) {
   if (!BCRYPT_SALT) {
     throw new Error("BCRYPT_SALT environment variable must be defined");
   }
-  const salt = parseSalt(BCRYPT_SALT);
-
-  seed(salt).catch((error) => {
-    console.error(error);
-    process.exit(1);
-  });
 }
 
-async function seed(bcryptSalt: Salt) {
+async function seed() {
   console.info("Seeding database...");
 
   const client = new PrismaClient();
-
-  const data = {
-    username: "admin",
-    password: await hash("admin", bcryptSalt),
-    roles: ["user"],
-  };
-
-  await client.user.upsert({
-    where: {
-      username: data.username,
-    },
-
-    update: {},
-    create: data,
-  });
-
   void client.$disconnect();
 
   console.info("Seeding database with custom seed...");

server/src/app.module.ts

@@ -10,14 +10,9 @@ import { ServeStaticModule } from "@nestjs/serve-static";
 import { ServeStaticOptionsService } from "./serveStaticOptions.service";
 import { GraphQLModule } from "@nestjs/graphql";
 
-import { ACLModule } from "./auth/acl.module";
-import { AuthModule } from "./auth/auth.module";
-
 @Module({
   controllers: [],
   imports: [
-    ACLModule,
-    AuthModule,
     UserModule,
     HealthModule,
     PrismaModule,

server/src/swagger.ts

@@ -7,7 +7,7 @@ export const swaggerDocumentOptions = new DocumentBuilder()
   .setDescription(
     '\n\n## Congratulations! Your service resource is ready.\n  \nPlease note that all endpoints are secured with JWT Bearer authentication.\nBy default, your service resource comes with one user with the username "admin" and password "admin".\nLearn more in [our docs](https://docs.amplication.com)'
   )
-  .setVersion("1104a18s")
+  .setVersion("6uk4779j")
   .addBearerAuth()
   .build();
 

server/src/user/base/User.ts

@@ -78,6 +78,28 @@ class User {
   @IsJSON()
   @Field(() => GraphQLJSON)
   roles!: JsonValue;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  age!: string | null;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  course!: string | null;
 }
 
 export { User as User };

server/src/user/base/UserCreateInput.ts

@@ -61,6 +61,28 @@ class UserCreateInput {
   @IsJSON()
   @Field(() => GraphQLJSON)
   roles!: InputJsonValue;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  age?: string | null;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  course?: string | null;
 }
 
 export { UserCreateInput as UserCreateInput };

server/src/user/base/UserOrderByInput.ts

@@ -89,6 +89,24 @@ class UserOrderByInput {
     nullable: true,
   })
   roles?: SortOrder;
+
+  @ApiProperty({
+    required: false,
+    enum: ["asc", "desc"],
+  })
+  @Field(() => SortOrder, {
+    nullable: true,
+  })
+  age?: SortOrder;
+
+  @ApiProperty({
+    required: false,
+    enum: ["asc", "desc"],
+  })
+  @Field(() => SortOrder, {
+    nullable: true,
+  })
+  course?: SortOrder;
 }
 
 export { UserOrderByInput as UserOrderByInput };

server/src/user/base/UserUpdateInput.ts

@@ -70,6 +70,28 @@ class UserUpdateInput {
     nullable: true,
   })
   roles?: InputJsonValue;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  age?: string | null;
+
+  @ApiProperty({
+    required: false,
+    type: String,
+  })
+  @IsString()
+  @IsOptional()
+  @Field(() => String, {
+    nullable: true,
+  })
+  course?: string | null;
 }
 
 export { UserUpdateInput as UserUpdateInput };

server/src/user/base/UserWhereInput.ts

@@ -61,6 +61,28 @@ class UserWhereInput {
     nullable: true,
   })
   username?: StringFilter;
+
+  @ApiProperty({
+    required: false,
+    type: StringNullableFilter,
+  })
+  @Type(() => StringNullableFilter)
+  @IsOptional()
+  @Field(() => StringNullableFilter, {
+    nullable: true,
+  })
+  age?: StringNullableFilter;
+
+  @ApiProperty({
+    required: false,
+    type: StringNullableFilter,
+  })
+  @Type(() => StringNullableFilter)
+  @IsOptional()
+  @Field(() => StringNullableFilter, {
+    nullable: true,
+  })
+  course?: StringNullableFilter;
 }
 
 export { UserWhereInput as UserWhereInput };

server/src/user/base/user.controller.base.spec.ts

@@ -26,6 +26,8 @@ const CREATE_INPUT = {
   lastName: "exampleLastName",
   username: "exampleUsername",
   password: "examplePassword",
+  age: "exampleAge",
+  course: "exampleCourse",
 };
 const CREATE_RESULT = {
   id: "exampleId",
@@ -35,6 +37,8 @@ const CREATE_RESULT = {
   lastName: "exampleLastName",
   username: "exampleUsername",
   password: "examplePassword",
+  age: "exampleAge",
+  course: "exampleCourse",
 };
 const FIND_MANY_RESULT = [
   {
@@ -45,6 +49,8 @@ const FIND_MANY_RESULT = [
     lastName: "exampleLastName",
     username: "exampleUsername",
     password: "examplePassword",
+    age: "exampleAge",
+    course: "exampleCourse",
   },
 ];
 const FIND_ONE_RESULT = {
@@ -55,6 +61,8 @@ const FIND_ONE_RESULT = {
   lastName: "exampleLastName",
   username: "exampleUsername",
   password: "examplePassword",
+  age: "exampleAge",
+  course: "exampleCourse",
 };
 
 const service = {