refs #8 don't get avatars of private repos

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Oct 9, 2020 · 94829fc · 94829fc
1 parent ba6dd88
commit 94829fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Service/GitlabAPIService.php b/lib/Service/GitlabAPIService.php
@@ -55,6 +55,7 @@ private function getMyProjectsInfo(string $url, string $accessToken): array {
 			$projectsInfo[$pid] = [
 				'path_with_namespace' => $project['path_with_namespace'],
 				'avatar_url' => $project['avatar_url'],
+				'visibility' => $project['visibility'],
 			];
 		}
 		return $projectsInfo;
@@ -294,16 +295,19 @@ public function getTodos(string $url, string $accessToken, ?string $since = null
 			$pid = $todo['project']['id'];
 			if (array_key_exists($pid, $projectsInfo)) {
 				$result[$k]['project']['avatar_url'] = $projectsInfo[$pid]['avatar_url'];
+				$result[$k]['project']['visibility'] = $projectsInfo[$pid]['visibility'];
 			} else {
 				// get the project avatar
 				$projectInfo = $this->request($url, $accessToken, 'projects/' . $pid);
 				if (isset($projectInfo['error'])) {
 					return $projectInfo;
 				}
 				$result[$k]['project']['avatar_url'] = $projectInfo['avatar_url'];
+				$result[$k]['project']['visibility'] = $projectInfo['visibility'];
 				// cache result
 				$projectsInfo[$pid] = [
-					'avatar_url' => $projectInfo['avatar_url']
+					'avatar_url' => $projectInfo['avatar_url'],
+					'visibility' => $projectInfo['visibility'],
 				];
 			}
 		}

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -181,7 +181,7 @@ export default {
 			return n.id + ':' + n.updated_at
 		},
 		getNotificationImage(n) {
-			return (n.project && n.project.avatar_url)
+			return (n.project && n.project.avatar_url && n.project.visibility !== 'private')
 				? generateUrl('/apps/integration_gitlab/avatar?') + encodeURIComponent('url') + '=' + encodeURIComponent(n.project.avatar_url)
 				: ''
 		},