(#35) Google profiili pärimise url muudetud

kristenkotkas · Dec 30, 2018 · d8edded · d8edded
1 parent b842ffe
commit d8edded
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 8 deletions.
diff --git a/src/main/java/server/security/DatabaseAuthorizer.java b/src/main/java/server/security/DatabaseAuthorizer.java
@@ -8,7 +8,6 @@
 import org.pac4j.core.exception.TechnicalException;
 import org.pac4j.core.profile.CommonProfile;
 import org.pac4j.oauth.profile.facebook.FacebookProfile;
-import org.pac4j.oauth.profile.google2.Google2Profile;
 import server.entity.TriFunction;
 import server.service.DatabaseService;
 
@@ -45,7 +44,7 @@ public DatabaseAuthorizer(DatabaseService database) {
      * Checks whether Pac4j user profile is authorized.
      */
     @Override
-    protected boolean isProfileAuthorized(WebContext context, CommonProfile profile) throws HttpAction {
+    protected boolean isProfileAuthorized(WebContext context, CommonProfile profile) {
         return profile != null && ProfileAuthorizer.isAuthorized(database, profile,
                 getRows(database.getAllUsers().rxSetHandler().toBlocking().value()));
     }
@@ -69,7 +68,7 @@ protected boolean handleError(WebContext context) throws HttpAction {
      */
     public enum ProfileAuthorizer {
         FACEBOOK(FacebookProfile.class, oAuth2Authorization()),
-        GOOGLE(Google2Profile.class, oAuth2Authorization()),
+        GOOGLE(GoogleProfile.class, oAuth2Authorization()),
         IDCARD(IdCardProfile.class, (IdCardProfile p, Stream<JsonObject> stream, DatabaseService database) -> stream
                 .anyMatch(json -> p.getSerial().equals(json.getString(USERNAME.getName()))) ||
                 database.insertUser(p.getSerial(), genString(), p.getFirstName(), p.getFamilyName())

diff --git a/src/main/java/server/security/Google2Client.java b/src/main/java/server/security/Google2Client.java
@@ -5,14 +5,12 @@
 import org.pac4j.core.logout.GoogleLogoutActionBuilder;
 import org.pac4j.oauth.client.OAuth20Client;
 import org.pac4j.oauth.exception.OAuthCredentialsException;
-import org.pac4j.oauth.profile.google2.Google2Profile;
-import org.pac4j.oauth.profile.google2.Google2ProfileDefinition;
 
 /**
  * @author <a href="https://github.com/kristjanhk">Kristjan Hendrik Küngas</a>
  */
-public class Google2Client extends OAuth20Client<Google2Profile> {
-  private static final String FULL_SCOPE = "https://www.googleapis.com/auth/plus.login email";
+public class Google2Client extends OAuth20Client<GoogleProfile> {
+  private static final String FULL_SCOPE = "profile email";
 
   public Google2Client(final String key, final String secret) {
     setKey(key);
@@ -22,7 +20,7 @@ public Google2Client(final String key, final String secret) {
   @Override
   protected void clientInit(WebContext context) {
     configuration.setApi(GoogleApi20.instance());
-    configuration.setProfileDefinition(new Google2ProfileDefinition());
+    configuration.setProfileDefinition(new GoogleProfileDefinition());
     configuration.setScope(FULL_SCOPE);
     configuration.setWithState(true);
     configuration.setHasBeenCancelledFactory(ctx -> "access_denied"

diff --git a/src/main/java/server/security/GoogleProfile.java b/src/main/java/server/security/GoogleProfile.java
@@ -0,0 +1,24 @@
+package server.security;
+
+import org.pac4j.oauth.profile.OAuth20Profile;
+
+/**
+ * @author <a href="https://github.com/kristjanhk">Kristjan Hendrik Küngas</a>
+ */
+public class GoogleProfile extends OAuth20Profile {
+
+  @Override
+  public String getEmail() {
+    return getAttribute(GoogleProfileDefinition.EMAIL, String.class);
+  }
+
+  @Override
+  public String getFirstName() {
+    return getAttribute(GoogleProfileDefinition.GIVEN_NAME, String.class);
+  }
+
+  @Override
+  public String getFamilyName() {
+    return getAttribute(GoogleProfileDefinition.FAMILY_NAME, String.class);
+  }
+}
diff --git a/src/main/java/server/security/GoogleProfileDefinition.java b/src/main/java/server/security/GoogleProfileDefinition.java
@@ -0,0 +1,36 @@
+package server.security;
+
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import io.vertx.core.json.JsonObject;
+import org.pac4j.oauth.config.OAuth20Configuration;
+import org.pac4j.oauth.profile.definition.OAuth20ProfileDefinition;
+
+import java.util.stream.Stream;
+
+/**
+ * @author <a href="https://github.com/kristjanhk">Kristjan Hendrik Küngas</a>
+ */
+public class GoogleProfileDefinition extends OAuth20ProfileDefinition<GoogleProfile> {
+  public static final String ID = "sub";
+  public static final String EMAIL = "email";
+  public static final String GIVEN_NAME = "given_name";
+  public static final String FAMILY_NAME = "family_name";
+
+  public GoogleProfileDefinition() {
+    super(x -> new GoogleProfile());
+  }
+
+  @Override
+  public String getProfileUrl(OAuth2AccessToken accessToken, OAuth20Configuration configuration) {
+    return "https://openidconnect.googleapis.com/v1/userinfo";
+  }
+
+  @Override
+  public GoogleProfile extractUserProfile(String body) {
+    GoogleProfile profile = newProfile();
+    JsonObject json = new JsonObject(body);
+    profile.setId(json.getString(ID));
+    Stream.of(EMAIL, GIVEN_NAME, FAMILY_NAME).forEach(key -> convertAndAdd(profile, key, json.getString(key)));
+    return profile;
+  }
+}