changing the project configuration

Author: annahileta

Quick_ACG/src/main/java/com/docusign/WebSecurityConfig.java

@@ -28,26 +28,24 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                     try {
                         authorize
                                 .antMatchers("/", "/error**", "/assets/**", "/ds/mustAuthenticate**",
-                                        "/ds/authenticate**", "/ds/selectApi**")
+                                        "/ds/authenticate**", "/ds/selectApi**", "/pkce")
                                 .permitAll()
                                 .anyRequest().authenticated()
                                 .and()
                                 .exceptionHandling()
                                 .authenticationEntryPoint(
-                                        new LoginUrlAuthenticationEntryPoint("/ds/mustAuthenticate")
-                                );
+                                        new LoginUrlAuthenticationEntryPoint("/ds/mustAuthenticate"));
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
                 })
                 .requestCache().requestCache(requestCache()).and()
-                .oauth2Login(Customizer.withDefaults())
+                .oauth2Login(login -> login.failureHandler(new CustomAuthenticationFailureHandler()))
                 .oauth2Client(Customizer.withDefaults())
                 .logout(logout -> logout
-                        .logoutSuccessUrl("/")
-                )
+                        .logoutSuccessUrl("/"))
                 .csrf().disable();
 
-        return  http.build();
+        return http.build();
     }
 }

Quick_ACG/src/main/java/com/docusign/core/controller/IndexController.java

@@ -72,15 +72,38 @@ public ModelAndView mustAuthenticateController(ModelMap model) throws IOExceptio
     @GetMapping(path = "/ds-return")
     public String returnController(@RequestParam(value = ATTR_STATE, required = false) String state,
             @RequestParam(value = ATTR_EVENT, required = false) String event,
-            @RequestParam(required = false) String envelopeId, ModelMap model, HttpServletResponse response) throws IOException {
+            @RequestParam(required = false) String envelopeId, ModelMap model, HttpServletResponse response)
+            throws IOException {
         String site = "/eg001";
         response.setStatus(response.SC_MOVED_TEMPORARILY);
         response.setHeader("Location", site);
         return null;
     }
 
+    @GetMapping("/pkce")
+    public RedirectView pkce(String code, String state, HttpServletRequest req, HttpServletResponse resp)
+            throws Exception {
+        String redirectURL = getRedirectURLForJWTAuthentication(req, resp);
+        RedirectView redirect;
+        try {
+            redirect = new ACGAuthenticationMethod().exchangeCodeForToken(code, config, session, redirectURL,
+                    "signature");
+        } catch (Exception e) {
+            redirect = getRedirectView(getLoginPath());
+            this.session.setIsPKCEWorking(false);
+        }
+
+        return redirect;
+    }
+
     private RedirectView getRedirectView() {
-        RedirectView redirect = new RedirectView(getLoginPath());
+        this.session.setAuthTypeSelected(AuthType.AGC);
+        if (this.session.getIsPKCEWorking()) {
+            RedirectView redirect = new ACGAuthenticationMethod().initiateAuthorization(config, "signature");
+        } else {
+            RedirectView redirect = getRedirectView(getLoginPath());
+        }
+
         redirect.setExposeModelAttributes(false);
         return redirect;
     }
@@ -111,8 +134,7 @@ public Object populateLocals() throws IOException {
         OAuth2User oauthUser = oauth.getPrincipal();
         OAuth2AuthorizedClient oauthClient = authorizedClientService.loadAuthorizedClient(
                 oauth.getAuthorizedClientRegistrationId(),
-                oauthUser.getName()
-        );
+                oauthUser.getName());
 
         if (oauth.isAuthenticated()) {
             user.setName(oauthUser.getAttribute("name"));
@@ -139,7 +161,7 @@ private String getBaseUrl(OAuth.Account oauthAccount) {
 
     private static List<OAuth.Account> getOAuthAccounts(OAuth2User user) {
         List<Map<String, Object>> oauthAccounts = user.getAttribute("accounts");
-        if(oauthAccounts == null){
+        if (oauthAccounts == null) {
             return new ArrayList<>();
         }
 
@@ -152,7 +174,7 @@ private OAuth.Account getDefaultAccountInfo(List<OAuth.Account> accounts) {
         String targetAccountId = config.getTargetAccountId();
         if (StringUtils.isNotBlank(targetAccountId)) {
             OAuth.Account account = getAccountById(accounts, targetAccountId);
-            if(account != null) {
+            if (account != null) {
                 return account;
             }
         }