<column name="app_name" not-null="true" default="?"></column>
</property>
<property name="imageUrl" column="app_image_url" />
- <property name="description" column="app_description" />
- <property name="notes" column="app_notes" />
- <property name="url" column="app_url" />
- <property name="alternateUrl" column="app_alternate_url" />
+ <property name="appDescription" column="app_description" />
+ <property name="appNotes" column="app_notes" />
+ <property name="landingPage" column="app_url" />
+ <property name="alternateLandingPage" column="app_alternate_url" />
<property name="appRestEndpoint" column="app_rest_endpoint" />
<property name="mlAppName" type="string">
<column name="ml_app_name" not-null="true" default="?"></column>
<column name="ml_app_admin_id" not-null="true" default="?"></column>
</property>
<property name="motsId" column="mots_id" />
- <property name="appPassword" type="string">
+ <property name="appBasicAuthPassword" type="string">
<column name="app_password" not-null="true" default="?"></column>
</property>
<property name="thumbnail" column="thumbnail" />
- <property name="username" type="string">
+ <property name="appBasicAuthUsername" type="string">
<column name="app_username" not-null="true" default="?"></column>
</property>
<property name="open" type="yes_no">
<property name="appType" type="integer">
<column name="app_type"></column>
</property>
- <property name="centralAuth" type="yes_no">
+ <property name="rolesInAAF" type="yes_no">
<column name="auth_central"></column>
</property>
<property name="nameSpace" type="string">
<column name="auth_namespace"></column>
</property>
+ <property name="modeOfIntegration" type="string">
+ <column name="mode_of_integration"></column>
+ </property>
+ <property name="appAck" type="yes_no">
+ <column name="ack_app"></column>
+ </property>
+ <property name="usesCadi" type="yes_no">
+ <column name="uses_cadi"></column>
+ </property>
+
<one-to-one name="contactUs" class="AppContactUs" cascade="save-update"></one-to-one>
</class>
from Language where languageId = :language_id
]]>
</query>
+
+ <query name="getActiveUsersForApp">
+ <![CDATA[
+ select distinct(u) from EPUser as u inner join fetch u.EPUserApps as apps inner join fetch apps.app as app inner join fetch apps.role as role where app.id = :id and u.active = :active and role.id is not null
+ ]]>
+ </query>
<!-- show the current user plus related users -->
<sql-query name="relatedUsers">
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.AUTH_CENTRAL ,
- a.AUTH_NAMESPACE
+ a.AUTH_NAMESPACE , a.MODE_OF_INTEGRATION, a.ACK_APP , a.USES_CADI
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
b.ML_APP_NAME , b.ML_APP_ADMIN_ID , b.MOTS_ID , b.APP_PASSWORD ,
b.THUMBNAIL , b.APP_USERNAME , b.OPEN , b.ENABLED ,
b.UEB_TOPIC_NAME , b.UEB_KEY , b.UEB_SECRET , b.APP_TYPE , b.AUTH_CENTRAL ,
- b.AUTH_NAMESPACE
+ b.AUTH_NAMESPACE , b.MODE_OF_INTEGRATION , b.ACK_APP , b.USES_CADI
from fn_user_role a, fn_app b, ep_app_role_function c , fn_role d , ep_app_function e
where a.user_id =:userId and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
order by app_name
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.AUTH_CENTRAL ,
- a.AUTH_NAMESPACE
+ a.AUTH_NAMESPACE , a.MODE_OF_INTEGRATION, a.ACK_APP , a.USES_CADI
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
b.ML_APP_NAME , b.ML_APP_ADMIN_ID , b.MOTS_ID , b.APP_PASSWORD ,
b.THUMBNAIL , b.APP_USERNAME , b.OPEN , b.ENABLED ,
b.UEB_TOPIC_NAME , b.UEB_KEY , b.UEB_SECRET , b.APP_TYPE , b.AUTH_CENTRAL ,
- b.AUTH_NAMESPACE
+ b.AUTH_NAMESPACE , b.MODE_OF_INTEGRATION, b.ACK_APP , b.USES_CADI
from fn_user_role a, fn_app b, ep_app_role_function c , fn_role d , ep_app_function e
where a.user_id =:userId and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
order by app_name
a.APP_ID as id, a.APP_NAME as name, a.ML_APP_NAME as mlAppName, a.APP_IMAGE_URL as imageUrl,
a.APP_DESCRIPTION as description, a.APP_NOTES as notes,
a.APP_URL as url, a.APP_ALTERNATE_URL as alternateUrl,
- IF(a.app_type = '2', TRUE, FALSE) as restricted,
+ -- IF(a.app_type = '2', TRUE, FALSE) as restricted,
+ case
+ when a.app_type = '2' and a.app_type = '3' then TRUE
+ else FALSE
+ end as restricted,
IF(a.open = 'Y', TRUE, FALSE) as open,
-- ACCESS(-ible) means user has a defined role OR the application is open
case