mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ACS-259] refactor login page (#5733)
* refator login page * refator login page * remove obsolete classes and move what is needed in the test pck * fix const * revert modify * remove duplicate browser property * fix build * fix * fix * fix lint * move drop action in testing remove not necessary space js-api centralize content * first refactor use js-api * fix protractor * refactor test config * simplify properties fix namings * ps cloud simplify remove unused js files * id fix * fix search test simplify environment var step 1 * fix lint * first user iteration fix * fix model * unify use of apiService * first step automatic user creation Identity * refactor creation user content-services * refactor creation user search * refactor creation user core * process service refactoring 1 * process service refactoring 1 * process service refactoring 2 * fix process * appconfig * fix process util * fix gallery * fix "this" reference issues * fix incorrect import paths * fix core * some fixes * allign * fix some test remove structure folder and move in actions * fixes * move folders in the right place * fix * fix rebase * solve build issue * fix e2e * change init aae * order api and some fixes * fix possible not valid password * fix some ps test * replace host port also in objects * Update app-config.service.ts * fix process * fix process test * process service cloud fix * fiexs * modify init script * fix two test * remove unused property * host issue * not use npx * fix ps cloud test Co-authored-by: Denys Vuika <denys.vuika@gmail.com>
This commit is contained in:
Eugenio Romano
GitHub
@@ -6,40 +6,41 @@
|
||||
require('dotenv').config({path: process.env.ENV_FILE});
|
||||
|
||||
const HOST = process.env.URL_HOST_ADF;
|
||||
const HOST_BPM = process.env.URL_HOST_BPM_ADF;
|
||||
const HOST_SSO = process.env.URL_HOST_SSO_ADF;
|
||||
const HOST_IDENTITY = process.env.URL_HOST_IDENTITY;
|
||||
const TIMEOUT = parseInt(process.env.TIMEOUT, 10);
|
||||
const PROXY = process.env.PROXY_HOST_ADF;
|
||||
|
||||
const LOG = process.env.LOG;
|
||||
|
||||
const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm";
|
||||
const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak";
|
||||
const OAUTH_CLIENT_ID = process.env.OAUTH_CLIENDID || "alfresco";
|
||||
const HOST_ECM = process.env.PROXY_HOST_ADF || HOST || 'ecm';
|
||||
const HOST_BPM = process.env.PROXY_HOST_ADF || HOST || 'bpm';
|
||||
|
||||
const PROVIDER = process.env.PROVIDER ? process.env.PROVIDER : 'ALL';
|
||||
const AUTH_TYPE = process.env.AUTH_TYPE ? process.env.AUTH_TYPE : 'BASIC';
|
||||
|
||||
const OAUTH_HOST = process.env.HOST_SSO || process.env.PROXY_HOST_ADF || HOST || 'oauth';
|
||||
const OAUTH_CLIENT_ID = process.env.OAUTH_CLIENDID || 'alfresco';
|
||||
|
||||
const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity";
|
||||
const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin";
|
||||
const IDENTITY_ADMIN_PASSWORD = process.env.IDENTITY_ADMIN_PASSWORD || "defaultadminpassword";
|
||||
const IDENTITY_USERNAME_ADF = process.env.IDENTITY_USERNAME_ADF || "defaultuser";
|
||||
const IDENTITY_PASSWORD_ADF = process.env.IDENTITY_PASSWORD_ADF;
|
||||
|
||||
const HR_USER = process.env.HR_USER || "hruser";
|
||||
const HR_USER_PASSWORD = process.env.HR_USER_PASSWORD || "defaulthruserpassword";
|
||||
|
||||
const USERNAME_ADF = process.env.USERNAME_ADF || "defaultuser";
|
||||
const PASSWORD_ADF = process.env.PASSWORD_ADF || "defaultuserpassword";
|
||||
const EMAIL = process.env.EMAIL_ADF || USERNAME_ADF;
|
||||
|
||||
const SCREENSHOT_URL = process.env.SCREENSHOT_URL || process.env.URL_HOST_ADF;
|
||||
const SCREENSHOT_URL = process.env.SCREENSHOT_URL || HOST;
|
||||
const SCREENSHOT_PASSWORD = process.env.SCREENSHOT_PASSWORD || process.env.PASSWORD_ADF;
|
||||
const SCREENSHOT_USERNAME = process.env.SCREENSHOT_USERNAME || process.env.USERNAME_ADF;
|
||||
|
||||
const EXTERNAL_ACS_HOST = process.env.EXTERNAL_ACS_HOST;
|
||||
|
||||
const appConfig = {
|
||||
"bpmHost": BPM_HOST,
|
||||
"identityHost": IDENTITY_HOST,
|
||||
"providers": "BPM",
|
||||
"authType": "OAUTH",
|
||||
"ecmHost": HOST_ECM,
|
||||
"bpmHost": HOST_BPM,
|
||||
"identityHost": `${OAUTH_HOST}/auth/admin/realms/alfresco`,
|
||||
"provider": PROVIDER,
|
||||
"authType": AUTH_TYPE,
|
||||
"oauth2": {
|
||||
"host": OAUTH_HOST,
|
||||
"host": `${OAUTH_HOST}/auth/realms/alfresco`,
|
||||
"clientId": OAUTH_CLIENT_ID,
|
||||
"scope": "openid",
|
||||
"secret": "",
|
||||
@@ -52,41 +53,38 @@ const appConfig = {
|
||||
|
||||
if (LOG) {
|
||||
console.log('======= test.config.js hostBPM ====== ');
|
||||
console.log('hostBPM : ' + (HOST_BPM || PROXY || HOST));
|
||||
console.log('EMAIL : ' + (EMAIL));
|
||||
console.log('PROXY_HOST_ADF : ' + PROXY);
|
||||
console.log('hostBPM : ' + HOST_ECM);
|
||||
console.log('hostECM : ' + HOST_BPM);
|
||||
console.log('HOST : ' + HOST);
|
||||
console.log('USERNAME_ADF : ' + USERNAME_ADF + ' PASSWORD_ADF : ' + PASSWORD_ADF);
|
||||
console.log('IDENTITY_ADMIN_EMAIL : ' + IDENTITY_ADMIN_EMAIL + ' IDENTITY_ADMIN_PASSWORD : ' + IDENTITY_ADMIN_PASSWORD);
|
||||
console.log(JSON.stringify(appConfig))
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
|
||||
projectName: 'ADF',
|
||||
projectName: 'adf',
|
||||
|
||||
appConfig: appConfig,
|
||||
|
||||
log: LOG,
|
||||
|
||||
main: {
|
||||
timeout: TIMEOUT,
|
||||
rootPath: __dirname
|
||||
},
|
||||
|
||||
admin: {
|
||||
email: USERNAME_ADF,
|
||||
password: PASSWORD_ADF
|
||||
},
|
||||
|
||||
identityAdmin: {
|
||||
email: IDENTITY_ADMIN_EMAIL,
|
||||
password: IDENTITY_ADMIN_PASSWORD
|
||||
},
|
||||
|
||||
identityUser: {
|
||||
email: IDENTITY_USERNAME_ADF,
|
||||
password: IDENTITY_PASSWORD_ADF
|
||||
},
|
||||
|
||||
hrUser: {
|
||||
email: process.env.HR_USER,
|
||||
password: process.env.HR_USER_PASSWORD
|
||||
email: HR_USER,
|
||||
password: HR_USER_PASSWORD
|
||||
},
|
||||
|
||||
screenshot: {
|
||||
@@ -99,159 +97,14 @@ module.exports = {
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
url: HOST,
|
||||
|
||||
/**
|
||||
* adf port
|
||||
*/
|
||||
port: "",
|
||||
|
||||
/**
|
||||
* adf login
|
||||
*/
|
||||
login: "/login",
|
||||
|
||||
/**
|
||||
* admin username
|
||||
*/
|
||||
adminUser: USERNAME_ADF,
|
||||
|
||||
/**
|
||||
* main admin email
|
||||
*/
|
||||
adminEmail: EMAIL,
|
||||
|
||||
/**
|
||||
* main admin password
|
||||
*/
|
||||
adminPassword: PASSWORD_ADF,
|
||||
|
||||
hostBPM: HOST_BPM || PROXY || HOST,
|
||||
|
||||
clientIdSso: "alfresco",
|
||||
|
||||
hostSso: function () {
|
||||
let baseUrl;
|
||||
|
||||
if (HOST_SSO) {
|
||||
baseUrl = HOST_SSO;
|
||||
} else if (PROXY) {
|
||||
baseUrl = PROXY;
|
||||
} else {
|
||||
baseUrl = HOST;
|
||||
}
|
||||
|
||||
if (LOG) {
|
||||
console.log('hostSso baseUrl : ' + baseUrl);
|
||||
}
|
||||
|
||||
return `${baseUrl}/auth/realms/alfresco`;
|
||||
}(),
|
||||
|
||||
hostIdentity: function () {
|
||||
let baseUrl;
|
||||
|
||||
if (HOST_IDENTITY) {
|
||||
baseUrl = HOST_IDENTITY;
|
||||
} else if (HOST_SSO) {
|
||||
baseUrl = HOST_SSO;
|
||||
} else if (PROXY) {
|
||||
baseUrl = PROXY;
|
||||
} else {
|
||||
baseUrl = HOST;
|
||||
}
|
||||
|
||||
if (LOG) {
|
||||
console.log('hostIdentity baseUrl : ' + baseUrl);
|
||||
}
|
||||
|
||||
return `${baseUrl}/auth/admin/realms/alfresco`;
|
||||
}()
|
||||
|
||||
},
|
||||
|
||||
adf_acs: {
|
||||
/**
|
||||
* The protocol where the app runs.
|
||||
* @config main.protocol {String}
|
||||
*/
|
||||
protocol: "http",
|
||||
|
||||
/**
|
||||
* The protocol where the app runs.
|
||||
* @config main.protocol {String}
|
||||
*/
|
||||
host: PROXY || HOST,
|
||||
|
||||
/**
|
||||
* The port where the app runs.
|
||||
* @config main.port {String}
|
||||
*/
|
||||
port: "",
|
||||
|
||||
/**
|
||||
* The ECM API context required for calls
|
||||
* @config adf.ACSAPIContextRoot {String}
|
||||
*/
|
||||
apiContextRoot: "/alfresco/api/-default-/public",
|
||||
|
||||
clientIdSso: "alfresco",
|
||||
url: HOST
|
||||
},
|
||||
|
||||
adf_external_acs: {
|
||||
/**
|
||||
* The protocol where the app runs.
|
||||
* @config main.protocol {String}
|
||||
*/
|
||||
protocol: "http",
|
||||
|
||||
/**
|
||||
* The protocol where the app runs.
|
||||
* @config main.protocol {String}
|
||||
*/
|
||||
host: EXTERNAL_ACS_HOST,
|
||||
|
||||
/**
|
||||
* The port where the app runs.
|
||||
* @config main.port {String}
|
||||
*/
|
||||
port: "",
|
||||
|
||||
/**
|
||||
* The ECM API context required for calls
|
||||
* @config adf.ACSAPIContextRoot {String}
|
||||
*/
|
||||
apiContextRoot: "/alfresco/api/-default-/public",
|
||||
|
||||
clientIdSso: "alfresco",
|
||||
},
|
||||
|
||||
adf_aps: {
|
||||
/**
|
||||
* The protocol where the app runs.
|
||||
* @config main.protocol {String}
|
||||
*/
|
||||
protocol: "http",
|
||||
|
||||
/**
|
||||
* The host where the app runs.
|
||||
* @config main.host {String}
|
||||
*/
|
||||
host: PROXY || HOST,
|
||||
|
||||
/**
|
||||
* The port where the app runs.
|
||||
* @config main.port {String}
|
||||
*/
|
||||
port: "",
|
||||
|
||||
/**
|
||||
* The BPM API context required for calls
|
||||
* @config adf.APSAPIContextRoot {String}
|
||||
*/
|
||||
apiContextRoot: "/activiti-app",
|
||||
|
||||
clientIdSso: "activiti"
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user