From d68569d8204b1401dd7ce749a076aa329921b95f Mon Sep 17 00:00:00 2001
From: Jacob Mulford <39915377+jmulford-bw@users.noreply.github.com>
Date: Fri, 5 Feb 2021 10:17:53 -0500
Subject: [PATCH] MFA error update and message priority (#20)

* New deploy

* Update APIController.php

Co-authored-by: jmulford-bw <dx@bandwidth.com>
---
 src/Configuration.php                         |  2 +-
 src/Messaging/Models/BandwidthMessage.php     | 10 ++-
 src/Messaging/Models/MessageRequest.php       | 11 ++-
 src/Messaging/Models/PriorityEnum.php         | 25 ++++++
 .../{APIController.php => MFAController.php}  | 84 +++++++++++++++++--
 .../Exceptions/ErrorWithRequestException.php  | 44 ++++++++++
 .../Exceptions/ForbiddenRequestException.php  | 39 +++++++++
 ...n.php => UnauthorizedRequestException.php} |  8 +-
 src/TwoFactorAuth/TwoFactorAuthClient.php     | 14 ++--
 9 files changed, 216 insertions(+), 21 deletions(-)
 create mode 100644 src/Messaging/Models/PriorityEnum.php
 rename src/TwoFactorAuth/Controllers/{APIController.php => MFAController.php} (75%)
 create mode 100644 src/TwoFactorAuth/Exceptions/ErrorWithRequestException.php
 create mode 100644 src/TwoFactorAuth/Exceptions/ForbiddenRequestException.php
 rename src/TwoFactorAuth/Exceptions/{InvalidRequestException.php => UnauthorizedRequestException.php} (74%)

diff --git a/src/Configuration.php b/src/Configuration.php
index e0ebf29..7094a77 100644
--- a/src/Configuration.php
+++ b/src/Configuration.php
@@ -247,7 +247,7 @@ public function getBaseUri($server = Servers::DEFAULT_)
         Environments::PRODUCTION => array(
             Servers::DEFAULT_ => 'api.bandwidth.com',
             Servers::MESSAGINGDEFAULT => 'https://messaging.bandwidth.com/api/v2',
-            Servers::TWOFACTORAUTHDEFAULT => 'https://mfa.bandwidth.com/api/v1/',
+            Servers::TWOFACTORAUTHDEFAULT => 'https://mfa.bandwidth.com/api/v1',
             Servers::VOICEDEFAULT => 'https://voice.bandwidth.com',
             Servers::WEBRTCDEFAULT => 'https://api.webrtc.bandwidth.com/v1',
         ),
diff --git a/src/Messaging/Models/BandwidthMessage.php b/src/Messaging/Models/BandwidthMessage.php
index 6b74e45..2a3c86b 100644
--- a/src/Messaging/Models/BandwidthMessage.php
+++ b/src/Messaging/Models/BandwidthMessage.php
@@ -79,12 +79,18 @@ class BandwidthMessage implements \JsonSerializable
      */
     public $tag;
 
+    /**
+     * The priority specified by the user
+     * @var string|null $priority public property
+     */
+    public $priority;
+
     /**
      * Constructor to set initial or default values of member properties
      */
     public function __construct()
     {
-        if (11 == func_num_args()) {
+        if (12 == func_num_args()) {
             $this->id            = func_get_arg(0);
             $this->owner         = func_get_arg(1);
             $this->applicationId = func_get_arg(2);
@@ -96,6 +102,7 @@ public function __construct()
             $this->media         = func_get_arg(8);
             $this->text          = func_get_arg(9);
             $this->tag           = func_get_arg(10);
+            $this->priority      = func_get_arg(11);
         }
     }
 
@@ -118,6 +125,7 @@ public function jsonSerialize()
             array_values($this->media) : null;
         $json['text']          = $this->text;
         $json['tag']           = $this->tag;
+        $json['priority']      = $this->priority;
 
         return array_filter($json);
     }
diff --git a/src/Messaging/Models/MessageRequest.php b/src/Messaging/Models/MessageRequest.php
index b75c646..95d6b70 100644
--- a/src/Messaging/Models/MessageRequest.php
+++ b/src/Messaging/Models/MessageRequest.php
@@ -52,18 +52,26 @@ class MessageRequest implements \JsonSerializable
      */
     public $tag;
 
+    /**
+     * The message's priority, currently for toll-free or short code SMS only. Messages with a priority
+     * value of `"high"` are given preference over your other traffic.
+     * @var string|null $priority public property
+     */
+    public $priority;
+
     /**
      * Constructor to set initial or default values of member properties
      */
     public function __construct()
     {
-        if (6 == func_num_args()) {
+        if (7 == func_num_args()) {
             $this->applicationId = func_get_arg(0);
             $this->to            = func_get_arg(1);
             $this->from          = func_get_arg(2);
             $this->text          = func_get_arg(3);
             $this->media         = func_get_arg(4);
             $this->tag           = func_get_arg(5);
+            $this->priority      = func_get_arg(6);
         }
     }
 
@@ -80,6 +88,7 @@ public function jsonSerialize()
         $json['media']         = isset($this->media) ?
             array_values($this->media) : null;
         $json['tag']           = $this->tag;
+        $json['priority']      = $this->priority;
 
         return array_filter($json);
     }
diff --git a/src/Messaging/Models/PriorityEnum.php b/src/Messaging/Models/PriorityEnum.php
new file mode 100644
index 0000000..cb7ce74
--- /dev/null
+++ b/src/Messaging/Models/PriorityEnum.php
@@ -0,0 +1,25 @@
+<?php
+/*
+ * BandwidthLib
+ *
+ * This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ */
+
+namespace BandwidthLib\Messaging\Models;
+
+/**
+ * The message's priority, currently for toll-free or short code SMS only. Messages with a priority
+ * value of `"high"` are given preference over your other traffic.
+ */
+class PriorityEnum
+{
+    /**
+     * TODO: Write general description for this element
+     */
+    const DEFAULT_ = "default";
+
+    /**
+     * TODO: Write general description for this element
+     */
+    const HIGH = "high";
+}
diff --git a/src/TwoFactorAuth/Controllers/APIController.php b/src/TwoFactorAuth/Controllers/MFAController.php
similarity index 75%
rename from src/TwoFactorAuth/Controllers/APIController.php
rename to src/TwoFactorAuth/Controllers/MFAController.php
index b1e8988..ff3136d 100644
--- a/src/TwoFactorAuth/Controllers/APIController.php
+++ b/src/TwoFactorAuth/Controllers/MFAController.php
@@ -23,7 +23,7 @@
 /**
  * @todo Add a general description for this controller.
  */
-class APIController extends BaseController
+class MFAController extends BaseController
 {
     public function __construct($config, $httpCallBack = null)
     {
@@ -31,7 +31,7 @@ public function __construct($config, $httpCallBack = null)
     }
 
     /**
-     * Two-Factor authentication with Bandwidth Voice services
+     * Allows a user to send a MFA code through a phone call
      *
      * @param string                            $accountId Bandwidth Account ID with Voice service enabled
      * @param Models\TwoFactorCodeRequestSchema $body      TODO: type description here
@@ -89,7 +89,28 @@ public function createVoiceTwoFactor(
 
         //Error handling using HTTP status codes
         if ($response->code == 400) {
-            throw new Exceptions\InvalidRequestException('client request error', $_httpContext);
+            throw new Exceptions\ErrorWithRequestException(
+                'If there is any issue with values passed in by the user',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 401) {
+            throw new Exceptions\UnauthorizedRequestException(
+                'Authentication is either incorrect or not present',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 403) {
+            throw new Exceptions\ForbiddenRequestException(
+                'The user is not authorized to access this resource',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 500) {
+            throw new Exceptions\ErrorWithRequestException('An internal server error occurred', $_httpContext);
         }
 
         //handle errors defined at the API level
@@ -103,7 +124,7 @@ public function createVoiceTwoFactor(
     }
 
     /**
-     * Two-Factor authentication with Bandwidth messaging services
+     * Allows a user to send a MFA code through a text message (SMS)
      *
      * @param string                            $accountId Bandwidth Account ID with Messaging service enabled
      * @param Models\TwoFactorCodeRequestSchema $body      TODO: type description here
@@ -161,7 +182,28 @@ public function createMessagingTwoFactor(
 
         //Error handling using HTTP status codes
         if ($response->code == 400) {
-            throw new Exceptions\InvalidRequestException('client request error', $_httpContext);
+            throw new Exceptions\ErrorWithRequestException(
+                'If there is any issue with values passed in by the user',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 401) {
+            throw new Exceptions\UnauthorizedRequestException(
+                'Authentication is either incorrect or not present',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 403) {
+            throw new Exceptions\ForbiddenRequestException(
+                'The user is not authorized to access this resource',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 500) {
+            throw new Exceptions\ErrorWithRequestException('An internal server error occurred', $_httpContext);
         }
 
         //handle errors defined at the API level
@@ -175,7 +217,7 @@ public function createMessagingTwoFactor(
     }
 
     /**
-     * Verify a previously sent two-factor authentication code
+     * Allows a user to verify an MFA code
      *
      * @param string                              $accountId Bandwidth Account ID with Two-Factor enabled
      * @param Models\TwoFactorVerifyRequestSchema $body      TODO: type description here
@@ -233,7 +275,35 @@ public function createVerifyTwoFactor(
 
         //Error handling using HTTP status codes
         if ($response->code == 400) {
-            throw new Exceptions\InvalidRequestException('client request error', $_httpContext);
+            throw new Exceptions\ErrorWithRequestException(
+                'If there is any issue with values passed in by the user',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 401) {
+            throw new Exceptions\UnauthorizedRequestException(
+                'Authentication is either incorrect or not present',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 403) {
+            throw new Exceptions\ForbiddenRequestException(
+                'The user is not authorized to access this resource',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 429) {
+            throw new Exceptions\ErrorWithRequestException(
+                'The user has made too many bad requests and is temporarily locked out',
+                $_httpContext
+            );
+        }
+
+        if ($response->code == 500) {
+            throw new Exceptions\ErrorWithRequestException('An internal server error occurred', $_httpContext);
         }
 
         //handle errors defined at the API level
diff --git a/src/TwoFactorAuth/Exceptions/ErrorWithRequestException.php b/src/TwoFactorAuth/Exceptions/ErrorWithRequestException.php
new file mode 100644
index 0000000..cd59b2f
--- /dev/null
+++ b/src/TwoFactorAuth/Exceptions/ErrorWithRequestException.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * BandwidthLib
+ *
+ * This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ */
+
+namespace BandwidthLib\TwoFactorAuth\Exceptions;
+
+use BandwidthLib\APIHelper;
+
+/**
+ * @todo Write general description for this model
+ */
+class ErrorWithRequestException extends \BandwidthLib\APIException
+{
+    /**
+     * An error message pertaining to what the issue could be
+     * @var string|null $error public property
+     */
+    public $error;
+
+    /**
+     * The associated requestId from AWS
+     * @var string|null $requestId public property
+     */
+    public $requestId;
+
+    /**
+     * Constructor to set initial or default values of member properties
+     */
+    public function __construct($reason, $context)
+    {
+        parent::__construct($reason, $context);
+    }
+
+    /**
+     * Unbox response into this exception class
+     */
+    public function unbox()
+    {
+        APIHelper::deserialize(self::getResponseBody(), $this, false);
+    }
+}
diff --git a/src/TwoFactorAuth/Exceptions/ForbiddenRequestException.php b/src/TwoFactorAuth/Exceptions/ForbiddenRequestException.php
new file mode 100644
index 0000000..1027f57
--- /dev/null
+++ b/src/TwoFactorAuth/Exceptions/ForbiddenRequestException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * BandwidthLib
+ *
+ * This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ */
+
+namespace BandwidthLib\TwoFactorAuth\Exceptions;
+
+use BandwidthLib\APIHelper;
+
+/**
+ * @todo Write general description for this model
+ */
+class ForbiddenRequestException extends \BandwidthLib\APIException
+{
+    /**
+     * The message containing the reason behind the request being forbidden
+     * @maps Message
+     * @var string|null $message public property
+     */
+    public $message;
+
+    /**
+     * Constructor to set initial or default values of member properties
+     */
+    public function __construct($reason, $context)
+    {
+        parent::__construct($reason, $context);
+    }
+
+    /**
+     * Unbox response into this exception class
+     */
+    public function unbox()
+    {
+        APIHelper::deserialize(self::getResponseBody(), $this, false);
+    }
+}
diff --git a/src/TwoFactorAuth/Exceptions/InvalidRequestException.php b/src/TwoFactorAuth/Exceptions/UnauthorizedRequestException.php
similarity index 74%
rename from src/TwoFactorAuth/Exceptions/InvalidRequestException.php
rename to src/TwoFactorAuth/Exceptions/UnauthorizedRequestException.php
index c097fb6..25ee2da 100644
--- a/src/TwoFactorAuth/Exceptions/InvalidRequestException.php
+++ b/src/TwoFactorAuth/Exceptions/UnauthorizedRequestException.php
@@ -12,13 +12,13 @@
 /**
  * @todo Write general description for this model
  */
-class InvalidRequestException extends \BandwidthLib\APIException
+class UnauthorizedRequestException extends \BandwidthLib\APIException
 {
     /**
-     * An error message pertaining to what the issue could be
-     * @var string|null $result public property
+     * The message containing the reason behind the request being unauthorized
+     * @var string|null $message public property
      */
-    public $result;
+    public $message;
 
     /**
      * Constructor to set initial or default values of member properties
diff --git a/src/TwoFactorAuth/TwoFactorAuthClient.php b/src/TwoFactorAuth/TwoFactorAuthClient.php
index 847badf..48d4e0e 100644
--- a/src/TwoFactorAuth/TwoFactorAuthClient.php
+++ b/src/TwoFactorAuth/TwoFactorAuthClient.php
@@ -21,17 +21,17 @@ public function __construct($config)
     }
 
 
-    private $client;
+    private $mFA;
 
     /**
-     * Provides access to API controller
-     * @return Controllers\APIController
+     * Provides access to MFA controller
+     * @return Controllers\MFAController
      */
-    public function getClient()
+    public function getMFA()
     {
-        if ($this->client == null) {
-            $this->client = new Controllers\APIController($this->config);
+        if ($this->mFA == null) {
+            $this->mFA = new Controllers\MFAController($this->config);
         }
-        return $this->client;
+        return $this->mFA;
     }
 }