From 3ee61c3d291a53e56acdccfd0b462d29d22b4ceb Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Wed, 8 Apr 2020 20:04:49 +0100 Subject: [PATCH] [ACA-2734] Be able to show an extension based on provider (#1405) * Ability to disable extension based on provider * Remove mystake * Use latest adf --- extension.schema.json | 5 ++++ package-lock.json | 28 +++++++++---------- package.json | 6 ++-- .../components/sidenav/sidenav.component.html | 8 +++--- .../components/sidenav/sidenav.component.ts | 9 +++++- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/extension.schema.json b/extension.schema.json index 0cdb45549..ee5447fed 100644 --- a/extension.schema.json +++ b/extension.schema.json @@ -179,6 +179,11 @@ "description": "Unique identifier", "type": "string" }, + "provider": { + "description": "Define on which system the user should be authenticate", + "type": "string", + "enum": ["BPM", "ECM", "ALL"] + }, "icon": { "description": "Element icon", "type": "string" diff --git a/package-lock.json b/package-lock.json index 137ac46b4..7df4d3c46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,25 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5.tgz", - "integrity": "sha512-C+2t2qe6KXOG1pDq2aSTTiDqohNf0z4gWitI70khQ0bBLzg6arZPLtCoH9sbyojnzUJ9OZrmm8MjCb71wARkQA==", + "version": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.8.0-83e362d31a737200bc9251e9505137f198509d2f.tgz", + "integrity": "sha512-zazTFT5uMb8J7SKoAwQWYOEAQRyifhtRdoDO02sl5/KKh8BPELH7Ba5wgq+SWOPxUwHq2bR8aESfQvs/64NyIw==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5.tgz", - "integrity": "sha512-IWP2C9fyjOq/RoyVU1LhSz+14mO2JuQUJu9AZ7XfVLAyYAOHVsIOoLTYjjfjhlhlXeGPnwinBpNsbzvrOz3+OA==", + "version": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.8.0-83e362d31a737200bc9251e9505137f198509d2f.tgz", + "integrity": "sha512-DW4fUWOtopsZLDhadULW8ywJKHqOdZIRE9YoTlT7023U2iAN6eLMBep7zPAcMNRuzRshw5Uteit1k5uLI2lSPw==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5.tgz", - "integrity": "sha512-kaYtmIhO1pcPjnYcyg52Zy51jIxQ2jlkKaGZKc+u5mVy/dQhvb/+JYVhinuWvEhho+fOA6qh+8HHlpDAkbJgag==", + "version": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.8.0-83e362d31a737200bc9251e9505137f198509d2f.tgz", + "integrity": "sha512-ywg63QF9yPHrbwvYlFqESw+jJWssJhY3DdhfDwrGsDIeqd64S0t7VXPkiWc0alKEMOA+t2mz5xvOifRaqNOcBw==", "requires": { "tslib": "^1.9.0" } @@ -6717,7 +6717,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { "depd": "~1.1.2", @@ -8140,13 +8140,13 @@ "dependencies": { "core-js": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=", "dev": true }, "es6-promise": { "version": "3.0.2", - "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", "dev": true }, @@ -8158,7 +8158,7 @@ }, "readable-stream": { "version": "2.0.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { @@ -8172,7 +8172,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } diff --git a/package.json b/package.json index 8f8ddd55a..3d8ac4ce9 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", - "@alfresco/adf-core": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", - "@alfresco/adf-extensions": "3.8.0-179bdb2790b85b5316ae2512b5a13e8beffc74f5", + "@alfresco/adf-content-services": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "@alfresco/adf-core": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "@alfresco/adf-extensions": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@alfresco/js-api": "3.8.0-17d85a03af98b8dd906f51d10c6887393910e64b", "@angular-custom-builders/lite-serve": "0.0.2", "@angular/animations": "7.2.15", diff --git a/src/app/components/sidenav/sidenav.component.html b/src/app/components/sidenav/sidenav.component.html index 5b52d5616..92dcb1da6 100644 --- a/src/app/components/sidenav/sidenav.component.html +++ b/src/app/components/sidenav/sidenav.component.html @@ -22,11 +22,11 @@ - + - + - + - + , - private extensions: AppExtensionService + private extensions: AppExtensionService, + private authService: AuthenticationService ) {} ngOnInit() { @@ -80,6 +82,11 @@ export class SidenavComponent implements OnInit, OnDestroy { }); } + isLoggedIn(provider: string): boolean { + if (provider === undefined) return true; + return this.authService.isLoggedInWith(provider); + } + trackById(_: number, obj: { id: string }) { return obj.id; }