Commit 154ad659 authored by Fran Garcia-Linares's avatar Fran Garcia-Linares Committed by Jürgen Haas
Browse files

Issue #3219570 by fjgarlin: Mix up between objects and arrays due to json_decode params

parent d3a0ccee

discourse_sync/src/Role.php

+9 −8
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class Role extends SingleSignOnBase { 
      $response = json_decode($request->getBody(), TRUE);



      if (!empty($response)) {

        $id = $response->basic_group->id;

        $id = $response['basic_group']['id'];

        $message = $this->t('Discourse group #@id: @name created.', [

          '@id' => $id,

          '@name' => $name,
@@ -105,8 +105,7 @@ class Role extends SingleSignOnBase { 
      $request = $this->client->request($method, $url, $parameters);

      $response = json_decode($request->getBody(), TRUE);



      if (!empty($response)

        && isset($response->success)) {

      if (!empty($response) && isset($response['success'])) {

        $message = $this->t('Discourse group: @name updated.', ['@name' => $name]);

        $this->notify($message);

      }
@@ -286,8 +285,8 @@ class Role extends SingleSignOnBase { 
        $response = json_decode($request->getBody(), TRUE);



        foreach ($response as $group) {

          if ($group->name === $name) {

            return $group->id;

          if ($group['name'] === $name) {

            return $group['id'];

          }

        }

      }
@@ -327,9 +326,11 @@ class Role extends SingleSignOnBase { 
  protected function getCustomUserGroups($user): array {

    $groups = [];



    foreach ($user->user->groups as $group) {

      if ($group->automatic === FALSE) {

        $groups[$group->id] = $group->name;

    if (!empty($user['user']) && !empty($user['user']['groups'])) {

      foreach ($user['user']['groups'] as $group) {

        if ($group['automatic'] === FALSE) {

          $groups[$group['id']] = $group['name'];

        }

      }

    }