From 824bd0d209059156b2f4d889c0abe125b874feb4 Mon Sep 17 00:00:00 2001
From: PEDSF <pe.dsf@free.fr>
Date: Wed, 16 Dec 2020 18:23:57 +0100
Subject: [PATCH] change social buttons

---
 .../petclinic/controller/common/UserController.java    | 10 +++++++---
 src/main/resources/templates/login.html                |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java b/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java
index 0cf557569..fe11aaa09 100644
--- a/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java
+++ b/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java
@@ -159,7 +159,7 @@ public class UserController extends WebSocketSender {
 		String firstName;
 		String lastName;
 		String email;
-		String providerId;
+		String providerId = "";
 		String provider = authentication.getAuthorizedClientRegistrationId();
 
 		if (provider.equals(CommonAttribute.GOOGLE)) {
@@ -170,10 +170,14 @@ public class UserController extends WebSocketSender {
 		else {
 			firstName = authentication.getPrincipal().getAttribute(CommonAttribute.GITHUB_FIRSTNAME);
 			lastName = authentication.getPrincipal().getAttribute(CommonAttribute.GITHUB_LASTNAME);
-			providerId = String.valueOf(authentication.getPrincipal().getAttribute(CommonAttribute.GITHUB_PROVIDER_ID));
+			try {
+				providerId = authentication.getPrincipal().getAttribute(CommonAttribute.GITHUB_PROVIDER_ID).toString();
+			} catch (NullPointerException exception) {
+				log.error("Cast integer to string ",exception);
+			}
 		}
 
-		email = authentication.getPrincipal().getAttribute("email");
+		email = authentication.getPrincipal().getAttribute(CommonAttribute.EMAIL);
 
 		CredentialDTO credential = credentialService.findByAuthentication(authentication);
 
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index ec8a05a65..05973269e 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -30,14 +30,14 @@
 
 <h2 style="text-align:center">Login with Social Media</h2>
 
-  <div class="col-md-12 " th:each="url : ${urls}" style="text-align:center">
-    <a th:if="${url.key == 'Google'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="background-color: #dd4b39">
+  <div class="col-md-12 " th:each="url : ${urls}" style="text-align:center; margin-bottom: 10px">
+    <a th:if="${url.key == 'Google'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="width:250px; background-color: #dd4b39">
       <i class="fa fa-google fa-fw"></i> Login with Google
     </a>
-    <a th:if="${url.key == 'GitHub'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="background-color: black">
+    <a th:if="${url.key == 'GitHub'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="width:250px; background-color: black">
       <i class="fa fa-github fa-fw"></i> Login with Github
     </a>
-    <a th:if="${url.key == 'Facebook'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="background-color: #3B5998">
+    <a th:if="${url.key == 'Facebook'}" th:href="${url.value}" class="btn btn-bloc btn-social btn-lg" style="width:250px; background-color: #3B5998">
         <i class="fa fa-facebook fa-fw"></i> Login with Facebook
     </a>