Adds linked_accounts to API response.

Author: AshCorr

Api/Controller/Linking.php

@@ -40,7 +40,7 @@ public function actionGet(ParameterBag $params)
 
         $finder = \XF::finder('YogstationPermissions:LinkedAccount');
 
-        $linked_account = $finder->where('account_id', $params->account_type)
+        $linked_account = $finder->where('account_id', $params->account_id)
                        ->where('account_type', $params->account_type)
                        ->with('User')->fetchOne();
 

Setup.php

@@ -24,7 +24,7 @@ public function installStep1()
 			$table->addColumn('user_id', 'int');
 			$table->addColumn('account_type', 'varchar', 64);
 			$table->addColumn('account_id', 'varchar', 255);
-			$table->addPrimaryKey('user_id');
+			$table->addPrimaryKey(['user_id', 'account_type']);
 		});
 
 		$this->schemaManager()->createTable('yg_linking_key', function(\XF\Db\Schema\Create $table)
@@ -35,5 +35,12 @@ public function installStep1()
 			$table->addColumn('expires', 'int');
 			$table->addPrimaryKey('linking_key');
 		});
-    }
+	}
+
+	public function uninstallStep1()
+	{
+		$this->schemaManager()->dropTable('yg_linked_account');
+		$this->schemaManager()->dropTable('yg_linking_key');
+	}
+
 }

XF/Entity/User.php

@@ -35,6 +35,14 @@ protected function setupApiResultData(
         parent::setupApiResultData($result, $verbosity, $options);
 
         $result->permissions = $this->getPermissions();
-        $result->linked_accounts = $this->LinkedAccounts;
+
+        $linked_accounts = [];
+
+        foreach ($this->LinkedAccounts as $account)
+        {
+            $linked_accounts[$account->account_type] = $account->account_id;
+        }
+
+        $result->linked_account = $linked_accounts;
     }
 }

addon.json

@@ -2,8 +2,8 @@
     "legacy_addon_id": "",
     "title": "Yogstation Permissions",
     "description": "",
-    "version_id": 20201007,
-    "version_string": "20201007",
+    "version_id": 20201008,
+    "version_string": "20201008",
     "dev": "",
     "dev_url": "",
     "faq_url": "",