Plugin: Azure: Move methods to parent class - refs BT#21930

AngelFQC · Sep 13, 2024 · 274f9f2 · 274f9f2
1 parent 90588f2
commit 274f9f2
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 100 deletions.
diff --git a/plugin/azure_active_directory/src/AzureCommand.php b/plugin/azure_active_directory/src/AzureCommand.php
@@ -37,6 +37,106 @@ protected function generateOrRefreshToken(?AccessTokenInterface &$token)
         }
     }
 
+    /**
+     * @throws Exception
+     *
+     * @return Generator<int, array<string, string>>
+     */
+    protected function getAzureUsers(): Generator
+    {
+        $userFields = [
+            'givenName',
+            'surname',
+            'mail',
+            'userPrincipalName',
+            'businessPhones',
+            'mobilePhone',
+            'accountEnabled',
+            'mailNickname',
+            'id',
+        ];
+
+        $query = sprintf(
+            '$top=%d&$select=%s',
+            AzureActiveDirectory::API_PAGE_SIZE,
+            implode(',', $userFields)
+        );
+
+        $token = null;
+
+        do {
+            $this->generateOrRefreshToken($token);
+
+            try {
+                $azureUsersRequest = $this->provider->request(
+                    'get',
+                    "users?$query",
+                    $token
+                );
+            } catch (Exception $e) {
+                throw new Exception('Exception when requesting users from Azure: '.$e->getMessage());
+            }
+
+            $azureUsersInfo = $azureUsersRequest['value'] ?? [];
+
+            foreach ($azureUsersInfo as $azureUserInfo) {
+                yield $azureUserInfo;
+            }
+
+            $hasNextLink = false;
+
+            if (!empty($azureUsersRequest['@odata.nextLink'])) {
+                $hasNextLink = true;
+                $query = parse_url($azureUsersRequest['@odata.nextLink'], PHP_URL_QUERY);
+            }
+        } while ($hasNextLink);
+    }
+
+    /**
+     * @throws Exception
+     *
+     * @return Generator<int, array<string, string>>
+     */
+    protected function getAzureGroups(): Generator
+    {
+        $groupFields = [
+            'id',
+            'displayName',
+            'description',
+        ];
+
+        $query = sprintf(
+            '$top=%d&$select=%s',
+            AzureActiveDirectory::API_PAGE_SIZE,
+            implode(',', $groupFields)
+        );
+
+        $token = null;
+
+        do {
+            $this->generateOrRefreshToken($token);
+
+            try {
+                $azureGroupsRequest = $this->provider->request('get', "groups?$query", $token);
+            } catch (Exception $e) {
+                throw new Exception('Exception when requesting groups from Azure: '.$e->getMessage());
+            }
+
+            $azureGroupsInfo = $azureGroupsRequest['value'] ?? [];
+
+            foreach ($azureGroupsInfo as $azureGroupInfo) {
+                yield $azureGroupInfo;
+            }
+
+            $hasNextLink = false;
+
+            if (!empty($azureGroupsRequest['@odata.nextLink'])) {
+                $hasNextLink = true;
+                $query = parse_url($azureGroupsRequest['@odata.nextLink'], PHP_URL_QUERY);
+            }
+        } while ($hasNextLink);
+    }
+
     /**
      * @return Generator<int, array<string, string>>
      *

diff --git a/plugin/azure_active_directory/src/AzureSyncUsergroupsCommand.php b/plugin/azure_active_directory/src/AzureSyncUsergroupsCommand.php
@@ -67,49 +67,4 @@ public function __invoke(): Generator
             }
         }
     }
-
-    /**
-     * @throws Exception
-     *
-     * @return Generator<int, array<string, string>>
-     */
-    private function getAzureGroups(): Generator
-    {
-        $groupFields = [
-            'id',
-            'displayName',
-            'description',
-        ];
-
-        $query = sprintf(
-            '$top=%d&$select=%s',
-            AzureActiveDirectory::API_PAGE_SIZE,
-            implode(',', $groupFields)
-        );
-
-        $token = null;
-
-        do {
-            $this->generateOrRefreshToken($token);
-
-            try {
-                $azureGroupsRequest = $this->provider->request('get', "groups?$query", $token);
-            } catch (Exception $e) {
-                throw new Exception('Exception when requesting groups from Azure: '.$e->getMessage());
-            }
-
-            $azureGroupsInfo = $azureGroupsRequest['value'] ?? [];
-
-            foreach ($azureGroupsInfo as $azureGroupInfo) {
-                yield $azureGroupInfo;
-            }
-
-            $hasNextLink = false;
-
-            if (!empty($azureGroupsRequest['@odata.nextLink'])) {
-                $hasNextLink = true;
-                $query = parse_url($azureGroupsRequest['@odata.nextLink'], PHP_URL_QUERY);
-            }
-        } while ($hasNextLink);
-    }
 }
diff --git a/plugin/azure_active_directory/src/AzureSyncUsersCommand.php b/plugin/azure_active_directory/src/AzureSyncUsersCommand.php
@@ -88,59 +88,4 @@ function ($user) {
             );
         }
     }
-
-    /**
-     * @throws Exception
-     *
-     * @return Generator<int, array<string, string>>
-     */
-    private function getAzureUsers(): Generator
-    {
-        $userFields = [
-            'givenName',
-            'surname',
-            'mail',
-            'userPrincipalName',
-            'businessPhones',
-            'mobilePhone',
-            'accountEnabled',
-            'mailNickname',
-            'id',
-        ];
-
-        $query = sprintf(
-            '$top=%d&$select=%s',
-            AzureActiveDirectory::API_PAGE_SIZE,
-            implode(',', $userFields)
-        );
-
-        $token = null;
-
-        do {
-            $this->generateOrRefreshToken($token);
-
-            try {
-                $azureUsersRequest = $this->provider->request(
-                    'get',
-                    "users?$query",
-                    $token
-                );
-            } catch (Exception $e) {
-                throw new Exception('Exception when requesting users from Azure: '.$e->getMessage());
-            }
-
-            $azureUsersInfo = $azureUsersRequest['value'] ?? [];
-
-            foreach ($azureUsersInfo as $azureUserInfo) {
-                yield $azureUserInfo;
-            }
-
-            $hasNextLink = false;
-
-            if (!empty($azureUsersRequest['@odata.nextLink'])) {
-                $hasNextLink = true;
-                $query = parse_url($azureUsersRequest['@odata.nextLink'], PHP_URL_QUERY);
-            }
-        } while ($hasNextLink);
-    }
 }