Change error handling to remove special HTML body handling (since thi…

…s has been fixed in the Java code) and add check for response code >= 400. Add error supression '@' for response array accessors.
cilogon · May 25, 2017 · 62a4e93 · 62a4e93
1 parent 884858d
commit 62a4e93
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/src/Provider/CILogon.php b/src/Provider/CILogon.php
@@ -92,19 +92,24 @@ protected function getScopeSeparator()
      */
     protected function checkResponse(ResponseInterface $response, $data)
     {
-        if ((gettype($data) == 'string') &&
-            (preg_match('/error="([^"]*)"/', $data, $matches))) {
-            $message = $matches[1];
-            if (preg_match('/error_description="([^"]*)"/', $data, $matches)) {
-                $message .= ': ' . urldecode($matches[1]);
-            }
-            throw new IdentityProviderException($message, 0, $data);
-        } elseif (!empty($data['error'])) {
-            $message = $data['error'];
+        $error = false;
+        $errcode = 0;
+        $errmsg = '';
+
+        if (!empty($data['error'])) {
+            $error = true;
+            $errmsg = $data['error'];
             if (!empty($data['error_description'])) {
-                $message .= ': ' . $data['error_description'];
+                $errmsg .= ': ' . $data['error_description'];
             }
-            throw new IdentityProviderException($message, 0, $data);
+        } elseif ($response->getStatusCode() >= 400) {
+            $error = true;
+            $errcode = $resopnse->getStatusCode();
+            $errmsg = $response->getReasonPhrase();
+        }
+
+        if ($error) {
+            throw new IdentityProviderException($errmsg, $errcode, $data);
         }
     }
 

diff --git a/src/Provider/CILogonResourceOwner.php b/src/Provider/CILogonResourceOwner.php
@@ -42,7 +42,7 @@ public function __construct(array $response = array())
      */
     public function getId()
     {
-        return $this->response['sub'] ?: null;
+        return @$this->response['sub'] ?: null;
     }
 
     /**
@@ -52,7 +52,7 @@ public function getId()
      */
     public function getName()
     {
-        return $this->response['name'] ?: null;
+        return @$this->response['name'] ?: null;
     }
 
     /**
@@ -62,7 +62,7 @@ public function getName()
      */
     public function getGivenName()
     {
-        return $this->response['given_name'] ?: null;
+        return @$this->response['given_name'] ?: null;
     }
 
     /**
@@ -83,7 +83,7 @@ public function getFirstName()
      */
     public function getFamilyName()
     {
-        return $this->response['family_name'] ?: null;
+        return @$this->response['family_name'] ?: null;
     }
 
     /**
@@ -104,7 +104,7 @@ public function getLastName()
      */
     public function getEPPN()
     {
-        return $this->response['eppn'] ?: null;
+        return @$this->response['eppn'] ?: null;
     }
 
     /**
@@ -114,7 +114,7 @@ public function getEPPN()
      */
     public function getEPTID()
     {
-        return $this->response['eptid'] ?: null;
+        return @$this->response['eptid'] ?: null;
     }
 
     /**
@@ -124,7 +124,7 @@ public function getEPTID()
      */
     public function getEmail()
     {
-        return $this->response['email'] ?: null;
+        return @$this->response['email'] ?: null;
     }
 
     /**
@@ -135,7 +135,7 @@ public function getEmail()
      */
     public function getIdP()
     {
-        return $this->response['idp'] ?: null;
+        return @$this->response['idp'] ?: null;
     }
 
     /**
@@ -146,7 +146,7 @@ public function getIdP()
      */
     public function getIdPName()
     {
-        return $this->response['idp_name'] ?: null;
+        return @$this->response['idp_name'] ?: null;
     }
 
     /**
@@ -156,7 +156,7 @@ public function getIdPName()
      */
     public function getOU()
     {
-        return $this->response['ou'] ?: null;
+        return @$this->response['ou'] ?: null;
     }
 
     /**
@@ -166,7 +166,7 @@ public function getOU()
      */
     public function getAffiliation()
     {
-        return $this->response['affiliation'] ?: null;
+        return @$this->response['affiliation'] ?: null;
     }
 
     /**