Skip to content
Snippets Groups Projects
Commit 5f34be35 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Updating Google API Usage

parent 6d71c1bb
No related branches found
No related tags found
2 merge requests!85chore(deps): update dependency org.hibernate:hibernate-spatial to v6.1.7.final - autoclosed,!84chore(deps): update dependency org.hibernate:hibernate-core to v6.1.7.final - autoclosed
This commit is part of merge request !84. Comments created here will be created in the context of that merge request.
...@@ -26,7 +26,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken; ...@@ -26,7 +26,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload; import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
import com.google.api.client.googleapis.auth.oauth2.GoogleTokenResponse; import com.google.api.client.googleapis.auth.oauth2.GoogleTokenResponse;
import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.client.json.gson.GsonFactory;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
...@@ -45,6 +45,8 @@ import javax.servlet.http.HttpServlet; ...@@ -45,6 +45,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import com.google.api.client.json.gson.GsonFactory;
import no.nibio.vips.logic.controller.session.UserBean; import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.UserAuthenticationType; import no.nibio.vips.logic.entity.UserAuthenticationType;
import no.nibio.vips.logic.entity.UserUuid; import no.nibio.vips.logic.entity.UserUuid;
...@@ -109,14 +111,14 @@ public class LoginController extends HttpServlet { ...@@ -109,14 +111,14 @@ public class LoginController extends HttpServlet {
// Use code, make request to Google for getting token with user information // Use code, make request to Google for getting token with user information
GoogleTokenResponse tokenResponse = new GoogleAuthorizationCodeTokenRequest( GoogleTokenResponse tokenResponse = new GoogleAuthorizationCodeTokenRequest(
new NetHttpTransport(), new NetHttpTransport(),
new JacksonFactory(), new GsonFactory(),
System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_ID"), System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_ID"),
System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_SECRET"), System.getProperty("no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_SECRET"),
authorizationCode, authorizationCode,
Globals.PROTOCOL + "://" + ServletUtil.getServerName(request) + "/oauth2callback" Globals.PROTOCOL + "://" + ServletUtil.getServerName(request) + "/oauth2callback"
).execute(); ).execute();
GoogleIdToken idToken = GoogleIdToken.parse(new JacksonFactory(), tokenResponse.getIdToken()); GoogleIdToken idToken = GoogleIdToken.parse(new GsonFactory(), tokenResponse.getIdToken());
Payload payload = idToken.getPayload(); Payload payload = idToken.getPayload();
// Try to find the user // Try to find the user
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment