inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4810] fix sso settings (#5108)

Browse Source 
* fix sso settings

* fix test

* update-js-api

* update-js-api

* invert test order for some reason
This commit is contained in:
Eugenio Romano 2019-09-30 13:32:17 +01:00 committed by GitHub
parent c49e2dca7e
commit bcacd8b42e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 142 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
e2e/core/login/login-sso/login-sso.e2e.ts
View File

@ -29,30 +29,6 @@ describe('Login component - SSO', () => {
const silentLogin = false;
let implicitFlow;
describe('Login component - SSO Grant type password (implicit flow false)', () => {
it('[C299158] Should be possible to login with SSO, with grant type password (Implicit Flow false)', async () => {
implicitFlow = false;
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf_acs.host,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
await loginPage.waitForElements();
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf_acs.host,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
browser.ignoreSynchronization = true;
await loginPage.enterUsername(browser.params.testConfig.adf.adminEmail);
await loginPage.enterPassword(browser.params.testConfig.adf.adminPassword);
await loginPage.clickSignInButton();
await BrowserVisibility.waitUntilElementIsVisible(loginPage.sidenavLayout);
});
});
describe('Login component - SSO implicit Flow', () => {
afterEach(async () => {
@ -79,4 +55,22 @@ describe('Login component - SSO', () => {
});
describe('Login component - SSO Grant type password (implicit flow false)', () => {
it('[C299158] Should be possible to login with SSO, with grant type password (Implicit Flow false)', async () => {
implicitFlow = false;
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf_acs.host,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.adf.adminEmail);
await loginPage.enterPassword(browser.params.testConfig.adf.adminPassword);
await loginPage.clickSignInButton();
await BrowserVisibility.waitUntilElementIsVisible(loginPage.sidenavLayout);
});
});
});

3
lib/core/i18n/en.json
View File

@ -158,7 +158,8 @@
"REDIRECT_LOGOUT": "Redirect URI Logout",
"SILENT": "Silent Login",
"SCOPE": "Scope",
"CLIENT": "Client ID"
"CLIENT": "Client ID",
"PUBLIC_URLS" : "Public urls silent Login"
},
"CARDVIEW": {
"KEYVALUEPAIRS": {

7
lib/core/settings/host-settings.component.html
View File

@ -128,6 +128,13 @@
<input id="logout-url" matInput placeholder="{{ 'CORE.HOST_SETTINGS.REDIRECT_LOGOUT'| translate }}"
name="redirectUriLogout" formControlName="redirectUriLogout">
</mat-form-field>
<mat-form-field class="adf-full-width" floatLabel="Public Urls">
<mat-label>{{ 'CORE.HOST_SETTINGS.PUBLIC_URLS'| translate }}</mat-label>
<input id="public-url" matInput placeholder="{{ 'CORE.HOST_SETTINGS.PUBLIC_URLS'| translate }}"
name="publicUrls" formControlName="publicUrls">
</mat-form-field>
</div>
</ng-container>
<mat-card-actions class="adf-actions">

7
lib/core/settings/host-settings.component.ts
View File

@ -147,7 +147,8 @@ export class HostSettingsComponent implements OnInit {
scope: [oauth.scope, Validators.required],
secret: oauth.secret,
silentLogin: oauth.silentLogin,
implicitFlow: oauth.implicitFlow
implicitFlow: oauth.implicitFlow,
publicUrls: [oauth.publicUrls]
});
}
@ -269,6 +270,10 @@ export class HostSettingsComponent implements OnInit {
return this.oauthConfig.get('redirectUri');
}
get publicUrls(): AbstractControl {
return this.oauthConfig.get('publicUrls');
}
get redirectUriLogout(): AbstractControl {
return this.oauthConfig.get('redirectUriLogout');
}

511
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@ -74,6 +74,7 @@
"process services-cloud"
],
"dependencies": {
"@alfresco/adf-cli": "3.5.0-7ebd28772876fa4144c347fd4fca956a27bce493",
"@alfresco/adf-content-services": "3.4.0",
"@alfresco/adf-core": "3.4.0",
"@alfresco/adf-extensions": "3.4.0",
@ -81,7 +82,7 @@
"@alfresco/adf-process-services": "3.4.0",
"@alfresco/adf-process-services-cloud": "3.4.0",
"@alfresco/adf-testing": "3.4.0",
"@alfresco/js-api": "3.5.0-ad32604b4aa8abd17291d58bb77a989ac57fdbb6",
"@alfresco/js-api": "3.5.0-00a7b1b556070818a4c689ae63aa21e0b6e26f9f",
"@angular/animations": "^7.2.15",
"@angular/cdk": "7.3.7",
"@angular/common": "^7.2.15",