summaryrefslogtreecommitdiffstats
path: root/ecomp-portal-BE-common/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-08-23 18:27:19 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-08-23 21:12:56 -0400
commit978dbcf0a196acbafad72fe1e2478ec0e384f02f (patch)
tree17e1ceaa4a12a599320cbb317947e990bf1a5383 /ecomp-portal-BE-common/src/main/webapp/WEB-INF
parentbc7350dce5b7b1dcd1c472a3922b42c4ea99809d (diff)
Deliver centralized role management feature
Repair multiple defects also. Revise deployment to use docker-compose. Remove all zip archives. Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69, PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82 Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61 Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/main/webapp/WEB-INF')
-rw-r--r--ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml281
-rw-r--r--ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp120
-rw-r--r--ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp162
3 files changed, 253 insertions, 310 deletions
diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
index eea9467a..342a6e8c 100644
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
+++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
@@ -321,7 +321,12 @@
<property name="appType" type="integer">
<column name="app_type"></column>
</property>
-
+ <property name="centralAuth" type="yes_no">
+ <column name="auth_central"></column>
+ </property>
+ <property name="nameSpace" type="string">
+ <column name="auth_namespace"></column>
+ </property>
<one-to-one name="contactUs" class="AppContactUs" cascade="save-update"></one-to-one>
</class>
@@ -433,6 +438,29 @@
<property name="statusCode" column="status_cd" />
</class>
+ <!-- EPAppRoleFunction class mapping details -->
+ <class name="EPAppRoleFunction" table="ep_app_role_function">
+ <id name="id" column="id">
+ <generator class="native">
+ <param name="property">seq_epp_app_role_func</param>
+ </generator>
+ </id>
+ <property name="roleId" column="role_id"></property>
+ <property name="appId" column="app_id"></property>
+ <property name="code" column="function_cd"></property>
+ </class>
+
+ <!-- CentralRoleFunction class mapping details -->
+ <class name="CentralRoleFunction" table="ep_app_function">
+ <composite-id>
+ <key-property name="appId"
+ column="app_id" />
+ <key-property name="code"
+ column="function_cd" />
+ </composite-id>
+ <property name="name" column="function_name" />
+ </class>
+
<class name="PersUserWidgetSelection" table="ep_pers_user_widget_sel">
<id name="id" column="id">
<generator class="native">
@@ -612,17 +640,17 @@
<return alias="notificationResult"
class="org.openecomp.portalapp.portal.transport.EpNotificationItem" />
<![CDATA[
- select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID, active_YN from
+ select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID,notification_hyperlink, active_YN from
(
- select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,active_YN
+ select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,notification_hyperlink,active_YN
from
(
- select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+ select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
from
(
select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
- a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,b.role_id,b.recv_user_id
+ a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date,b.role_id,b.recv_user_id
from ep_notification a, ep_role_notification b
where a.notification_id = b.notification_id
and (end_time is null || SYSDATE() <= end_time )
@@ -643,11 +671,11 @@
a.role_id = b.role_id
)
union
- select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+ select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
from
(
select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
- a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, b.role_id,b.recv_user_id
+ a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, a.notification_hyperlink,b.role_id,b.recv_user_id
from ep_notification a, ep_role_notification b
where a.notification_id = b.notification_id
and (end_time is null || SYSDATE() <= end_time )
@@ -660,7 +688,7 @@
)
union
(
- select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+ select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
from ep_notification a
where a.notification_id
and (end_time is null || SYSDATE() <= end_time )
@@ -713,6 +741,7 @@ SELECT
n.priority,
n.creator_ID AS creatorId,
n.created_date AS createdDate,
+ n.notification_hyperlink AS notificationHyperlink,
u.org_user_id AS loginId
FROM
ep_notification n
@@ -736,6 +765,7 @@ SELECT
n.priority,
n.creator_ID AS creatorId,
n.created_date AS createdDate,
+ n.notification_hyperlink AS notificationHyperlink,
u.org_user_id AS loginId
FROM
ep_notification n
@@ -761,7 +791,7 @@ select a.app_id, a.app_name, b.role_id, b.role_name from
union
select fn_role.app_id,fn_app.app_name, fn_role.role_id ,fn_role.role_name
from fn_app, fn_role
-where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
+where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_yn='Y' order by app_name
@@ -775,7 +805,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
<![CDATA[
SELECT
notificationId, isForOnlineUsers, isForAllRoles, msgHeader, msgDescription,msgSource,
- startTime, endTime, priority, createdDate, creatorId, loginId, activeYn
+ startTime, endTime, priority, createdDate,notificationHyperlink,creatorId, loginId, activeYn
FROM
(
select distinct
@@ -790,6 +820,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
priority,
created_date AS createdDate,
creator_ID AS creatorId,
+ notification_hyperlink AS notificationHyperlink,
login_id AS loginId,
active_YN AS activeYn,
if (is_viewed is null, 'N', is_viewed)
@@ -798,11 +829,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
select
user_id, login_id,notification_id, is_for_online_users, is_for_all_roles,
msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date,
- creator_ID,active_YN
+ creator_ID,notification_hyperlink,active_YN
from
(
select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
- a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,
+ a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date,
b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id
ELSE NULL
@@ -837,11 +868,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
select
:user_id, login_id,notification_id, is_for_online_users, is_for_all_roles,
msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date,
- creator_ID,active_YN
+ creator_ID,notification_hyperlink,active_YN
from
(
select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
- a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,
+ a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,a.notification_hyperlink,
b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id
ELSE NULL
@@ -868,7 +899,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
select
:user_id user_id, b.login_id,notification_id, is_for_online_users, is_for_all_roles,
msg_header, msg_description,msg_source, start_Time, end_time, priority, a.created_date,
- creator_ID, a.active_YN
+ creator_ID, a.notification_hyperlink,a.active_YN
from ep_notification a JOIN fn_user b on b.user_id=a.creator_ID
where a.notification_id
and a.is_for_all_roles = 'Y'
@@ -1048,6 +1079,13 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
select audit_date from fn_audit_log where affected_record_id =:userId order by audit_date desc limit 2;
]]>
</sql-query>
+
+ <sql-query name="getActiveUsers">
+ <return alias="EPUser" class="org.openecomp.portalapp.portal.domain.EPUser" />
+ <![CDATA[
+ SELECT * FROM FN_USER WHERE active_yn='Y'
+ ]]>
+ </sql-query>
<sql-query name="getAppsAdmins">
<return alias="adminUserApp" class="org.openecomp.portalapp.portal.domain.AdminUserApp" />
@@ -1074,7 +1112,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1102,7 +1140,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1131,7 +1170,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1161,7 +1201,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1193,7 +1234,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1228,7 +1270,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1266,7 +1309,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1307,7 +1351,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1344,7 +1389,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1381,7 +1427,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT ,
a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD ,
a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED ,
- a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE
+ a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL ,
+ a.AUTH_NAMESPACE
from FN_APP a
-- Portal assigns role 999 to app administrator
left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1460,6 +1507,16 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
]]>
</sql-query>
+ <sql-query name="getMyAppDetailsByUebKey">
+ <return alias="myAppDetailsByUebKey" class="org.openecomp.portalapp.portal.domain.EPApp" />
+
+ <![CDATA[
+
+ SELECT * FROM fn_app where ueb_key =:appKey
+ ;
+ ]]>
+ </sql-query>
+
<sql-query name="deleteAccountEndpoint">
<![CDATA[
@@ -1582,9 +1639,9 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
<sql-query name="appRoles">
<return alias="rolesForApp"
- class="org.openecomp.portalapp.portal.domain.EpUserAppRoles" />
+ class="org.openecomp.portalapp.portal.domain.EPUserAppRoles" />
<![CDATA[
- SELECT ROLE_ID, APP_ID from FN_ROLE where APP_ROLE_ID =:appRoleId and app_id =:appId
+ SELECT ROLE_ID, APP_ID from FN_ROLE where APP_ROLE_ID = :appRoleId and app_id = :appId
;
]]>
</sql-query>
@@ -1681,7 +1738,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
select fr.role_name, fa.app_name
from
fn_role fr, fn_user_role fur, fn_app fa, fn_user fu
- Where fu.user_id = fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId
+ Where fu.user_id = fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId and fr.active_yn='Y' and (fa.enabled = 'Y' or fa.app_id=1)
;
]]>
@@ -1711,5 +1768,173 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
delete from ep_user_notification where notification_id in (select notification_id from ep_notification where curdate() >= DATE_ADD(end_time,INTERVAL 3 MONTH))
]]>
</sql-query>
+
+ <!-- Gets list of role functions and it requires two parameters appId and roleId-->
+ <sql-query name="getAppRoleFunctionList">
+ <return alias="appRoleFunctionList"
+ class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" />
+ <![CDATA[
+
+ SELECT DISTINCT f.app_id , f.function_cd, f.function_name from ep_app_role_function rf, ep_app_function f
+ where rf.role_id =:roleId and rf.app_id =:appId and rf.app_id = f.app_id and rf.function_cd = f.function_cd
+ ;
+
+ ]]>
+ </sql-query>
+
+ <!-- Gets list of all role functions -->
+ <sql-query name="getAllRoleFunctions">
+ <return alias="allRoleFunctions"
+ class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" />
+ <![CDATA[
+
+ SELECT * from ep_app_function where app_id =:appId
+ ;
+
+ ]]>
+ </sql-query>
+
+ <!-- Get ep_app_function records provided by single parameter -->
+ <sql-query name="getRoleFunction">
+ <return alias="RoleFunction"
+ class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" />
+ <![CDATA[
+
+ SELECT * from ep_app_function where function_cd = :functionCode and app_id =:appId
+ ;
+
+ ]]>
+ </sql-query>
+
+ <!-- Gets the record from ep_app_function table and requires two parameters -->
+ <sql-query name="getAppFunctionDetails">
+ <return alias="appFunctionDetails"
+ class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" />
+ <![CDATA[
+
+ select * from ep_app_function where app_id =:appId and function_cd =:functionCd
+ ;
+ ]]>
+ </sql-query>
+
+ <!-- Gets the current user app roles records and requires two parameters -->
+ <sql-query name="getUserAppCurrentRoles">
+ <return alias="userAppCurrentRoles"
+ class="org.openecomp.portalapp.portal.transport.EPUserAppCurrentRoles" />
+ <![CDATA[
+
+ select distinct fu.role_id, fr.user_id, fu.role_name, fu.priority from fn_role fu left outer join fn_user_role fr ON fu.role_id = fr.role_id and fu.app_id = fr.app_id and fr.role_id != 999 where fu.app_id =:appId and fr.user_id =:userId
+ ;
+ ]]>
+ </sql-query>
+
+ <!-- Gets the current user app roles along with account administrator and requires two parameters -->
+ <sql-query name="getUserAppExistingRoles">
+ <return alias="userAppExistingRoles"
+ class="org.openecomp.portalapp.portal.transport.EcompUserAppRoles" />
+ <![CDATA[
+ select fr.role_name, fu.app_id, fu.user_id, fu.priority, fu.role_id from fn_user_role fu
+ left outer join fn_role fr on fu.role_id = fr.role_id
+ where fu.user_id =:userId and fu.app_id =:appId
+ ;
+ ]]>
+ </sql-query>
+
+ <!-- Gets the current user app roles records and requires two parameters -->
+ <sql-query name="getAllFunctions">
+ <return alias="allFunctions"
+ class="org.openecomp.portalsdk.core.domain.RoleFunction" />
+ <![CDATA[
+ select * from fn_function
+ ;
+ ]]>
+ </sql-query>
+ <!-- Gets the all role functions and requires one parameters -->
+ <sql-query name="uploadAllRoleFunctions">
+ <return alias="allRoleFunctions"
+ class="org.openecomp.portalapp.portal.transport.BulkUploadRoleFunction" />
+ <![CDATA[
+ select fr.function_cd, fn.function_name from fn_role_function fr left outer join fn_function fn on fr.function_cd = fn.function_cd where role_id =:roleId
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getRoletoUpdateAAF">
+ <return alias="getRoletoUpdateAAF" class="org.openecomp.portalapp.portal.domain.EPRole" />
+ <![CDATA[
+ SELECT * FROM fn_role where role_name =:appRoleName and app_id =:appId
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getBulkUserRoles">
+ <return alias="bulkUserRoles" class="org.openecomp.portalapp.portal.transport.BulkUploadUserRoles" />
+ <![CDATA[
+ select fr.role_name, fu.org_user_id, fa.auth_namespace from fn_user_role fur
+ left outer join fn_role fr on fr.role_id = fur.role_id
+ left outer join fn_app fa on fa.app_id = fur.app_id
+ left outer join fn_user fu on fu.user_id = fur.user_id where fa.ueb_key =:uebKey and fu.org_user_id != 'su1234'
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getCentralizedApps">
+ <return alias="centralizedApps" class="org.openecomp.portalapp.portal.domain.EPApp" />
+ <![CDATA[
+ select * from fn_app where auth_central = 'Y' and open = 'N';
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getUserRoles">
+ <return alias="getUserRolesList" class="org.openecomp.portalapp.portal.domain.UserRole" />
+
+ <![CDATA[
+
+ SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and userrole.app_id = 1
+ ;
+ ]]>
+ </sql-query>
+ <sql-query name="getRoleFunctionsOfUser">
+ <![CDATA[
+ select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea
+ where fu.role_id = ep.role_id
+ and fu.app_id = ep.app_id
+ and fu.user_id =:userId and ep.app_id = 1
+ and ea.function_cd = ep.function_cd
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getUserRolesForLeftMenu">
+ <return alias="getUserRolesListForLeftMenu" class="org.openecomp.portalapp.portal.domain.UserRole" />
+
+ <![CDATA[
+
+ SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id = 999)
+ ;
+ ]]>
+ </sql-query>
+
+ <!-- Gets all functions for an application along with global functions and requires single parameter -->
+ <sql-query name="getMenuFunctions">
+ <![CDATA[
+ select f.function_cd from ep_app_function f
+ where f.app_id =:appId
+ UNION
+ select epa.function_cd from fn_role fnr, ep_app_role_function epr, ep_app_function epa where epr.role_id = fnr.role_id
+ and epa.function_cd = epr.function_cd and fnr.role_name like 'global%'
+ ;
+ ]]>
+ </sql-query>
+
+ <sql-query name="getRequestIdsForApp">
+ <return alias="getRequestIdsForApp" class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest" />
+ <![CDATA[
+ select * from ep_user_roles_request where app_id =:app_id
+ ;
+ ]]>
+ </sql-query>
+
</hibernate-mapping>
diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp
deleted file mode 100644
index d90704c3..00000000
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp
+++ /dev/null
@@ -1,120 +0,0 @@
-<%--
- ================================================================================
- ECOMP Portal
- ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property
- ================================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ================================================================================
- --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ page import="java.net.URLEncoder" %>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
-<!DOCTYPE html>
-<html ng-app="abs">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <link rel="stylesheet" type="text/css" href="static/ebz/fn-ebz.css" >
- <link rel="stylesheet" type="text/css" href="static/ebz/sandbox/styles/style.css" >
- <script src="static/js/jquery-1.10.2.js" type="text/javascript"></script>
- <script src= "static/ebz/angular_js/angular.js"></script>
- <script src= "static/ebz/angular_js/angular-sanitize.js"></script>
- <script src= "static/ebz/angular_js/att_abs_tpls.js"></script>
- <script src= "static/ebz/angular_js/app.js"></script>
- <script src= "static/ebz/angular_js/gestures.js"></script>
- <script src="static/js/modalService.js"></script>
- <style>
- .terms {
- font-family: Verdana,Arial,Helvetica, sans-serif;
- font-size: 12px;
- }
- </style>
- </head>
- <body style="padding-top: 15px;display: none;">
- <%
- String returnUrl = request.getParameter("returnUrl");
- String redirectUrl = request.getParameter("redirectUrl");
- returnUrl = ((returnUrl == null) ? (request.isSecure() ?"https://":"http://") + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/process_csp" + "?redirectUrl=" + redirectUrl: URLEncoder.encode(returnUrl));
- %>
- <c:set var="returnUrl" value="<%=returnUrl%>"/>
- <c:set var="cspLoginUrl" value="<%=SystemProperties.getProperty(SystemProperties.CSP_LOGIN_URL)%>"/>
- <div ng-controller="loginController">
- <!-- AT&T Logo -->
- <div style="position: fixed; left:15px; top:15px; ">
- <img src="static/fusion/images/logo_att_header.jpg" alt="AT&T" />
- </div>
- <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;">
- <div class="centered" style="height:15px">
- <div class="centered">
- <div align="center" style="display: block;margin-left: auto;margin-right: auto;width: 100%;">
- <img src="static/fusion/images/ecomp-login.jpg" height="250"/>
- <br>
- <font class="headerText">
- <a id="goUrl" href="${cspLoginUrl}"><b>Click here to login</b></a>
- </font>
- </div>
- <br />
- <br />
- </div>
- </div>
- <br/><br/><br/><br/><br/><br/><br/><br/>
- <div id="footer" style="margin-top:300px">
- <div style="margin-left:auto;margin-right:auto;text-align: center;">
- <p><font class="terms">
- <b>Warning:</b> This system is restricted to AT&T authorized users for business purposes.
- Unauthorized access is a violation of the law.
- <br>
- This service may be monitored for administrative and security reasons.
- By proceeding, you consent to this monitoring.
- </font></p>
- </div>
- <div class="terms" style="text-align: center;">
- <a target="_top" href="http://www.att.com/terms/">Terms and Conditions</a> |
- <a target="_top" href="http://www.att.com/privacy/">Privacy Policy</a>.
- <br><span>&#169; 2017 AT&amp;T. All rights reserved.</span>
- </div>
- </div>
- </div>
- </body>
-<script>
- function getParameterByName(name, url) {
- if (!url) url = window.location.href;
- name = name.replace(/[\[\]]/g, "\\$&");
- var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
- results = regex.exec(url);
- if (!results) return '';
- if (!results[2]) return '';
- return (results[2].replace(/\+/g, " "));
- }
-
- var winHref = window.location.href;
- var appPathIndex = winHref.substring(0,winHref.lastIndexOf(".htm")).lastIndexOf("/");
- var goUrl =winHref.substring(0,appPathIndex+1) + "process_csp" + "?redirectUrl=" + getParameterByName('redirectUrl') ;
- document.getElementById("goUrl").href = document.getElementById("goUrl").href + goUrl;
- if(getParameterByName('skipClick')=="Yes"){
- document.getElementById("goUrl").click();
- }else{
- $("body").show();
- }
-
-</script>
-<script>
-app.controller("loginController", function ($scope) {
-
-});
-</script>
-</html>
diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp
deleted file mode 100644
index 94c2f55e..00000000
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ /dev/null
@@ -1,162 +0,0 @@
-<%--
- ================================================================================
- ECOMP Portal
- ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property
- ================================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ================================================================================
- --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
-<c:set var="title" value="Login" />
-<c:set var="isMobileEnabled"
- value="<%=(SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE)!= null && SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE).trim().equals(\"true\"))%>" />
-
-<!DOCTYPE html>
-<html ng-app="abs">
- <head>
- <title>
- Login
- </title>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <link rel="stylesheet" type="text/css" href="static/ebz/fn-ebz.css" >
- <link rel="stylesheet" type="text/css" href="static/fusion/css/jquery-ui.css">
- <script src="static/js/jquery-1.10.2.js" type="text/javascript"></script>
- <script src= "static/ebz/angular_js/angular.js"></script>
- <script src= "static/ebz/angular_js/angular-sanitize.js"></script>
- <script src= "static/ebz/angular_js/att_abs_tpls.js"></script>
- <script src= "static/ebz/angular_js/app.js"></script>
- <script src= "static/ebz/angular_js/gestures.js"></script>
- <script src="static/js/modalService.js"></script>
- <style>
- .terms {
- font-family: Verdana,Arial,Helvetica, sans-serif;
- font-size: 9px;
- }
- </style>
- </head>
- <body style="padding-top: 15px;">
- <div ng-controller="externalLoginController">
- <!-- Remove Video -----
- <div style="position: fixed; left: -25%; top: -25%; height: 150%; width: 150%; z-index:-1;">
- <video src="http://www.business.att.com/content/mixedmedia/network-on-demand.mp4" autoplay="true" defaultmuted="true" muted="true" height="100%" width="100%"></video>
- </div>
- -->
- <div style="position: fixed; left:15px; top:15px;z-index:-1;">
- <img src="static/fusion/images/logo_att_header.jpg" alt="AT&T" />
- </div>
- <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;">
- <div align="center" id="errorInfo" style="display:none;float:left;font-size:12px;margin-left:5px"><span style="color:red">Invaild username or password, Please try again</span></div>
- <br/>
- <div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;background-color:white">
- <img src="static/fusion/images/ecomp-login.jpg"/><span style=" color: #c97d25; font-size: 56px; position: relative; text-shadow: 3px 0 #8F9477, 0 2px #d7e7dc, 4px 0 #72b7b2, 0 0px black; top:-144px; left: -26px; font-weight: bold; font-style: italic; font-family:sans-serif">Portal</span>
- <h2> ECOMP Portal </h2>
- <label>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label class="form-field__label">Login ID:</label>
- </label>
- <input type="text" class="fn-ebz-text" ng-model="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
- maxlength="30" />
- <br/>
- <br/>
- <label >&nbsp;Password:</label>
- <input type="password" class="span3" ng-model="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
- maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/>
- <br />
- <br />
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- <input id="loginBtn" type="image" ng-click="loginExternal();" src="static/fusion/images/login_button.gif" alt="Login" />
- <br>
- </div>
- </div>
- <br/><br/><br/><br/><br/><br/><br/>
- <div id="footer">
- <div style="margin-left:auto;margin-right:auto;text-align: center;">
- <p><font class="terms">
- <b>Warning:</b> This system is restricted to AT&T authorized users for business purposes. Unauthorized access is a violation of the law. This service may be monitored for administrative and security reasons. By proceeding, you consent to this monitoring.
- </font></p>
- </div>
- <div class="terms" align="left">
- <a target="_top" href="http://www.att.com/terms/">Terms and Conditions</a> | <a target="_top" href="http://www.att.com/privacy/">Privacy Policy</a>.<br><span>&#169; 2016 AT&amp;T. All rights reserved.</span>
- </div>
- </div>
- </div>
- </body>
-<script>
-app.controller("externalLoginController", function ($scope) {
- // Table Data
-
- $scope.viewPerPage = 200;
- $scope.currentPage = 2;
- $scope.totalPage;
- $scope.searchCategory = "";
- $scope.searchString = "";
- $scope.loginId="";
- $scope.password="";
- $scope.loginError=true;
- $scope.viewPerPage = 200;
- $scope.currentPage = 2;
- $scope.totalPage;
- $scope.searchCategory = "";
- $scope.searchString = "";
- $scope.loginId="";
- $scope.password="";
-
-
- $scope.loginExternal = function() {
-
- $.ajax({
- url: "login_external/login?"+"loginId="+$scope.loginId+"&password="+$scope.password,
- type : "POST",
- success:function (response){
- if(response=="success"){
- window.location.href = 'welcome.htm';
- }else{
- $("#errorInfo").show();
- }
- },
- error:function( jqXHR, status,error ){
- $("#errorInfo").show();
- }
-
- });
-
- };
-
-
- /**
- $scope.loginExternal = function() {
-
-
- var redirectUrl = "login_external/login";
- var form = $('<form action="' + redirectUrl + '" method="post">' +
- '<input type="hidden" name="loginId" value='+$scope.loginId+' />' +
- '<input type="hidden" name="password" value='+$scope.password+' />' +
- '</form>');
-
- $('body').append(form);
- $(form).submit();
-
-
- };
- */
-
-});
-</script>
-
-</html>