oauth2 adjusts.

jhipster · Nov 13, 2022 · 8d326e0 · 8d326e0
1 parent 42019fb
commit 8d326e0
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 73 deletions.
diff --git a/generators/liquibase-changelogs/__snapshots__/incremental-liquibase.spec.mts.snap b/generators/liquibase-changelogs/__snapshots__/incremental-liquibase.spec.mts.snap
@@ -83,6 +83,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -92,21 +99,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -402,6 +402,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -411,21 +418,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -739,6 +739,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -748,21 +755,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -1059,6 +1059,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -1068,21 +1075,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -1458,6 +1458,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -1467,21 +1474,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -1637,6 +1637,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -1646,21 +1653,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -1849,6 +1849,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -1858,21 +1865,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">
@@ -2122,6 +2122,13 @@ Object {
         <addNotNullConstraint   columnName=\\"password_hash\\"
                                 columnDataType=\\"varchar(60)\\"
                                 tableName=\\"jhi_user\\"/>
+        <loadData
+                  file=\\"config/liquibase/data/authority.csv\\"
+                  separator=\\";\\"
+                  tableName=\\"jhi_authority\\"
+                  usePreparedStatements=\\"true\\">
+            <column name=\\"name\\" type=\\"string\\"/>
+        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user.csv\\"
                   separator=\\";\\"
@@ -2131,21 +2138,14 @@ Object {
             <column name=\\"activated\\" type=\\"boolean\\"/>
             <column name=\\"created_date\\" type=\\"timestamp\\"/>
         </loadData>
-        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
-        <loadData
-                  file=\\"config/liquibase/data/authority.csv\\"
-                  separator=\\";\\"
-                  tableName=\\"jhi_authority\\"
-                  usePreparedStatements=\\"true\\">
-            <column name=\\"name\\" type=\\"string\\"/>
-        </loadData>
         <loadData
                   file=\\"config/liquibase/data/user_authority.csv\\"
                   separator=\\";\\"
                   tableName=\\"jhi_user_authority\\"
                   usePreparedStatements=\\"true\\">
             <column name=\\"user_id\\" type=\\"numeric\\"/>
         </loadData>
+        <dropDefaultValue tableName=\\"jhi_user\\" columnName=\\"created_date\\" columnDataType=\\"\${datetimeType}\\"/>
     </changeSet>
 
     <changeSet author=\\"jhipster\\" id=\\"00000000000002\\" context=\\"test\\">

diff --git a/generators/liquibase/files.mts b/generators/liquibase/files.mts
@@ -49,12 +49,12 @@ export const liquibaseFiles: WriteFileSection<LiquibaseGenerator, SpringBootAppl
     {
       condition: generator => Boolean(generator.generateUserManagement),
       path: SERVER_MAIN_RES_DIR,
-      templates: ['config/liquibase/data/user.csv'],
+      templates: ['config/liquibase/data/user.csv', 'config/liquibase/data/user_authority.csv'],
     },
     {
-      condition: generator => Boolean(generator.generateUserManagement),
+      condition: generator => Boolean(generator.generateBuiltInAuthorityEntity),
       path: SERVER_MAIN_RES_DIR,
-      templates: ['config/liquibase/data/authority.csv', 'config/liquibase/data/user_authority.csv'],
+      templates: ['config/liquibase/data/authority.csv'],
     },
   ],
 };
diff --git a/.../liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs b/.../liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs
@@ -133,23 +133,24 @@ _%>
                                  referencedColumnNames="id"
                                  referencedTableName="<%= user.entityTableName %>"/>
   <%_ } _%>
-  <%_ if (generateUserManagement) { _%>
+  <%_ if (generateBuiltInAuthorityEntity) { _%>
         <loadData
                   file="config/liquibase/data/authority.csv"
                   separator=";"
                   tableName="<%= jhiTablePrefix %>_authority"
                   usePreparedStatements="true">
             <column name="name" type="string"/>
         </loadData>
-    <%_ if (!authenticationTypeOauth2) { _%>
+  <%_ } _%>
+  <%_ if (generateUserManagement) { _%>
         <loadData
                   file="config/liquibase/data/user.csv"
                   separator=";"
                   tableName="<%= user.entityTableName %>"
                   usePreparedStatements="true">
-      <%_ if (prodDatabaseTypePostgres) { _%>
+    <%_ if (prodDatabaseTypePostgres) { _%>
             <column name="id" type="<%= idField.loadColumnType %>"/>
-      <%_ } _%>
+    <%_ } _%>
             <column name="activated" type="boolean"/>
             <column name="created_date" type="timestamp"/>
         </loadData>
@@ -160,9 +161,8 @@ _%>
                   usePreparedStatements="true">
             <column name="user_id" type="<%= idField.loadColumnType %>"/>
         </loadData>
-    <%_ } _%>
-        <dropDefaultValue tableName="<%= user.entityTableName %>" columnName="created_date" columnDataType="${datetimeType}"/>
   <%_ } _%>
+        <dropDefaultValue tableName="<%= user.entityTableName %>" columnName="created_date" columnDataType="${datetimeType}"/>
 <%_ } _%>
     </changeSet>
 

diff --git a/generators/server/__snapshots__/elasticsearch.spec.mts.snap b/generators/server/__snapshots__/elasticsearch.spec.mts.snap
@@ -2397,6 +2397,9 @@ Object {
   "src/main/java/com/package/config/WebConfigurer.java": Object {
     "stateCleared": "modified",
   },
+  "src/main/java/com/package/config/dbmigrations/InitialSetupMigration.java": Object {
+    "stateCleared": "modified",
+  },
   "src/main/java/com/package/config/dbmigrations/package-info.java": Object {
     "stateCleared": "modified",
   },