Merge pull request #1446 from pascalgrimaud/front-security-jwt-basic-…

…auth Front: add security JWT basic auth button
jhipster · Apr 23, 2022 · a372b8e · a372b8e
2 parents 3ad6dab + b23851a
commit a372b8e
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 0 deletions.
diff --git a/src/main/webapp/app/springboot/primary/Generator.component.ts b/src/main/webapp/app/springboot/primary/Generator.component.ts
@@ -76,6 +76,14 @@ export default defineComponent({
       }
     };
 
+    const addSpringBootSecurityJWTBasicAuth = async (): Promise<void> => {
+      if (project.value.folder !== '') {
+        await springBootService
+          .addBasicAuthJWT(toProject(project.value))
+          .catch(error => logger.error('Adding SpringBoot Security JWT Basic Auth to project failed', error));
+      }
+    };
+
     const addAngular = async (): Promise<void> => {
       if (project.value.folder !== '') {
         if (isAngularWithStyle.value) {
@@ -151,6 +159,7 @@ export default defineComponent({
       addSpringBoot,
       addSpringBootMvcTomcat,
       addSpringBootSecurityJWT,
+      addSpringBootSecurityJWTBasicAuth,
       addAngular,
       addReact,
       addVue,

diff --git a/src/main/webapp/app/springboot/primary/Generator.vue b/src/main/webapp/app/springboot/primary/Generator.vue
@@ -595,6 +595,15 @@
             >
               Security JWT
             </button>
+
+            <button
+              id="springboot-jwt-basic-auth"
+              class="btn btn-outline-primary"
+              :data-selector="selectorPrefix + '.add-spring-boot-jwt-basic-auth-button'"
+              @click.prevent="addSpringBootSecurityJWTBasicAuth"
+            >
+              Security JWT Basic Auth
+            </button>
           </div>
           <div
             v-if="client === 'angular'"

diff --git a/src/test/javascript/cypress/integration/Generator.spec.ts b/src/test/javascript/cypress/integration/Generator.spec.ts
@@ -26,6 +26,7 @@ describe('Generator', () => {
     cy.get(generatorSelector('add-spring-boot-button')).contains('Spring Boot');
     cy.get(generatorSelector('add-spring-boot-mvc-tomcat-button')).contains('Spring MVC Tomcat');
     cy.get(generatorSelector('add-spring-boot-jwt-button')).contains('Security JWT');
+    cy.get(generatorSelector('add-spring-boot-jwt-basic-auth-button')).contains('Security JWT Basic Auth');
   });
 
   it('should display angular', () => {

diff --git a/src/test/javascript/spec/springboot/primary/Generator.spec.ts b/src/test/javascript/spec/springboot/primary/Generator.spec.ts
@@ -400,6 +400,61 @@ describe('Generator', () => {
     expect(message).toBe('Adding SpringBoot Security JWT to project failed');
   });
 
+  it('should not add SpringBoot Security JWT Basic Auth  when project path is not filled', async () => {
+    const springBootService = stubSpringBootService();
+    springBootService.addBasicAuthJWT.resolves({});
+    await wrap({ springBootService });
+    await selectSection('springboot');
+
+    const button = wrapper.find('#springboot-jwt-basic-auth');
+    await button.trigger('click');
+
+    expect(springBootService.addBasicAuthJWT.called).toBe(false);
+  });
+
+  it('should add SpringBoot Security JWT Basic Auth when project path is filled', async () => {
+    const springBootService = stubSpringBootService();
+    springBootService.addBasicAuthJWT.resolves({});
+    await wrap({ springBootService });
+    const projectToUpdate: ProjectToUpdate = createProjectToUpdate({
+      folder: 'project/path',
+      baseName: 'beer',
+      projectName: 'Beer Project',
+      packageName: 'tech.jhipster.beer',
+      serverPort: '8080',
+    });
+    await fillFullForm(projectToUpdate);
+    await selectSection('springboot');
+
+    const button = wrapper.find('#springboot-jwt-basic-auth');
+    await button.trigger('click');
+
+    const args = springBootService.addBasicAuthJWT.getCall(0).args[0];
+    expect(args).toEqual({
+      baseName: 'beer',
+      folder: 'project/path',
+      projectName: 'Beer Project',
+      packageName: 'tech.jhipster.beer',
+      serverPort: 8080,
+    });
+  });
+
+  it('should handle error on adding SpringBoot Security JWT Basic Auth failure', async () => {
+    const logger = stubLogger();
+    const springBootService = stubSpringBootService();
+    springBootService.addBasicAuthJWT.rejects({});
+    await wrap({ springBootService, logger });
+    const projectToUpdate: ProjectToUpdate = createProjectToUpdate();
+    await fillFullForm(projectToUpdate);
+    await selectSection('springboot');
+
+    const initButton = wrapper.find('#springboot-jwt-basic-auth');
+    await initButton.trigger('click');
+
+    const [message] = logger.error.getCall(0).args;
+    expect(message).toBe('Adding SpringBoot Security JWT Basic Auth to project failed');
+  });
+
   it('should not add Angular when project path is not filled', async () => {
     const angularService = stubAngularService();
     angularService.add.resolves({});