From 4db703aeb11d9c242157a272b76a83136763386d Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Sun, 17 Jun 2018 18:21:12 -0700 Subject: [PATCH] Make the UI capability based --- src/index.html | 22 +++++++++++----------- src/js/client.js | 12 +++++++++--- src/js/index.js | 2 +- src/js/main.js | 2 +- src/views/apps.html | 8 ++++---- src/views/apps.js | 2 +- src/views/appstore.html | 8 ++++---- src/views/users.html | 2 +- src/views/users.js | 4 ---- 9 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/index.html b/src/index.html index 21cc06580..6aa1cf465 100644 --- a/src/index.html +++ b/src/index.html @@ -144,25 +144,25 @@
  • My Apps
    • -
  • +
  • App Store
    • -
  • +
  • Users
  • diff --git a/src/js/client.js b/src/js/client.js index b12a41c61..9eeb4ec75 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -111,7 +111,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N id: null, username: null, email: null, - admin: false, + caps: {}, twoFactorAuthenticationEnabled: false }; this._config = { @@ -224,11 +224,17 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N this._userInfo.email = userInfo.email; this._userInfo.fallbackEmail = userInfo.fallbackEmail; this._userInfo.displayName = userInfo.displayName; - this._userInfo.admin = !!userInfo.admin; this._userInfo.twoFactorAuthenticationEnabled = userInfo.twoFactorAuthenticationEnabled; - this._userInfo.scope = userInfo.scope; + this._userInfo.tokenScope = userInfo.tokenScope; this._userInfo.gravatar = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email) + '.jpg?s=24&d=mm'; this._userInfo.gravatarHuge = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email) + '.jpg?s=128&d=mm'; + + // clear and then set properties to keep angular happy + var caps = this._userInfo.caps; + for (var p in caps) delete caps[p]; + userInfo.tokenScope.split(',').forEach(function (scope) { + caps[scope] = true; + }); }; Client.prototype.setConfig = function (config) { diff --git a/src/js/index.js b/src/js/index.js index a51077f98..080e28210 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -142,7 +142,7 @@ app.filter('appIsInstalledAndHealthy', function () { app.filter('activeOAuthClients', function () { return function (clients, user) { - return clients.filter(function (c) { return user.admin || (c.activeTokens && c.activeTokens.length > 0); }); + return clients.filter(function (c) { return user.caps.clients || (c.activeTokens && c.activeTokens.length > 0); }); }; }); diff --git a/src/js/main.js b/src/js/main.js index 47486e29c..6e74a0d88 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -179,7 +179,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route', $scope.initialized = true; - if ($scope.user.admin) { + if ($scope.user.caps.cloudron) { runConfigurationChecks(); $scope.fetchAppstoreProfileAndSubscription(function (error) { diff --git a/src/views/apps.html b/src/views/apps.html index 66f09383c..5014b4c0d 100644 --- a/src/views/apps.html +++ b/src/views/apps.html @@ -430,7 +430,7 @@
     
    -
    +




    No apps installed yet!

    @@ -439,7 +439,7 @@
    -
    +




    You don't have access to any apps on this Cloudron yet!

    @@ -480,7 +480,7 @@
    -
    +
    @@ -500,7 +500,7 @@
    -
    +
    diff --git a/src/views/apps.js b/src/views/apps.js index 662a52cc7..5e9a7d7d6 100644 --- a/src/views/apps.js +++ b/src/views/apps.js @@ -586,7 +586,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location Client.refreshInstalledApps(function (error) { if (error) return console.error(error); - if ($scope.user.admin) { + if ($scope.user.caps.apps) { fetchUsers(); fetchGroups(); getDomains(); diff --git a/src/views/appstore.html b/src/views/appstore.html index 5948e6f25..45893081d 100644 --- a/src/views/appstore.html +++ b/src/views/appstore.html @@ -153,10 +153,10 @@
    - - - - + + + + Setup Subscription
    diff --git a/src/views/users.html b/src/views/users.html index 6292fc357..882904bc0 100644 --- a/src/views/users.html +++ b/src/views/users.html @@ -258,7 +258,7 @@ - + {{ user.username }}   {{ user.email }} diff --git a/src/views/users.js b/src/views/users.js index aabac076b..82add6894 100644 --- a/src/views/users.js +++ b/src/views/users.js @@ -325,10 +325,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio return user.username === Client.getUserInfo().username; }; - $scope.isAdmin = function (user) { - return !!user.admin; - }; - $scope.sendInvite = function (user) { $scope.inviteSent.email = user.fallbackEmail; $scope.inviteSent.setupLink = '';