adds linked accounts to API and finishes linked account page.

Author: AshCorr

Api/Controller/Linking.php

@@ -25,7 +25,7 @@ public function actionPost(ParameterBag $params)
         $this->assertSuperUserKey();
 		$this->assertApiScope('linking');
 
-        $key = $this->service('YogstationPermissions:Linking\Generate', $params->account_type, $params->account_type)->generateKey();
+        $key = $this->service('YogstationPermissions:Linking\Generate', $params->account_type, $params->account_id)->generateKey();
 
         return $this->apiSuccess([
             'key' => $key,
@@ -40,17 +40,17 @@ public function actionGet(ParameterBag $params)
 
         $finder = \XF::finder('YogstationPermissions:LinkedAccount');
 
-        $user = $finder->where('account_id', $params->account_type)
+        $linked_account = $finder->where('account_id', $params->account_type)
                        ->where('account_type', $params->account_type)
                        ->with('User')->fetchOne();
 
-        if(!$user)
+        if(!$linked_account)
         {
             return $this->error(\XF::phrase('yg_no_linked_account'));
         }
 
         return $this->apiSuccess([
-            'user' => $user
+            'user' => $linked_account->User
         ]);
     }
 }

Entity/LinkedAccount.php

@@ -11,7 +11,7 @@ public static function getStructure(Structure $structure)
 	{
         $structure->table = 'yg_linked_account';
 		$structure->shortName = 'YG:LinkedAccount';
-        $structure->primaryKey = 'user_id';
+        $structure->primaryKey = ['user_id', 'account_type'];
         $structure->columns = [
             'user_id' => ['type' => self::UINT],
             'account_type' => ['type' => self::STR, 'maxLength' => 50],
@@ -28,4 +28,11 @@ public static function getStructure(Structure $structure)
 
         return $structure;
     }
+
+    protected function setupApiResultData(
+		\XF\Api\Result\EntityResult $result, $verbosity = self::VERBOSITY_NORMAL, array $options = [])
+    {
+        $result->account_type = $this->account_type;
+        $result->account_id = $this->account_id;
+    }
 }

Listener/User.php

@@ -8,6 +8,13 @@ class User
 {
     public static function userEntityStructure(\XF\Mvc\Entity\Manager $em, \XF\Mvc\Entity\Structure &$structure)
     {
-            $structure->getters['permissions'] = true;
+        $structure->getters['permissions'] = true;
+        
+        $structure->relations['LinkedAccounts'] = [
+            'entity' => 'YogstationPermissions:LinkedAccount',
+            'type' => Entity::TO_MANY,
+            'conditions' => 'user_id',
+            'primary' => true
+        ];
     }
 }

Pub/Controller/Linking.php

@@ -13,9 +13,11 @@ protected function preDispatchController($action, ParameterBag $params)
 
     public function actionLink(ParameterBag $params) {
         $visitor = \XF::visitor();
+        
+        $linking_key = $this->filter('key', 'str');
 
         $linking_key = \XF::finder('YogstationPermissions:LinkingKey')
-            ->where('linking_key', $params->key)
+            ->where('linking_key', $linking_key)
             ->fetchOne();
 
         if(!$linking_key) {
@@ -24,10 +26,10 @@ public function actionLink(ParameterBag $params) {
 
         $this->service('YogstationPermissions:Linking\Linking', $visitor->user_id, $linking_key)->link();
 
-        return $this->redirect($this->buildLink('linking/success'));
+        return $this->redirect($this->buildLink('linking/success', null, ["account_type" => $linking_key->account_type]));
     }
 
     public function actionSuccess() {
-        return $this->view('YogstationPermissions:Linking\Success', 'yg_linking_success');
+        return $this->view('YogstationPermissions:Linking\Success', 'yg_linking_success', ['account_type' => $this->filter('account_type', 'str')]);
     }
 }

Service/Linking/Linking.php

@@ -26,17 +26,19 @@ public function link()
 
         $linked_account->save();
 
-        return $key;
+        return $linked_account;
     }
 
     public function removeOldAccounts() {
         $finder = \XF::finder('YogstationPermissions:LinkedAccount');
 
-        $linked_account = $finder->where('account_id', $params->account_type)
-                       ->where('account_type', $params->account_type)
-                       ->fetchOne();
+        $linked_account = $finder->where('account_type', $this->linking_key->account_type)
+                       ->whereOr(
+                           ['account_id', $this->linking_key->account_type],
+                           ['user_id', $this->user_id]
+                        )->fetchOne();
 
-        if($user) {
+        if($linked_account) {
             $linked_account->delete();
         }
     }

XF/Entity/User.php

@@ -11,11 +11,16 @@ public function getPermissions() {
 
         $permissions = [];
 
-        foreach ($this->getPermissionSet()->getGlobalPerms() as $group => $group_values) {
-            foreach($group_values as $permission => $value) {
-                if ($value == true) {
+        foreach ($this->getPermissionSet()->getGlobalPerms() as $group => $group_values)
+        {
+            foreach($group_values as $permission => $value)
+            {
+                if ($value == true)
+                {
                     $permissions[] = $group . "." . $permission;
-                } elseif ($value) {
+                }
+                elseif ($value)
+                {
                     $permissions[] = $group . "." . $permission . '.' . $value;
                 }
             }
@@ -25,11 +30,11 @@ public function getPermissions() {
     }
 
     protected function setupApiResultData(
-		\XF\Api\Result\EntityResult $result, $verbosity = self::VERBOSITY_NORMAL, array $options = []
-	) {
+		\XF\Api\Result\EntityResult $result, $verbosity = self::VERBOSITY_NORMAL, array $options = [])
+    {
         parent::setupApiResultData($result, $verbosity, $options);
 
         $result->permissions = $this->getPermissions();
+        $result->linked_accounts = $this->LinkedAccounts;
     }
-
 }

_output/phrases/_metadata.json

@@ -184,5 +184,11 @@
         "version_id": 20201006,
         "version_string": "20.20.10 6",
         "hash": "df1945eeae99df4ac8e4216678326ebc"
+    },
+    "yg_key_not_exist.txt": {
+        "global_cache": false,
+        "version_id": 20201006,
+        "version_string": "20.20.10 6",
+        "hash": "c8e39ae7d9b2186c9986aecf294ec900"
     }
 }

_output/phrases/yg_key_not_exist.txt

@@ -0,0 +1,2 @@
+This linking URL has expired, pleaes generate a new link.
+Links expire after 15 minutes.

_output/routes/_metadata.json

@@ -1,5 +1,8 @@
 {
     "api_linking_.json": {
         "hash": "8746785f7f0cde8a03be2abafa5d6751"
+    },
+    "public_linking_.json": {
+        "hash": "bbcf1941dcc62b76e44af2e896e2bf7d"
     }
 }

_output/routes/public_linking_.json

@@ -0,0 +1,11 @@
+{
+    "route_type": "public",
+    "route_prefix": "linking",
+    "sub_name": "",
+    "format": "",
+    "build_class": "",
+    "build_method": "",
+    "controller": "YogstationPermissions:Linking",
+    "context": "",
+    "action_prefix": ""
+}