Merge branch 'develop' into feature/docker

simde-utc · Nov 15, 2019 · 711da7b · 711da7b
2 parents 99afc53 + 40a6345
commit 711da7b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/app/Services/Ginger.php b/app/Services/Ginger.php
@@ -146,14 +146,13 @@ public function responseCode(string $login)
      */
     public function getContributions(string $login=null)
     {
-        if (!$this->get()) {
-            if ($login) {
-                $this->user($login);
-            }
 
-            if (!$this->get()) {
-                return [];
-            }
+        if ($login && (!$this->user || $this->user->login != $login)) {
+            $this->user($login);
+        }
+
+        if (!$this->get()) {
+            return [];
         }
 
         $contributionList = $this->call(

diff --git a/app/Services/Scopes.php b/app/Services/Scopes.php
@@ -69,7 +69,7 @@ public function allowPublic(bool $allow=true)
     }
 
     /**
-     * Define the middleware to call.
+     * Define the middleware to call for authentication.
      *
      * @return string
      */
@@ -284,7 +284,7 @@ public function getByCategories(array $scopes)
             if (!isset($middleware)) {
                 $middleware = $elements[0];
             } else if ($middleware !== $elements[0]) {
-                // Scopes starting by c- and u-.
+                // Scopes starting by client- and user-.
                 throw new PortailException('Les scopes ne sont pas définis avec les mêmes types d\'authentification !');
             }
 
@@ -299,11 +299,14 @@ public function getByCategories(array $scopes)
 
                 $categories[$elements[2]] = [
                     'description' => $categorie['description'],
-                    'icon' => $categorie['icon'],
                     'scopes' => [
                         $current[$scope]
                     ]
                 ];
+
+                if ($elements[0] == "user") {
+                    $categories[$elements[2]]['icon'] = $categorie['icon'];
+                }
             } else {
                 array_push($categories[$elements[2]]['scopes'], $current[$scope]);
             }