From d5040f9a8f4978ba21160c6ccf6c35b28a3497b2 Mon Sep 17 00:00:00 2001
From: k__nard <pascal.migazzi@gmail.com>
Date: Thu, 8 Dec 2022 15:40:54 -0700
Subject: [PATCH] updating twitch to latest api (Helix)

Summary:
api doc : https://dev.twitch.tv/docs/api/reference
oauth2 doc : https://dev.twitch.tv/docs/authentication

Test Plan: I have successfully setup OAuth2 authentication against Twitch

Reviewers: O1 Blessed Committers, avivey

Reviewed By: O1 Blessed Committers, avivey

Subscribers: avivey, speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Tags: #auth

Maniphest Tasks: T15122

Differential Revision: https://we.phorge.it/D25057
---
 .../auth/adapter/PhutilTwitchAuthAdapter.php         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/applications/auth/adapter/PhutilTwitchAuthAdapter.php b/src/applications/auth/adapter/PhutilTwitchAuthAdapter.php
index dce2c7e2f0..364ac55eac 100644
--- a/src/applications/auth/adapter/PhutilTwitchAuthAdapter.php
+++ b/src/applications/auth/adapter/PhutilTwitchAuthAdapter.php
@@ -14,7 +14,7 @@ final class PhutilTwitchAuthAdapter extends PhutilOAuthAuthAdapter {
   }
 
   public function getAccountID() {
-    return $this->getOAuthAccountData('_id');
+    return $this->getOAuthAccountData('id');
   }
 
   public function getAccountEmail() {
@@ -22,11 +22,11 @@ final class PhutilTwitchAuthAdapter extends PhutilOAuthAuthAdapter {
   }
 
   public function getAccountName() {
-    return $this->getOAuthAccountData('name');
+    return $this->getOAuthAccountData('login');
   }
 
   public function getAccountImageURI() {
-    return $this->getOAuthAccountData('logo');
+    return $this->getOAuthAccountData('profile_image_url');
   }
 
   public function getAccountURI() {
@@ -42,11 +42,11 @@ final class PhutilTwitchAuthAdapter extends PhutilOAuthAuthAdapter {
   }
 
   protected function getAuthenticateBaseURI() {
-    return 'https://api.twitch.tv/kraken/oauth2/authorize';
+    return 'https://id.twitch.tv/oauth2/authorize';
   }
 
   protected function getTokenBaseURI() {
-    return 'https://api.twitch.tv/kraken/oauth2/token';
+    return 'https://id.twitch.tv/oauth2/token';
   }
 
   public function getScope() {
@@ -69,7 +69,7 @@ final class PhutilTwitchAuthAdapter extends PhutilOAuthAuthAdapter {
     return id(new PhutilTwitchFuture())
       ->setClientID($this->getClientID())
       ->setAccessToken($this->getAccessToken())
-      ->setRawTwitchQuery('user')
+      ->setRawTwitchQuery('users')
       ->resolve();
   }