Pass config values to Sheets instead of internally retrieving them

This allows us to instantiate a different `Sheets` instance for interacting with a different Google Sheet.
silinternational · Sep 5, 2024 · 7cf39d9 · 7cf39d9
1 parent b4829f4
commit 7cf39d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/application/common/components/Sheets.php b/application/common/components/Sheets.php
@@ -49,12 +49,6 @@ class Sheets extends Component
      */
     public function init()
     {
-        $this->applicationName = \Yii::$app->params['google']['applicationName'];
-        $this->jsonAuthFilePath = \Yii::$app->params['google']['jsonAuthFilePath'];
-        $this->jsonAuthString = \Yii::$app->params['google']['jsonAuthString'];
-        $this->delegatedAdmin = \Yii::$app->params['google']['delegatedAdmin'];
-        $this->spreadsheetId = \Yii::$app->params['google']['spreadsheetId'];
-
         if (!empty($this->jsonAuthFilePath)) {
             if (file_exists($this->jsonAuthFilePath)) {
                 $this->jsonAuthString = \file_get_contents($this->jsonAuthFilePath);

diff --git a/application/common/models/User.php b/application/common/models/User.php
@@ -1536,7 +1536,13 @@ public static function exportToSheets()
             'status' => 'start',
         ]);
 
-        $googleSheetsClient = new Sheets();
+        $googleSheetsClient = new Sheets([
+            'applicationName' => Yii::$app->params['google']['applicationName'],
+            'jsonAuthFilePath' => Yii::$app->params['google']['jsonAuthFilePath'],
+            'jsonAuthString' => Yii::$app->params['google']['jsonAuthString'],
+            'delegatedAdmin' => Yii::$app->params['google']['delegatedAdmin'],
+            'spreadsheetId' => Yii::$app->params['google']['spreadsheetId'],
+        ]);
 
         $activeUsers = User::find()->where(['active' => 'yes'])->all();
         $table = [];