feat(ui): fix PR

Author: DelaunayAlex

chutney/server/src/main/java/com/chutneytesting/security/api/SsoOpenIdConnectConfigDto.java

@@ -9,33 +9,8 @@
 
 import java.util.Map;
 
-public class SsoOpenIdConnectConfigDto {
-    public final String issuer;
-    public final String clientId;
-    public final String clientSecret;
-    public final String responseType;
-    public final String scope;
-    public final String redirectBaseUrl;
-    public final String ssoProviderName;
-    public final Boolean oidc;
-    public final String uriRequireHeader;
-    public final Map<String, String> headers;
-    public final String ssoProviderImageUrl;
-    public final Map<String, String> additionalQueryParams;
-
-
-    public SsoOpenIdConnectConfigDto(String issuer, String clientId, String clientSecret, String responseType, String scope, String redirectBaseUrl, String ssoProviderName, Boolean oidc, String uriRequireHeader, Map<String, String> headers, String ssoProviderImageUrl, Map<String, String> additionalQueryParams) {
-        this.issuer = issuer;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.responseType = responseType;
-        this.scope = scope;
-        this.redirectBaseUrl = redirectBaseUrl;
-        this.ssoProviderName = ssoProviderName;
-        this.oidc = oidc;
-        this.uriRequireHeader = uriRequireHeader;
-        this.headers = headers;
-        this.ssoProviderImageUrl = ssoProviderImageUrl;
-        this.additionalQueryParams = additionalQueryParams;
-    }
+public record SsoOpenIdConnectConfigDto(String issuer, String clientId, String clientSecret, String responseType,
+                                        String scope, String redirectBaseUrl, String ssoProviderName, Boolean oidc,
+                                        String uriRequireHeader, Map<String, String> headers,
+                                        String ssoProviderImageUrl, Map<String, String> additionalQueryParams) {
 }

chutney/server/src/main/java/com/chutneytesting/security/api/SsoOpenIdConnectController.java

@@ -8,12 +8,10 @@
 package com.chutneytesting.security.api;
 
 import static com.chutneytesting.security.api.SsoOpenIdConnectMapper.toDto;
-import static java.util.Optional.ofNullable;
 
 import com.chutneytesting.security.infra.sso.SsoOpenIdConnectConfigProperties;
-import java.util.NoSuchElementException;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,20 +20,18 @@
 @RestController
 @RequestMapping(SsoOpenIdConnectController.BASE_URL)
 @CrossOrigin(origins = "*")
-@Profile("sso-auth")
 public class SsoOpenIdConnectController {
 
     public static final String BASE_URL = "/api/v1/sso";
 
     private final SsoOpenIdConnectConfigProperties ssoOpenIdConnectConfigProperties;
 
-    SsoOpenIdConnectController(SsoOpenIdConnectConfigProperties ssoOpenIdConnectConfigProperties) {
+    SsoOpenIdConnectController(@Nullable SsoOpenIdConnectConfigProperties ssoOpenIdConnectConfigProperties) {
         this.ssoOpenIdConnectConfigProperties = ssoOpenIdConnectConfigProperties;
     }
 
     @GetMapping(path = "/config", produces = MediaType.APPLICATION_JSON_VALUE)
     public SsoOpenIdConnectConfigDto getSsoOpenIdConnectConfig() {
-        return ofNullable(toDto(ssoOpenIdConnectConfigProperties))
-            .orElseThrow(NoSuchElementException::new);
+        return toDto(ssoOpenIdConnectConfigProperties);
     }
 }

chutney/server/src/main/java/com/chutneytesting/security/api/SsoOpenIdConnectMapper.java

@@ -7,26 +7,26 @@
 
 package com.chutneytesting.security.api;
 
+import static java.util.Optional.ofNullable;
+
 import com.chutneytesting.security.infra.sso.SsoOpenIdConnectConfigProperties;
 
 public class SsoOpenIdConnectMapper {
     public static SsoOpenIdConnectConfigDto toDto(SsoOpenIdConnectConfigProperties ssoOpenIdConnectConfig) {
-        if (ssoOpenIdConnectConfig == null) {
-            return null;
-        }
-        return new SsoOpenIdConnectConfigDto(
-            ssoOpenIdConnectConfig.issuer,
-            ssoOpenIdConnectConfig.clientId,
-            ssoOpenIdConnectConfig.clientSecret,
-            ssoOpenIdConnectConfig.responseType,
-            ssoOpenIdConnectConfig.scope,
-            ssoOpenIdConnectConfig.redirectBaseUrl,
-            ssoOpenIdConnectConfig.ssoProviderName,
-            ssoOpenIdConnectConfig.oidc,
-            ssoOpenIdConnectConfig.uriRequireHeader,
-            ssoOpenIdConnectConfig.headers,
-            ssoOpenIdConnectConfig.ssoProviderImageUrl,
-            ssoOpenIdConnectConfig.additionalQueryParams
-        );
+        return ofNullable(ssoOpenIdConnectConfig)
+            .map(config -> new SsoOpenIdConnectConfigDto(
+                ssoOpenIdConnectConfig.issuer,
+                ssoOpenIdConnectConfig.clientId,
+                ssoOpenIdConnectConfig.clientSecret,
+                ssoOpenIdConnectConfig.responseType,
+                ssoOpenIdConnectConfig.scope,
+                ssoOpenIdConnectConfig.redirectBaseUrl,
+                ssoOpenIdConnectConfig.ssoProviderName,
+                ssoOpenIdConnectConfig.oidc,
+                ssoOpenIdConnectConfig.uriRequireHeader,
+                ssoOpenIdConnectConfig.headers,
+                ssoOpenIdConnectConfig.ssoProviderImageUrl,
+                ssoOpenIdConnectConfig.additionalQueryParams
+            )).orElse(null);
     }
 }

chutney/server/src/main/java/com/chutneytesting/security/infra/sso/OAuth2SsoUserService.java

@@ -34,7 +34,7 @@ public OAuth2SsoUserService(AuthenticationService authenticationService, @Nullab
 
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
-        org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService delegate = new DefaultOAuth2UserService();
+        DefaultOAuth2UserService delegate = new DefaultOAuth2UserService();
         if (restOperations != null) {
             delegate.setRestOperations(restOperations);
         }

chutney/ui/src/app/core/components/login/login.component.html

@@ -46,11 +46,15 @@ <h3><strong>Login</strong></h3>
           <button type="submit" class="btn btn-primary btn-lg w-100">Login</button>
         </div>
       </form>
-      @if (getSsoProviderName()) {
+      @if (displaySsoButton()) {
         <div class="text-center text-lg-start mt-2 pt-2 d-flex justify-content-center">
-          <button class="btn btn-secondary btn-lg w-100" (click)="connectSso()">
-              <img src="{{getSsoProviderImageUrl()}}" class="ssoImage" alt="sso image"/>
-              <span class="ms-2">{{getSsoProviderName()}}</span>
+          <button class="btn btn-lg" [ngClass]="getSsoProviderName() ? 'btn-secondary' : ''" (click)="connectSso()">
+              @if (getSsoProviderImageUrl()) {
+                <img src="{{getSsoProviderImageUrl()}}" class="ssoImage" alt="sso"/>
+              }
+              @if (getSsoProviderName()) {
+                <span class="ms-2">{{getSsoProviderName()}}</span>
+              }
           </button>
         </div>
       }

chutney/ui/src/app/core/components/login/login.component.scss

@@ -62,5 +62,8 @@
 }
 
 .ssoImage {
-    width: 40px
+    height: 4rem;
+    border-radius: 10px;
+    border: solid 1px #d3d7d7;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
 }

chutney/ui/src/app/core/components/login/login.component.ts

@@ -89,6 +89,10 @@ export class LoginComponent implements OnDestroy, OnInit {
     return this.ssoService.getSsoProviderName()
   }
 
+  displaySsoButton() {
+    return this.ssoService.getEnableSso
+  }
+
   getSsoProviderImageUrl() {
     return this.ssoService.getSsoProviderImageUrl()
   }

chutney/ui/src/app/core/core.module.ts

@@ -15,7 +15,7 @@ import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { ParentComponent } from './components/parent/parent.component';
 import { DROPDOWN_SETTINGS, DropdownSettings } from '@core/model/dropdown-settings';
-import { OAuth2ContentTypeInterceptor } from '@core/services/sso.service';
+import { OAuth2ContentTypeInterceptor } from '@core/services/oauth2-content-type-interceptor.service';
 
 @NgModule({
     declarations: [

chutney/ui/src/app/core/services/login.service.ts

@@ -160,10 +160,6 @@ export class LoginService {
         return false;
     }
 
-    isLoginUrl(url: string): boolean {
-        return url.includes(this.loginUrl);
-    }
-
     currentUser(skipInterceptor: boolean = false, headers: HttpHeaders | {
         [header: string]: string | string[];
     } = {}): Observable<User> {

chutney/ui/src/app/core/services/oauth2-content-type-interceptor.service.ts

@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2024 Enedis
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { SsoService } from '@core/services/sso.service';
+
+@Injectable()
+export class OAuth2ContentTypeInterceptor implements HttpInterceptor {
+
+    constructor(private ssoService: SsoService) {}
+
+    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+        const isTokenEndpoint = this.ssoService.headers && req.url.startsWith(this.ssoService.tokenEndpoint);
+        if (isTokenEndpoint) {
+            const modifiedReq = req.clone({
+                setHeaders: this.ssoService.headers
+            });
+            return next.handle(modifiedReq);
+        }
+        return next.handle(req);
+    }
+}