Changed Auth method from JWT to Server-to-Server OAuth

Author: planv

README.md

@@ -15,14 +15,14 @@ Add the following repository source to your composer.json:
 Require via composer:
 
 ```
-composer require usabilitydynamics/zoom-api-php-client:0.0.3
+composer require usabilitydynamics/zoom-api-php-client:0.0.12
 ```
 
 Initialize:
 
 ```
 use UDX\Zoom\Zoom;
-$zoom = new Zoom( <api_key>, <secret_key> );
+$zoom = new Zoom( <account_id>, <client_id>, <client_secret> );
 ```
 
 Use:

composer.json

@@ -13,8 +13,7 @@
 
     "require": {
         "php": ">=7.4",
-        "guzzlehttp/guzzle": "~7.0",
-        "firebase/php-jwt": "^6.4.0"
+        "guzzlehttp/guzzle": "~7.0"
     },
 
     "autoload": {

src/Endpoint/Meetings.php

@@ -12,11 +12,12 @@ class Meetings extends Request {
 
     /**
      * Meetings constructor.
-     * @param $apiKey
-     * @param $apiSecret
+     * @param $accountId
+     * @param $clientId
+     * @param $clientSecret
      */
-    public function __construct($apiKey, $apiSecret) {
-        parent::__construct($apiKey, $apiSecret);
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+        parent::__construct( $accountId, $clientId, $clientSecret );
     }
 
     /**

src/Endpoint/Recordings.php

@@ -12,11 +12,12 @@ class Recordings extends Request {
 
     /**
      * Recordings constructor.
-     * @param $apiKey
-     * @param $apiSecret
+     * @param $accountId
+     * @param $clientId
+     * @param $clientSecret
      */
-    public function __construct($apiKey, $apiSecret) {
-        parent::__construct($apiKey, $apiSecret);
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+        parent::__construct( $accountId, $clientId, $clientSecret );
     }
 
     /**

src/Endpoint/Reports.php

@@ -11,12 +11,13 @@
 class Reports extends Request {
 
     /**
-     * Meetings constructor.
-     * @param $apiKey
-     * @param $apiSecret
+     * Reports constructor.
+     * @param $accountId
+     * @param $clientId
+     * @param $clientSecret
      */
-    public function __construct($apiKey, $apiSecret) {
-        parent::__construct($apiKey, $apiSecret);
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+        parent::__construct( $accountId, $clientId, $clientSecret );
     }
 
     /**

src/Endpoint/Users.php

@@ -12,11 +12,12 @@ class Users extends Request {
 
     /**
      * Users constructor.
-     * @param $apiKey
-     * @param $apiSecret
+     * @param $accountId
+     * @param $clientId
+     * @param $clientSecret
      */
-    public function __construct($apiKey, $apiSecret) {
-        parent::__construct($apiKey, $apiSecret);
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+        parent::__construct( $accountId, $clientId, $clientSecret );
     }
 
     /**

src/Http/Request.php

@@ -2,7 +2,6 @@
 
 namespace UDX\Zoom\Http;
 
-use Firebase\JWT\JWT;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Psr7\Response;
@@ -12,12 +11,17 @@ class Request {
     /**
      * @var
      */
-    protected $apiKey;
+    protected $accountId;
 
     /**
      * @var
      */
-    protected $apiSecret;
+    protected $clientId;
+
+    /**
+     * @var
+     */
+    protected $clientSecret;
 
     /**
      * @var Client
@@ -29,15 +33,24 @@ class Request {
      */
     public $apiPoint = 'https://api.zoom.us/v2/';
 
+    /**
+     * @var string
+     */
+    public $oauthPoint = 'https://zoom.us/oauth/token?grant_type=account_credentials&account_id=';
+    
+
     /**
      * Request constructor.
-     * @param $apiKey
-     * @param $apiSecret
+     * @param $accountId
+     * @param $clientId
+     * @param $clientSecret
      */
-    public function __construct( $apiKey, $apiSecret ) {
-        $this->apiKey = $apiKey;
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+        $this->accountId = $accountId;
 
-        $this->apiSecret = $apiSecret;
+        $this->clientId = $clientId;
+
+        $this->clientSecret = $clientSecret;
 
         $this->client = new Client();
     }
@@ -49,24 +62,28 @@ public function __construct( $apiKey, $apiSecret ) {
      */
     protected function headers(): array {
         return [
-            'Authorization' => 'Bearer ' . $this->generateJWT(),
+            'Authorization' => 'Bearer ' . $this->generateOAuthToken(),
             'Content-Type' => 'application/json',
             'Accept' => 'application/json',
         ];
     }
 
     /**
-     * Generate J W T
+     * Generate OAuth token
      *
      * @return string
      */
-    protected function generateJWT() {
-        $token = [
-            'iss' => $this->apiKey,
-            'exp' => time() + 60,
-        ];
+    protected function generateOAuthToken() {
+        try {
+            $response = $this->client->request('POST', $this->oauthPoint . $this->accountId, [
+                'auth' => [ $this->clientId, $this->clientSecret ]
+            ]);
+            $result = $this->result($response);
+            return isset($result['access_token']) ? $result['access_token'] : '';
 
-        return JWT::encode($token, $this->apiSecret, 'HS256');
+        } catch (ClientException $e) {
+            return (array)json_decode($e->getResponse()->getBody()->getContents());
+        }
     }
 
 

src/Zoom.php

@@ -8,23 +8,30 @@ class Zoom {
     /**
      * @var null
      */
-    private $apiKey = null;
+    private $accountId = null;
 
     /**
      * @var null
      */
-    private $apiSecret = null;
+    private $clientId = null;
+
+    /**
+     * @var null
+     */
+    private $clientSecret = null;
 
     /**
      * Zoom constructor.
      * @param $apiKey
      * @param $apiSecret
      */
-    public function __construct( $apiKey, $apiSecret ) {
+    public function __construct( $accountId, $clientId, $clientSecret ) {
+
+        $this->accountId = $accountId;
 
-        $this->apiKey = $apiKey;
+        $this->clientId = $clientId;
 
-        $this->apiSecret = $apiSecret;
+        $this->clientSecret = $clientSecret;
     }
 
     /**
@@ -58,7 +65,7 @@ public function make( $resource ) {
 
         $class = 'UDX\\Zoom\\Endpoint\\' . ucfirst(strtolower($resource));
         if (class_exists($class)) {
-            return new $class( $this->apiKey, $this->apiSecret );
+            return new $class( $this->accountId, $this->clientId, $this->clientSecret );
         }
         throw new Exception('Wrong method');
     }

tests/Bootstrap.php

@@ -14,7 +14,7 @@ class Bootstrap extends TestCase {
      */
     public function testClientCreate() {
         try {
-            $client = new Zoom\Zoom('key', 'secret');
+            $client = new Zoom\Zoom('id', 'key', 'secret');
             $this->assertInstanceOf(Zoom\Zoom::class, $client);
         } catch ( Exception $e ) {
             $this->fail( $e );
@@ -27,7 +27,7 @@ public function testClientCreate() {
      */
     public function testMeetingsEndpoint() {
         try {
-            $client = new Zoom\Zoom( 'key', 'secret' );
+            $client = new Zoom\Zoom( 'id', 'key', 'secret' );
             $this->assertInstanceOf(Zoom\Endpoint\Meetings::class, $client->meetings);
             $this->assertInstanceOf(Zoom\Http\Request::class, $client->meetings);
             $this->assertTrue( method_exists( $client->meetings, 'list' ),