Merge pull request #305 from amplication/fix/auth-jwt

add auth entity service findOne function dynamic name

plugins/auth-core/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.0.5]
+
+This version:
+
+- adds support for new DSG v3.0.0.
+
+### Changes
+
+<li> <a href="http://github.com/amplication/plugins/commit/47277ef2e9daf2c17ccb2c9ebc7f9acbc256bc1d">42a3f2b &bull;</a> feat(auth-core):update auth-service template with a dynamic authEntity findOne function name</li>

plugins/auth-core/package.json

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

plugins/auth-core/src/core/create-auth-service.ts

@@ -16,6 +16,7 @@ import {
 import { builders, namedTypes } from "ast-types";
 import { print } from "@amplication/code-gen-utils";
 import { addInjectableDependency } from "../util/nestjs-code-generation";
+import { camelCase } from "lodash";
 
 const authServicePath = join(templatesPath, "auth.service.template.ts");
 
@@ -74,6 +75,7 @@ async function mapAuthServiceTemplate(
       ENTITY_NAME_INFO: builders.identifier(`${authEntity.name}Info`),
       ENTITY_SERVICE: builders.identifier(`${entityNameToLower}Service`),
       ENTITY_SERVICE_UPPER: builders.identifier(`${authEntity?.name}Service`),
+      FIND_ONE_FUNCTION: builders.identifier(`${camelCase(authEntity?.name) }`)
     };
 
     const filePath = `${serverDirectories.authDirectory}/${fileName}`;

plugins/auth-core/src/templates/auth.service.template.ts

@@ -19,7 +19,7 @@ export class AuthService {
     username: string,
     password: string
   ): Promise<ENTITY_NAME_INFO | null> {
-    const user = await this.ENTITY_SERVICE.findOne({
+    const user = await this.ENTITY_SERVICE.FIND_ONE_FUNCTION({
       where: { username },
     });
     if (user && (await this.passwordService.compare(password, user.password))) {