Merge bfc73c4 into 7424543

silhouette/app/com/mohiva/play/silhouette/impl/providers/oauth2/VKProvider.scala

@@ -33,9 +33,10 @@ import scala.concurrent.Future
 /**
  * Base Vk OAuth 2 provider.
  *
- * @see http://vk.com/dev/auth_sites
- * @see http://vk.com/dev/api_requests
- * @see http://vk.com/pages.php?o=-1&p=getProfiles
+ * @see https://vk.com/dev/auth_sites
+ * @see https://vk.com/dev/api_requests
+ * @see https://vk.com/dev/users.get
+ * @see https://vk.com/dev/objects/user
  */
 trait BaseVKProvider extends OAuth2Provider {
 
@@ -96,10 +97,12 @@ class VKProfileParser extends SocialProfileParser[JsValue, CommonSocialProfile,
    */
   override def parse(json: JsValue, authInfo: OAuth2Info) = Future.successful {
     val response = (json \ "response").apply(0)
-    val userId = (response \ "uid").as[Long]
+    // `uid` field was deprecated in v.5.0
+    val userId = (response \ "uid").asOpt[Long].getOrElse((response \ "id").as[Long])
     val firstName = (response \ "first_name").asOpt[String]
     val lastName = (response \ "last_name").asOpt[String]
-    val avatarURL = (response \ "photo").asOpt[String]
+    // `photo` field was deprecated in v.5.4
+    val avatarURL = (response \ "photo").asOpt[String].orElse((response \ "photo_max_orig").asOpt[String])
 
     CommonSocialProfile(
       loginInfo = LoginInfo(ID, userId.toString),
@@ -156,7 +159,7 @@ object VKProvider {
    * The VK constants.
    */
   val ID = "vk"
-  val API = "https://api.vk.com/method/getProfiles?fields=uid,first_name,last_name,photo&access_token=%s"
+  val API = "https://api.vk.com/method/users.get?fields=id,first_name,last_name,photo_max_orig&v=5.73&access_token=%s"
 
   /**
    * Converts the JSON into a [[OAuth2Info]] object.

silhouette/test/com/mohiva/play/silhouette/impl/providers/oauth2/VKProviderSpec.scala

@@ -177,6 +177,44 @@ class VKProviderSpec extends OAuth2ProviderSpec {
       }
     }
 
+    "return the social profile from response without photo" in new WithApplication with Context {
+      val wsRequest = mock[MockWSRequest]
+      val wsResponse = mock[MockWSRequest#Response]
+      wsResponse.status returns 200
+      wsResponse.json returns Helper.loadJson("providers/oauth2/vk.success.without.photo.json").as[JsObject]
+      wsRequest.get() returns Future.successful(wsResponse)
+      httpLayer.url(API.format("my.access.token")) returns wsRequest
+
+      profile(provider.retrieveProfile(oAuthInfo.as[OAuth2Info])) { p =>
+        p must be equalTo CommonSocialProfile(
+          loginInfo = LoginInfo(provider.id, "66748"),
+          firstName = Some("Apollonia"),
+          lastName = Some("Vanova"),
+          email = Some("apollonia.vanova@watchmen.com"),
+          avatarURL = None
+        )
+      }
+    }
+
+    "return the social profile from deprecated API response" in new WithApplication with Context {
+      val wsRequest = mock[MockWSRequest]
+      val wsResponse = mock[MockWSRequest#Response]
+      wsResponse.status returns 200
+      wsResponse.json returns Helper.loadJson("providers/oauth2/vk.success.deprecated.json")
+      wsRequest.get() returns Future.successful(wsResponse)
+      httpLayer.url(API.format("my.access.token")) returns wsRequest
+
+      profile(provider.retrieveProfile(oAuthInfo.as[OAuth2Info])) { p =>
+        p must be equalTo CommonSocialProfile(
+          loginInfo = LoginInfo(provider.id, "66748"),
+          firstName = Some("Apollonia"),
+          lastName = Some("Vanova"),
+          email = Some("apollonia.vanova@watchmen.com"),
+          avatarURL = Some("http://vk.com/images/camera_b.gif")
+        )
+      }
+    }
+
     "return the social profile without email" in new WithApplication with Context {
       val wsRequest = mock[MockWSRequest]
       val wsResponse = mock[MockWSRequest#Response]

silhouette/test/resources/providers/oauth2/vk.success.deprecated.json

@@ -0,0 +1,10 @@
+{
+  "response": [
+    {
+      "uid": 66748,
+      "first_name": "Apollonia",
+      "last_name": "Vanova",
+      "photo": "http://vk.com/images/camera_b.gif"
+    }
+  ]
+}

silhouette/test/resources/providers/oauth2/vk.success.json

@@ -1,10 +1,10 @@
 {
   "response": [
     {
-      "uid": 66748,
+      "id": 66748,
       "first_name": "Apollonia",
       "last_name": "Vanova",
-      "photo": "http://vk.com/images/camera_b.gif"
+      "photo_max_orig": "http://vk.com/images/camera_b.gif"
     }
   ]
 }

silhouette/test/resources/providers/oauth2/vk.success.without.photo.json

@@ -0,0 +1,9 @@
+{
+  "response": [
+    {
+      "id": 66748,
+      "first_name": "Apollonia",
+      "last_name": "Vanova"
+    }
+  ]
+}