CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat-scope-capabilities

Browse Source
This commit is contained in:
Dharini Jeeva authored and GitHub committed 2021-08-16 15:49:59 -07:00
2 parents ee390a6fea 3728e4cd51
commit 59932f52db
6 files changed
+54 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package.json
+1 -1
View File
@@ -76,7 +76,7 @@
"minimist": "^1.2.3",
"normalize-url": "^4.5.1",
"glob-parent": "^5.1.2",
"tar": "^3.2.3 - ^4.4.15 - ^5.0.7 - ^6.1.2",
"tar": "^6.1.2",
"xmldom": "github:xmldom/xmldom#0.7.0"
},
"config": {
ui/admin/app/abilities/model.js
+19
View File
@@ -0,0 +1,19 @@
import ModelAbility from 'api/abilities/model';
import { inject as service } from '@ember/service';
export default class OverrideModelAbility extends ModelAbility {
// =services
@service features;
// =methods
/**
* If the capabilities feature flag is disabled, actions are always
* authorized. This mimics pre-capabilities behavior.
*/
hasAuthorizedAction() {
if (!this.features.isEnabled('capabilities')) return true;
return super.hasAuthorizedAction(...arguments);
}
}
ui/admin/config/environment.js
+2 -2
View File
@@ -131,7 +131,7 @@ module.exports = function (environment) {
if (API_HOST) ENV.contentSecurityPolicy['connect-src'].push(API_HOST);
// Enable features in development
// ENV.featureFlags['credential-store'] = true;
ENV.featureFlags['capabilities'] = true;
}
if (environment === 'test') {
@@ -156,7 +156,7 @@ module.exports = function (environment) {
ENV.enableConfirmService = false;
// Enable tests for development features
// ENV.featureFlags['credential-store'] = true;
ENV.featureFlags['capabilities'] = true;
}
if (environment === 'production') {
ui/desktop/app/abilities/model.js
+19
View File
@@ -0,0 +1,19 @@
import ModelAbility from 'api/abilities/model';
import { inject as service } from '@ember/service';
export default class OverrideModelAbility extends ModelAbility {
// =services
@service features;
// =methods
/**
* If the capabilities feature flag is disabled, actions are always
* authorized. This mimics pre-capabilities behavior.
*/
hasAuthorizedAction() {
if (!this.features.isEnabled('capabilities')) return true;
return super.hasAuthorizedAction(...arguments);
}
}
ui/desktop/config/environment.js
+4 -1
View File
@@ -80,7 +80,7 @@ module.exports = function (environment) {
ENV.autoOrigin = true;
// Enable features in development
ENV.featureFlags['oidc'] = true;
ENV.featureFlags['capabilities'] = true;
}
if (environment === 'test') {
@@ -103,6 +103,9 @@ module.exports = function (environment) {
ENV.storage = {
memory: true,
};
// Enable tests for development features
ENV.featureFlags['capabilities'] = true;
}
if (environment === 'production') {
yarn.lock
+9 -48
View File
@@ -11026,14 +11026,7 @@ fs-merger@^3.0.1, fs-merger@^3.2.1:
fs-tree-diff "^2.0.1"
walk-sync "^2.2.0"
fs-minipass@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
dependencies:
minipass "^2.6.0"
fs-minipass@^2.0.0, fs-minipass@^2.1.0:
fs-minipass@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -15139,7 +15132,7 @@ minipass-sized@^1.0.3:
dependencies:
minipass "^3.0.0"
minipass@^2.2.0, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
minipass@^2.2.0, minipass@^2.3.5:
version "2.9.0"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -15154,14 +15147,7 @@ minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.
dependencies:
yallist "^4.0.0"
minizlib@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
dependencies:
minipass "^2.9.0"
minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
minizlib@^2.0.0, minizlib@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -18674,7 +18660,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -20029,35 +20015,10 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15:
version "4.4.16"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.16.tgz#4a48b3c025e77d9d0c788f038a09b91c594d326d"
integrity sha512-gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g==
dependencies:
chownr "^1.1.4"
fs-minipass "^1.2.7"
minipass "^2.9.0"
minizlib "^1.3.3"
mkdirp "^0.5.5"
safe-buffer "^5.2.1"
yallist "^3.1.1"
tar@^5.0.5:
version "5.0.8"
resolved "https://registry.yarnpkg.com/tar/-/tar-5.0.8.tgz#8cbddead599d7335aa2be551bfb18521dea488a2"
integrity sha512-v71KDHvYI+EJ8+o6W44fzuiTDcfHrlVjtvn4ITF1ClH5GbU6H9InNX1XNG07YwZSkloNQQxAJabkjEdHyqjn1g==
dependencies:
chownr "^1.1.4"
fs-minipass "^2.1.0"
minipass "^3.1.3"
minizlib "^2.1.2"
mkdirp "^0.5.5"
yallist "^4.0.0"
tar@^6.0.2, tar@^6.0.5, tar@^6.1.0:
version "6.1.7"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15, tar@^5.0.5, tar@^6.0.2, tar@^6.0.5, tar@^6.1.0, tar@^6.1.2:
version "6.1.8"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4"
integrity sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -21776,7 +21737,7 @@ yallist@^2.1.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
yallist@^3.0.0, yallist@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==