Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSLogic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
VIPSLogic
Commits
5f34be35
Commit
5f34be35
authored
2 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Updating Google API Usage
parent
6d71c1bb
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!85
chore(deps): update dependency org.hibernate:hibernate-spatial to v6.1.7.final - autoclosed
,
!84
chore(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.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
+6
-4
6 additions, 4 deletions
.../nibio/vips/logic/controller/servlet/LoginController.java
with
6 additions
and
4 deletions
src/main/java/no/nibio/vips/logic/controller/servlet/LoginController.java
+
6
−
4
Edit
View file @
5f34be35
...
...
@@ -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.GoogleTokenResponse
;
import
com.google.api.client.http.javanet.NetHttpTransport
;
import
com.google.api.client.json.
jackson2.Jack
sonFactory
;
import
com.google.api.client.json.
gson.G
sonFactory
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.UnsupportedEncodingException
;
...
...
@@ -45,6 +45,8 @@ import javax.servlet.http.HttpServlet;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
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.entity.UserAuthenticationType
;
import
no.nibio.vips.logic.entity.UserUuid
;
...
...
@@ -109,14 +111,14 @@ public class LoginController extends HttpServlet {
// Use code, make request to Google for getting token with user information
GoogleTokenResponse
tokenResponse
=
new
GoogleAuthorizationCodeTokenRequest
(
new
NetHttpTransport
(),
new
Jack
sonFactory
(),
new
NetHttpTransport
(),
new
G
sonFactory
(),
System
.
getProperty
(
"no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_ID"
),
System
.
getProperty
(
"no.nibio.vips.logic.GOOGLE_OPENID_CLIENT_SECRET"
),
authorizationCode
,
Globals
.
PROTOCOL
+
"://"
+
ServletUtil
.
getServerName
(
request
)
+
"/oauth2callback"
).
execute
();
GoogleIdToken
idToken
=
GoogleIdToken
.
parse
(
new
Jack
sonFactory
(),
tokenResponse
.
getIdToken
());
GoogleIdToken
idToken
=
GoogleIdToken
.
parse
(
new
G
sonFactory
(),
tokenResponse
.
getIdToken
());
Payload
payload
=
idToken
.
getPayload
();
// Try to find the user
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment