app 证书

Author: wuwu123

src/AppConfig.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Wu\Agora;
+
+class AppConfig
+{
+    /**
+     * @var string
+     */
+    private $appID;
+
+    /**
+     * @var string
+     */
+    private $appCertificate;
+
+    /**
+     * @return string
+     */
+    public function getAppID(): string
+    {
+        return $this->appID;
+    }
+
+    /**
+     * @param string $appID
+     * @return AppConfig
+     */
+    public function setAppID(string $appID): AppConfig
+    {
+        $this->appID = $appID;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAppCertificate(): string
+    {
+        return $this->appCertificate;
+    }
+
+    /**
+     * @param string $appCertificate
+     * @return AppConfig
+     */
+    public function setAppCertificate(string $appCertificate): AppConfig
+    {
+        $this->appCertificate = $appCertificate;
+        return $this;
+    }
+}

src/Config.php

@@ -7,38 +7,68 @@
 
 class Config
 {
-    protected $appID;
+    /**
+     * @var string app区分
+     */
+    private $appSource = 'default';
 
-    protected $appCertificate;
+    /**
+     * @var AppConfig[] app 证书
+     */
+    private $appKeyArray = [];
 
+    /**
+     * @var string token版本
+     */
     protected $version = "006";
 
     /**
-     * @var Carbon
+     * @var string api管理key
      */
-    public $date;
+    protected $customerKey;
 
+    /**
+     * @var string api管理密钥
+     */
+    protected $customerSecret;
+
+    /**
+     * @var int api请求超时时间
+     */
     protected $timeOut = 2;
 
+    /**
+     * @var int api请求重试次数
+     */
+    protected $retry = 1;
+
+    /**
+     * @var null guzzle请求handler
+     */
     protected $handler;
 
-    protected $retry = 1;
 
-    public function __construct(string $appID = '', string $appCertificate = '')
+    public function __construct(string $appID = '', string $appCertificate = '', string $customerKey = '', string $customerSecret = '')
     {
-        $this->appID = $appID;
-        $this->appCertificate = $appCertificate;
+        $appConfig = new AppConfig();
+        if ($appID || $appCertificate) {
+            $appConfig->setAppID($appID);
+            $appConfig->setAppCertificate($appCertificate);
+            $this->appKeyArray[$this->appSource] = $appConfig;
+        }
+        $this->customerKey = $customerKey;
+        $this->customerSecret = $customerSecret;
     }
 
     /**
      * @throws AgoraException
      */
     public function checkConfig()
     {
-        if (! $this->appID) {
+        if (! $this->getAppID()) {
             throw new AgoraException("appID check failed, should be a non-empty string");
         }
-        if (! $this->appCertificate) {
+        if (! $this->getAppCertificate()) {
             throw new AgoraException("appCertificate check failed, should be a non-empty string");
         }
     }
@@ -48,35 +78,23 @@ public function checkConfig()
      */
     public function getAppID(): string
     {
-        return $this->appID;
+        return $this->appKeyArray[$this->appSource]->getAppID();
     }
 
     /**
      * @return string
      */
     public function getAppCertificate(): string
     {
-        return $this->appCertificate;
+        return $this->appKeyArray[$this->appSource]->getAppCertificate();
     }
 
     /**
-     * @param string $appID
-     * @return Config
-     */
-    public function setAppID(string $appID): Config
-    {
-        $this->appID = $appID;
-        return $this;
-    }
-
-    /**
-     * @param string $appCertificate
-     * @return Config
+     * @return string
      */
-    public function setAppCertificate(string $appCertificate): Config
+    public function getVersion(): string
     {
-        $this->appCertificate = $appCertificate;
-        return $this;
+        return $this->version;
     }
 
     /**
@@ -89,34 +107,39 @@ public function setVersion(string $version): Config
         return $this;
     }
 
-
-
     /**
      * @return string
      */
-    public function getVersion(): string
-    {
-        return $this->version;
-    }
-
-    public function getVersionLen(): int
+    public function getCustomerKey(): string
     {
-        return strlen($this->version);
+        return $this->customerKey;
     }
 
-    public function getAppIdLen(): int
+    /**
+     * @param string $customerKey
+     * @return Config
+     */
+    public function setCustomerKey(string $customerKey): Config
     {
-        return strlen($this->appID);
+        $this->customerKey = $customerKey;
+        return $this;
     }
 
-    public function getHandler()
+    /**
+     * @return string
+     */
+    public function getCustomerSecret(): string
     {
-        return $this->handler;
+        return $this->customerSecret;
     }
 
-    public function setHandler(?callable $handler)
+    /**
+     * @param string $customerSecret
+     * @return Config
+     */
+    public function setCustomerSecret(string $customerSecret): Config
     {
-        $this->handler = $handler;
+        $this->customerSecret = $customerSecret;
         return $this;
     }
 
@@ -155,4 +178,66 @@ public function setRetry(int $retry): Config
         $this->retry = $retry;
         return $this;
     }
+
+
+    public function getHandler()
+    {
+        return $this->handler;
+    }
+
+    /**
+     * @param $handler
+     * @return Config
+     */
+    public function setHandler($handler): Config
+    {
+        $this->handler = $handler;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAppSource(): string
+    {
+        return $this->appSource;
+    }
+
+    /**
+     * @param string $appSource
+     * @return Config
+     */
+    public function setAppSource(string $appSource): Config
+    {
+        $this->appSource = $appSource;
+        return $this;
+    }
+
+    /**
+     * @return AppConfig[]
+     */
+    public function getAppKeyArray(): array
+    {
+        return $this->appKeyArray;
+    }
+
+    /**
+     * @param AppConfig[] $appKeyArray
+     * @return Config
+     */
+    public function setAppKeyArray(array $appKeyArray): Config
+    {
+        $this->appKeyArray = $appKeyArray;
+        return $this;
+    }
+
+    public function getVersionLen()
+    {
+        return strlen($this->version);
+    }
+
+    public function getAppIdLen()
+    {
+        return strlen($this->getAppID());
+    }
 }

src/Http.php

@@ -23,9 +23,9 @@ public function __construct(Config $config)
      */
     public function authorization()
     {
-        $appId = $this->config->getAppID();
-        $customerSecret = $this->config->getAppCertificate();
-        $credentials = $appId . ":" . $customerSecret;
+        $customerKey = $this->config->getCustomerKey();
+        $customerSecret = $this->config->getCustomerSecret();
+        $credentials = $customerKey . ":" . $customerSecret;
         return "Basic " . base64_encode($credentials);
     }
 

src/Token/AccessToken.php

@@ -76,10 +76,17 @@ public function setChannelName($channelName)
         return $this;
     }
 
+    /**
+     * @param Config $config
+     * @param null $message
+     * @return AccessToken
+     * @throws AgoraException
+     */
     public static function make(Config $config, $message = null)
     {
         $accessToken = new AccessToken();
         $accessToken->config = $config;
+        $config->checkConfig();
         if (! ($message instanceof Message)) {
             $message = new Message();
         }

src/Token/TokenBuilder.php

@@ -3,6 +3,7 @@
 namespace Wu\Agora\Token;
 
 use Wu\Agora\Config;
+use Wu\Agora\Exception\AgoraException;
 
 class TokenBuilder
 {
@@ -51,7 +52,7 @@ public function rtmTokenBuilder($uidOrAccount, $privilegeExpireTs)
     /**
      * @param $token
      * @return Message
-     * @throws Exception\AgoraException
+     * @throws AgoraException
      */
     public function messageByToken($token): Message
     {

test/BaseTest.php

@@ -15,7 +15,7 @@ public function getConfig()
     {
         $dotenv = Dotenv::createImmutable(__DIR__ . "/..");
         $dotenv->safeLoad();
-        return new Config($_ENV['APP_ID'], $_ENV['APP_KEY']);
+        return new Config($_ENV['APP_ID'], $_ENV['APP_CERTIFICATE'], $_ENV['CUSTOMER_KEY'], $_ENV['CUSTOMER_SECRET']);
     }
 
     public function getModel()

test/TokenTest.php

@@ -10,14 +10,6 @@
 
 class TokenTest extends BaseTest
 {
-    /**
-     * @return Config
-     */
-    public function getConfig()
-    {
-        return new Config('970CA35de60c44645bbae8a215061b33', '5CFd2fd1755d40ecb72977518be15d3b');
-    }
-
     public function testCreate()
     {
         $channelName = "hdkhfdkasjhfakhf";