Review from Copilot

Author: joel.tazzari

plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2Provider.java

@@ -46,6 +46,7 @@
 import com.cloud.exception.CloudAuthenticationException;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -129,10 +130,14 @@ public String verifyCodeAndFetchEmail(String secretCode) {
                 }
 
                 JsonObject json = JsonParser.parseString(body).getAsJsonObject();
-                String idToken = json.get("id_token").getAsString();
-                validateIdToken(idToken, provider);
+                JsonElement fetchedIdToken = json.get("id_token");
+                if (fetchedIdToken == null) {
+                	throw new CloudRuntimeException("No id_token found in token");
+                }
+				String idTokenAsString = fetchedIdToken.getAsString();
+                validateIdToken(idTokenAsString , provider);
 
-                this.idToken = idToken;
+                this.idToken = idTokenAsString ;
             } catch (IOException e) {
                 throw new CloudRuntimeException("Unable to connect to Keycloak server", e);
             }

ui/src/views/auth/Login.vue

@@ -186,7 +186,7 @@
           :href="getGitHubUrl(from)"
           class="auth-btn github-auth"
           style="height: 38px; width: 185px; padding: 0; margin-bottom: 5px;" >
-          <img src="/assets/github.svg" alt="Google" style="width: 32px; padding: 5px" />
+          <img src="/assets/github.svg" alt="Github" style="width: 32px; padding: 5px" />
           <a-typography-text>Sign in with Github</a-typography-text>
         </a-button>
       </div>
@@ -198,7 +198,7 @@
           :href="getGoogleUrl(from)"
           class="auth-btn google-auth"
           style="height: 38px; width: 185px; padding: 0" >
-          <img src="/assets/google.svg" alt="Github" style="width: 32px; padding: 5px" />
+          <img src="/assets/google.svg" alt="Google" style="width: 32px; padding: 5px" />
           <a-typography-text>Sign in with Google</a-typography-text>
         </a-button>
       </div>