Merge pull request #60 from silinternational/develop

Fix isEnrolled2Sv and isEnforced2Sv values

Author: mtompset

SilMock/Google/Service/Directory/UsersResource.php

@@ -165,6 +165,8 @@ public function insert($postBody)
             'lastLoginTime' => $currentDateTime->format('c'),
             'creationTime' => $currentDateTime->format('c'),
             'agreedToTerms' => false,
+            'isEnforcedIn2Sv' => 'false',
+            'isEnrolledIn2Sv' => 'false',
         );
 
         // array_merge will not work, since $postBody is an object which only
@@ -202,7 +204,7 @@ public function insert($postBody)
                 $newAlias->kind = "personal";
                 $newAlias->primaryEmail = $postBody->primaryEmail;
 
-                $insertedAlias = $usersAliases->insertAssumingUserExists($newAlias);
+                $usersAliases->insertAssumingUserExists($newAlias);
             }
         }
 
@@ -240,6 +242,12 @@ public function update($userKey, $postBody)
                 $dbUserProps[$key] = $value;
             }
         }
+        if (!isset($dbUserProps['isEnforcedIn2Sv'])) {
+            $dbUserProps['isEnforcedIn2Sv'] = 'false';
+        }
+        if (!isset($dbUserProps['isEnrolledIn2Sv'])) {
+            $dbUserProps['isEnrolledIn2Sv'] = 'false';
+        }
 
         // Delete the user's old aliases before adding the new ones
         $usersAliases = new UsersAliasesResource($this->dbFile);
@@ -402,10 +410,11 @@ private function doesUserMatch($entry, $query = '')
         }
         if (! is_string($checkValue)) {
             throw new \Exception(sprintf(
-                "Expecting a string.\nGot Entry: %s\nGot Field: %s\nGot VALUE: %s",
+                "Expecting a string.\nGot Entry: %s\nGot Field: %s\nGot VALUE: %s (%s)",
                 var_export($entry, true),
                 var_export($field, true),
-                var_export($checkValue, true)
+                var_export($checkValue, true),
+                gettype($checkValue)
             ));
         }
         if (mb_strpos($checkValue, $value) === 0) {