3.Release 3.6.0

ansible/artifacts/sunbird/login/login-reset-password.ftl

@@ -39,7 +39,7 @@
                         <input type="text" id="username" class="mt-8" name="username" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" autofocus/>
                     </div>
                     <div class="field">
-                        <button id="login" class="sb-btn sb-btn-normal sb-btn-primary width-100">
+                        <button id="login" onclick="javascript:makeDivUnclickable()" class="sb-btn sb-btn-normal sb-btn-primary width-100">
                         ${msg("doReset")}
                         </button>
                     </div>

ansible/artifacts/sunbird/login/login.ftl

@@ -64,14 +64,14 @@
                     </div>
                     <div class="forgot-password">
                       <#if realm.resetPasswordAllowed>
-                        <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable()" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
-                        <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:forgetPassword('/recover/identify/account');javascript:makeDivUnclickable()">${msg("doForgotPassword")}</div>
+                        <a id="fgtKeycloakFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:storeLocation(); javascript:makeDivUnclickable(); javascript:storeForgotPasswordLocation(event);" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a>
+                        <div id="fgtPortalFlow" class="ui right floated forgetPasswordLink hide" tabindex="1" onclick="javascript:makeDivUnclickable(); javascript:createTelemetryEvent(event); javascript:forgetPassword('/recover/identify/account');">${msg("doForgotPassword")}</div>
                       </#if>
                     </div>
                     </div>
 
                     <div class="field mb-8">
-                        <button id="login" class="mt-24 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("login")}</button>
+                        <button id="login" onclick="doLogin(event)" class="mt-24 sb-btn sb-btn-normal sb-btn-primary width-100">${msg("login")}</button>
                     </div>
                   <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
                     <div id="kc-registration" class="field">

ansible/artifacts/sunbird/login/resources/css/login.css

@@ -138,6 +138,10 @@ p.subtitle {
 .textCenter {
     text-align: center !important;
 }
+
+.textRight{
+    text-align: right !important;
+}
 .mb-16{
     margin-bottom: 16px !important;
 }
@@ -341,6 +345,7 @@ h1, h2, h3, h4, h5,
     cursor: pointer
 }
 
+
 .width-100 {
     width: 100%;
 }

ansible/artifacts/sunbird/login/resources/js/login.js

@@ -380,7 +380,7 @@ var forgetPassword = (redirectUrlPath) => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if(client_id === 'android'){
+			if(client_id === 'android' || client_id === 'desktop'){
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			}
 			else{
@@ -414,7 +414,7 @@ var redirect  = (redirectUrlPath) => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			} else {
 				window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
@@ -437,7 +437,7 @@ var handleSsoEvent  = () => {
 		const sessionUrlObj = new URL(sessionUrl);
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				const ssoUrl = sessionUrlObj.protocol + '//' + sessionUrlObj.host + ssoPath;
 				window.location.href = redirect_uri + '?ssoUrl=' + ssoUrl;
 			} else {
@@ -462,7 +462,7 @@ var handleGoogleAuthEvent = () => {
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				let host = sessionUrlObj.host;
 				if (host.indexOf("merge.") !== -1) {
 					host = host.slice(host.indexOf("merge.") + 6, host.length);
@@ -489,7 +489,7 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
 		const updatedQuery = sessionUrlObj.search + '&error_callback=' + sessionUrlObj.href.split('?')[0];
 		if (redirect_uri) {
 			const redirect_uriLocation = new URL(redirect_uri);
-			if (client_id === 'android') {
+			if (client_id === 'android' ||  client_id === 'desktop') {
 				window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
 			} else {
 				window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +
@@ -501,4 +501,4 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
 	} else {
 		redirectToLib();
 	}
-};
+};

ansible/artifacts/sunbird/login/theme.properties

@@ -13,9 +13,9 @@
 # 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.
-#
+# scripts=js/login.js?v=1.15.b
 
 parent=base
 styles=css/semantic.min.css?v=1.15.b css/login.css?v=1.15.b
-scripts=js/login.js?v=1.15.b
+scripts=js/jquery-3.3.1.min.js?v=1.15.b js/telemetry_service.js?v=1.15.b
 kcFeedbackAreaClass=ui info message

ansible/bootstrap-mongodb.yml

@@ -0,0 +1,20 @@
+---
+- hosts: mongo
+  become: yes
+  gather_facts: no
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  tasks:
+    - name: Template and init nodbb db
+      block:
+        - name: Templating nodebb schema
+          copy:
+           content: |-
+             use nodebb
+             db.createUser( { user: "nodebb", pwd: "{{ nodebb_admin_password }}", roles: [ { role: "readWrite", db: "nodebb" }, { role: "clusterMonitor", db: "admin" } ] } )
+           dest: /tmp/nodebb.js
+        - name: Init nodebb db
+          shell: |-
+            mongo < /tmp/nodebb.js
+      tags: 
+        - nodebb

ansible/cassandra-deploy-decrypt.yml

@@ -5,6 +5,7 @@
     sunbird_cassandra_port: 9042
     sunbird_cassandra_keyspace: sunbird
     sunbird_encryption_key: "{{ core_vault_sunbird_encryption_key }}"
+    sunbird_cassandra_groups_keyspace: sunbird_groups
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   roles:

ansible/cassandra-exporter.yaml

@@ -0,0 +1,6 @@
+- hosts: cassandra
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - cassandra-exporter

ansible/cert-file-upload.yml

@@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_public_storage_account_name }}"
+    AZURE_STORAGE_KEY: "{{ sunbird_public_storage_account_key }}"
+  roles:
+   - cert-file-upload

ansible/desktop-faq-upload.yml

@@ -30,3 +30,19 @@
     - artifacts-upload-azure
   tags:
     - upload-label
+
+- hosts: localhost
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  vars:
+    source_path: "{{playbook_dir}}/../{{src_file_path}}"
+    destination_path: "{{destination_path}}"
+    container_name: "{{desktop_container}}"
+  environment:
+    AZURE_STORAGE_ACCOUNT: "{{ sunbird_public_storage_account_name }}"
+    AZURE_STORAGE_KEY: "{{ sunbird_public_storage_account_key }}"
+  roles:
+    - upload-batch
+  tags:
+    - upload-chatbot-config

ansible/inventory/env/group_vars/all.yml

@@ -110,8 +110,8 @@ sunbird_cassandra_host: "{{groups['cassandra']|join(',')}}"  #Private IP of Cass
 sunbird_es_host: "{{groups['es']| join(',')}}"
 
 ## Application server configurations
-sunbird_analytics_api_base_url: "http://{{analyticsapi_ip}}:9000"
-sunbird_search_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9004"
+sunbird_analytics_api_base_url: "http://analytics-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_search_service_api_base_url: "http://search-service.{{namespace}}.svc.cluster.local:9000"
 sunbird_mail_server_host: "{{ mail_server_host }}"  #SMTP server IP. Could be ignored if not mails are to be sent.
 sunbird_mail_server_port: "{{ mail_server_port }}" #SMTP port. Could be ignored if not mails are to be sent.
 sunbird_mail_server_username: "{{ mail_server_username }}"  #SMTP username. Could be ignored if not mails are to be sent.
@@ -197,8 +197,8 @@ sunbird_dial_repo_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
 sunbird_plugin_repo_api_base_url: "{{ sunbird_search_service_api_base_url }}"
 sunbird_data_service_api_base_url: "{{sunbird_ekstep_api_base_url}}"
 sunbird_data_service_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
-sunbird_content_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9002"
-sunbird_user_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_content_service_api_base_url: "http:///content-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_user_service_api_base_url: "http:///learner-service.{{namespace}}.svc.cluster.local:9000"
 sunbird_group_service_api_base_url: "http://groups-service:9000"
 
 #API Manager
@@ -262,7 +262,7 @@ enable_scraping_docker_metrics: false
 postgres_exporter_postgres_port: 5432
 postgres_exporter_user: postgres_exporter
 sunbird_cs_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
-sunbird_user_service_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/learner"
 kong_admin_api_url: http://localhost:8001
 
 
@@ -342,7 +342,7 @@ sunbird_device_register_api: "{{proto}}://{{api_proxy_name}}/v3/device/register/
 sunbird_course_batch_notification_signature: sunbird
 
 sunbird_authorization: "{{core_vault_sunbird_api_auth_token}}"
-sunbird_lms_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:8000"
+sunbird_lms_base_url: "http://{{private_ingressgateway_ip}}/api"
 sunbird_content_service_local_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
 sunbird_kafka_host: "{{sunbird_processing_kafka_host}}"
 sunbird_qrimage_topic: "{{env}}.qrimage.request"
@@ -543,7 +543,7 @@ sunbird_sso_kafka_topic: "{{env_name}}.lms.sso.events"
 __yarn_host__: "{{ groups['yarn-master'][0] }}"
 zookeepers: "{{groups['zookeeper']|join(':2181,')}}:2181"
 kafka_brokers: "{{groups['processing-cluster-kafka']|join(':9092,')}}:9092"
-__lms_host__: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+__lms_host__: "http://{{private_ingressgateway_ip}}/learner"
 sunbird_redis_host: "{{ groups['lp-redis'][0] }}"
 
 
@@ -576,19 +576,19 @@ cert_service_container_name: "{{env}}-e-credentials"
 cert_service_cloud_storage_type: "{{cert_service_cloud_storage_type}}"
 
 ### Release-2.4.0 ###
-samza_tar_files_localpath: roles/samza-jobs/defaults    
-job_names:    
-  lms.user-account-merger_1:    
-      job_file_name: 'user-account-merge'    
-  lms.sso-account-updater_1:    
-      job_file_name: 'sso-account-updater'    
-  lms.indexer_1:    
+samza_tar_files_localpath: roles/samza-jobs/defaults
+job_names:
+  lms.user-account-merger_1:
+      job_file_name: 'user-account-merge'
+  lms.sso-account-updater_1:
+      job_file_name: 'sso-account-updater'
+  lms.indexer_1:
       job_file_name: 'indexer'
   lms.notification-job_1:
       job_file_name: 'notification-job'
 
 ### api call report mailing list ####
-api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml   
+api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml
 kafka_assessment_topic: "{{env_name}}.telemetry.assess"
 
 # Portal vars for reports
@@ -597,7 +597,7 @@ kafka_assessment_topic: "{{env_name}}.telemetry.assess"
 sunbird_device_api: "{{proto}}://{{ proxy_server_name }}/api/"
 sunbird_quartz_shadow_user_migration_timer: "0 0 1 1/1 * ? *"
 
-# Learning-Service 
+# Learning-Service
 lp_cassandra_connection: "{{groups['lp-cassandra']|join(':9042,')}}:9042"
 dp_cassandra_connection: "{{groups['dp-cassandra']|join(':9042,')}}:9042"
 learning_neo4j_bolt_url: bolt://{{ groups['learning-neo4j-node1'][0] }}:7687
@@ -619,8 +619,8 @@ sunbird_druid_broker_host: "http://{{groups['dp-druid-broker'][0]}}"
 # Content-service
 lp_cassandra_keyspace_prefix: "{{ env }}"
 lp_kafka_url: "{{sunbird_processing_kafka_host}}"
-content_import_required_props: '["name","code","mimeType","contentType","artifactUrl","framework"]'
-content_import_remove_props: '["downloadUrl","variants","previewUrl","streamingUrl","itemSets","level1Name","level1Concept","level2Name","level2Concept","level3Name","level3Concept","me_totalPlaySessionCount","me_totalTimeSpentInSec","me_totalSessionsCount","me_totalTimespent","me_totalInteractions","me_creationSessions","me_creationTimespent","me_averageInteractionsPerMin","me_averageSessionsPerDevice","me_totalDevices","me_averageTimespentPerSession","me_averageRating","me_totalDownloads","me_totalSideloads","me_totalRatings","me_totalComments","me_totalDialcode","me_totalDialcodeLinkedToContent","me_totalDialcodeAttached","me_hierarchyLevel","origin","originData","contentPolicyCheck"]'
+content_import_required_props: '["name","code","mimeType","primaryCategory","artifactUrl","framework"]'
+content_import_remove_props: '["downloadUrl","variants","previewUrl","streamingUrl","itemSets","level1Name","level1Concept","level2Name","level2Concept","level3Name","level3Concept","me_totalPlaySessionCount","me_totalTimeSpentInSec","me_totalSessionsCount","me_totalTimespent","me_totalInteractions","me_creationSessions","me_creationTimespent","me_averageInteractionsPerMin","me_averageSessionsPerDevice","me_totalDevices","me_averageTimespentPerSession","me_averageRating","me_totalDownloads","me_totalSideloads","me_totalRatings","me_totalComments","me_totalDialcode","me_totalDialcodeLinkedToContent","me_totalDialcodeAttached","me_hierarchyLevel","origin","originData","contentPolicyCheck","questions"]'
 
 # Print Service
 #kp_sunbird_account_name: "{{azure_account_name}}"
@@ -646,3 +646,15 @@ dp_play_http_secret_key: "mysecretdpplaysecretkey"
 # LMS Service vars
 group_activity_agg_cache_ttl: 3600
 group_activity_agg_cache_enable: false
+
+# nodebb variables
+mongo_nodebb_host: "{{ groups['mongo'] | join(',')}}"
+sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
+kibana_service: "http://kibana.logging.svc.cluster.local:5601"
+sunbird_dial_repo_api_base_url: "http://{{dialservice_ip}}:9001"
+
+#report service
+dp_postgres_host: "{{ groups['postgres'][0] }}"
+dp_postgres_db: analytics
+dp_postgres_password: "{{ core_vault_dp_pgdb_password }}"
+dp_postgres_username: analytics