Create specifi jdl for oauth

Author: nicolas63

.blueprint/generate-sample/generator.mjs

@@ -60,14 +60,18 @@ export default class extends BaseGenerator {
         }
       },
       async jdlEntities() {
-        if (this.withEntities) {
+        if (this.withEntities) {          
           if (this.sampleName.includes('-mongo-')) {
-            this.jdlSample = 'app_mongo.jdl';
+            this.jdlSample = 'app_mongo';
           } else if (this.sampleName.includes('-react-')) {
-            this.jdlSample = 'app-react.jdl';
+            this.jdlSample = 'app-react';
           } else {
-            this.jdlSample = 'app.jdl';
+            this.jdlSample = 'app';
           }
+          if (this.sampleName.includes('oauth-')) {
+            this.jdlSample = this.jdlSample+'_oauth';
+          }
+          this.jdlSample = this.jdlSample+'.jdl';
           this.copyTemplate(`samples/jdl-default/${this.jdlSample}`, this.jdlSample, { noGlob: true });
         }
       },

.blueprint/generate-sample/templates/samples/jdl-default/app-react_oauth.jdl

@@ -0,0 +1,115 @@
+entity Region {
+	regionName String
+}
+
+entity Country {
+	countryName String
+}
+
+// an ignored comment
+/** not an ignored comment */
+entity Location {
+	streetAddress String,
+	postalCode String,
+	city String,
+	stateProvince String
+}
+
+entity Department {
+	departmentName String required
+}
+
+/**
+ * PieceOfWork entity.
+ * @author The JHipster team.
+ */
+entity PieceOfWork {
+	title String,
+	description String
+}
+
+/**
+ * The Employee entity.
+ */
+entity Employee {
+	/**
+	* The firstname attribute.
+	*/
+	firstName String,
+	lastName String,
+	email String,
+	phoneNumber String,
+	hireDate Instant,
+	salary Long,
+	commissionPct Long
+}
+
+entity Job {
+	jobTitle String,
+	minSalary Long,
+	maxSalary Long
+}
+
+entity JobHistory {
+	startDate Instant,
+	endDate Instant,
+    language Language
+}
+
+enum Language {
+    FRENCH, ENGLISH, SPANISH
+}
+
+relationship OneToOne {
+	Country{region} to Region
+}
+
+relationship OneToOne {
+	Location{country} to Country
+}
+
+relationship OneToOne {
+	Department{location} to Location
+}
+
+// defining multiple OneToMany relationships with comments
+relationship OneToMany {
+	Employee to Job{employee},
+	/**
+	* A relationship
+	*/
+	Department to
+	/**
+	* Another side of the same relationship
+	*/
+	Employee{department}
+}
+
+relationship ManyToOne {
+	Employee{manager} to Employee
+}
+
+// defining multiple oneToOne relationships
+relationship OneToOne {
+	JobHistory{job} to Job,
+	JobHistory{department} to Department,
+	JobHistory{employee} to Employee
+}
+
+relationship ManyToMany {
+	Job{chore(title)} to PieceOfWork{job}
+}
+
+// Set pagination options
+// .Net does not generates link header for pagination.
+// paginate JobHistory, Employee with infinite-scroll
+// paginate Job with pagination
+
+// Use Data Transfert Objects (DTO)
+dto * with mapstruct
+
+// Set service options to all except few
+service all with serviceImpl except Employee, Job
+
+// Set an angular suffix
+// angularSuffix * with mySuffix

.blueprint/generate-sample/templates/samples/jdl-default/app_mongo_oauth.jdl

@@ -0,0 +1,113 @@
+entity Region {
+	regionName String
+}
+
+entity Country {
+	countryName String
+}
+
+// an ignored comment
+/** not an ignored comment */
+entity Location {
+	streetAddress String,
+	postalCode String,
+	city String,
+	stateProvince String
+}
+
+entity Department {
+	departmentName String required
+}
+
+/**
+ * PieceOfWork entity.
+ * @author The JHipster team.
+ */
+entity PieceOfWork {
+	title String,
+	description String
+}
+
+/**
+ * The Employee entity.
+ */
+entity Employee {
+	/**
+	* The firstname attribute.
+	*/
+	firstName String,
+	lastName String,
+	email String,
+	phoneNumber String,
+	hireDate Instant,
+	salary Long,
+	commissionPct Long
+}
+
+entity Job {
+	jobTitle String,
+	minSalary Long,
+	maxSalary Long
+}
+
+entity JobHistory {
+	startDate Instant,
+	endDate Instant,
+    language Language
+}
+
+enum Language {
+    FRENCH, ENGLISH, SPANISH
+}
+
+relationship OneToOne {
+	Country{region} to Region
+}
+
+relationship OneToOne {
+	Location{country} to Country
+}
+
+relationship OneToOne {
+	Department{location} to Location
+}
+
+// defining multiple OneToMany relationships with comments
+relationship OneToMany {
+	Employee to Job{employee},
+	/**
+	* A relationship
+	*/
+	Department to
+	/**
+	* Another side of the same relationship
+	*/
+	Employee{department}
+}
+
+relationship ManyToOne {
+	Employee{manager} to Employee
+}
+
+// defining multiple oneToOne relationships
+relationship OneToOne {
+	JobHistory{job} to Job,
+	JobHistory{department} to Department,
+	JobHistory{employee} to Employee
+}
+
+relationship ManyToMany {
+	Job{chore(title)} to PieceOfWork{job}
+}
+
+// Set pagination options
+paginate * with pagination
+
+// Use Data Transfert Objects (DTO)
+dto * with mapstruct
+
+// Set service options to all except few
+service all with serviceImpl except Employee, Job
+
+// Set an angular suffix
+// angularSuffix * with mySuffix

.blueprint/generate-sample/templates/samples/jdl-default/app_oauth.jdl

@@ -0,0 +1,132 @@
+entity Region {
+	regionName String
+}
+
+entity Country {
+	countryName String
+}
+
+// an ignored comment
+/** not an ignored comment */
+entity Location {
+	streetAddress String,
+	postalCode String,
+	city String,
+	stateProvince String
+}
+
+entity Department {
+	departmentName String required
+}
+
+/**
+ * PieceOfWork entity.
+ * @author The JHipster team.
+ */
+entity PieceOfWork {
+	title String,
+	description String
+}
+
+/**
+ * The Employee entity.
+ */
+entity Employee {
+	/**
+	* The firstname attribute.
+	*/
+	firstName String,
+	lastName String,
+	email String,
+	phoneNumber String,
+	hireDate Instant,
+	salary Long,
+	commissionPct Long
+}
+
+entity Job {
+	jobTitle String,
+	minSalary Long,
+	maxSalary Long
+}
+
+entity JobHistory {
+	startDate Instant,
+	endDate Instant,
+    language Language
+}
+
+entity TimeSheet {
+	id UUID
+	timeSheetDate LocalDate
+}
+
+entity TimeSheetEntry {
+	activityName String
+	startTimeMilitary Integer
+	endTimeMilitary Integer
+	totalTime BigDecimal
+}
+
+enum Language {
+    FRENCH, ENGLISH, SPANISH
+}
+
+
+
+relationship OneToOne {
+	Country{region} to Region
+}
+
+relationship OneToOne {
+	Location{country} to Country
+}
+
+relationship OneToOne {
+	Department{location} to Location
+}
+
+// defining multiple OneToMany relationships with comments
+relationship OneToMany {
+	Employee to Job{employee},
+	/**
+	* A relationship
+	*/
+	Department to
+	/**
+	* Another side of the same relationship
+	*/
+	Employee{department}
+	
+	Employee to TimeSheet{employee}
+
+	TimeSheet to TimeSheetEntry{timeSheet}
+}
+
+relationship ManyToOne {
+	Employee{manager} to Employee
+}
+
+// defining multiple oneToOne relationships
+relationship OneToOne {
+	JobHistory{job} to Job,
+	JobHistory{department} to Department,
+	JobHistory{employee} to Employee
+}
+
+relationship ManyToMany {
+	Job{chore(title)} to PieceOfWork{job}
+}
+
+// Set pagination options
+paginate JobHistory, Employee with infinite-scroll
+paginate Job with pagination
+
+// Use Data Transfert Objects (DTO)
+dto * with mapstruct
+
+// Set service options to all except few
+service all with serviceImpl except Employee, Job
+
+// Set an angular suffix
+// angularSuffix * with mySuffix

generators/dotnetcore/generator.js

@@ -45,9 +45,6 @@ export default class extends BaseApplicationGenerator {
         if (this.jhipsterConfig.jwtSecretKey === undefined) {
           this.jhipsterConfig.jwtSecretKey = createBase64Secret(this.options.reproducibleTests);
         }
-        if(this.jhipsterConfig.authenticationType === 'oauth2') {
-          this.jhipsterConfig.syncUserWithIdp = true;
-        }
       },
     });
   }