Merge remote-tracking branch 'origin/cn-develop' into develop

client/.npmrc

@@ -1 +1 @@
-package-lock=true
+package-lock=false

client/package.json

@@ -4,7 +4,6 @@
     "build": "export NODE_ENV=production && webpack --progress --profile --colors"
   },
   "dependencies": {
-    "firebase": "9.6.11",
     "newsroom-core": "github:superdesk/newsroom-core#develop"
   },
   "devDependencies": {

client/webpack.config.js

@@ -1,7 +1 @@
-const path = require('path');
-const config  = require('newsroom-core/webpack.config');
-
-config.entry.login = path.resolve(__dirname, 'src', 'login.js');
-config.entry.reset_password = path.resolve(__dirname, 'src', 'reset-password.js');
-
-module.exports = config;
+module.exports = require('newsroom-core/webpack.config')

server/cp/common_settings.py

@@ -5,10 +5,10 @@
 
 AUTH_PROVIDERS.extend([{
     "_id": "gip",
-    "name": lazy_gettext("Google"),
-    "auth_type": AuthProviderType.GOOGLE_OAUTH.value,
+    "name": lazy_gettext("Firebase"),
+    "auth_type": AuthProviderType.FIREBASE,
 }, {
     "_id": "azure",
     "name": lazy_gettext("Azure"),
-    "auth_type": AuthProviderType.SAML.value,
+    "auth_type": AuthProviderType.SAML,
 }])

server/cp/signals.py

@@ -43,14 +43,14 @@ def on_user_created(sender, user, **kwargs):
 def on_user_updated(sender, user, updates=None, **kwargs):
     if user_auth_is_gip(user):
         if updates and updates.get("password"):
-            send_notification("password change", user)
+            send_notification("password", user)
         else:
-            send_notification("update user", user)
+            send_notification("update", user)
 
 
 def on_user_deleted(sender, user, **kwargs):
     if user_auth_is_gip(user):
-        send_notification("delete user", user)
+        send_notification("delete", user)
 
 
 def on_push(sender, item, **kwargs):

server/requirements.in

@@ -1,2 +1 @@
-google-auth==2.6.0
 git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core

server/requirements.txt

@@ -155,7 +155,7 @@ flask-wtf==0.14.3
 future==0.18.3
     # via python-twitter
 google-auth==2.6.0
-    # via -r requirements.in
+    # via newsroom-core
 gunicorn==20.0.4
     # via newsroom-core
 hachoir==3.0a3

server/settings.py

@@ -87,7 +87,6 @@
         "DATE_FORMAT": "MMM Do, YYYY",
         "COVERAGE_DATE_FORMAT": "MMM Do, YYYY",
         "COVERAGE_DATE_TIME_FORMAT": "HH:mm MMM Do, YYYY",
-
         # server formats
         "DATE_FORMAT_HEADER": "long",
     }
@@ -101,7 +100,6 @@
         "COVERAGE_DATE_TIME_FORMAT": "HH:mm [le] Do MMMM YYYY",
         "AGENDA_DATE_FORMAT_SHORT": "dddd, D MMMM",
         "AGENDA_DATE_FORMAT_LONG": "dddd, D MMMM YYYY",
-
         # server formats
         "DATE_FORMAT_HEADER": "d MMMM yyyy à H:mm zzz",
         "NOTIFICATION_EMAIL_TIME_FORMAT": "HH:mm",
@@ -208,7 +206,6 @@
 
 
 BLUEPRINTS = [
-    "cp.auth",  # we need this one loaded before newsroom.auth to make it override logout
     "cp.mgmt_api_docs",
 ] + [
     blueprint
@@ -233,7 +230,6 @@
 INSTALLED_APPS = [
     "cp.sidenav",
     "cp.signals",
-    "cp.auth",
     "newsroom.auth.saml",
 ]
 
@@ -306,6 +302,8 @@
 
 AGENDA_SHOW_MULTIDAY_ON_START_ONLY = True
 
+WIRE_NOTIFICATIONS_ON_CORRECTIONS = True
+
 CONTENTAPI_ELASTICSEARCH_SETTINGS["settings"]["analysis"]["analyzer"]["html_field_analyzer"]["filter"] = [
     "lowercase",
     "elision",

server/tests/test_signals.py

@@ -84,7 +84,7 @@ def test_cem_notification_on_user_changes(app):
                     {
                         "object_id": str(user["_id"]),
                         "company": str(company_id),
-                        "type": "update user",
+                        "type": "update",
                         "platform": "Test",
                     }
                 ),
@@ -102,7 +102,7 @@ def test_cem_notification_on_user_changes(app):
                     {
                         "object_id": str(user["_id"]),
                         "company": str(company_id),
-                        "type": "password change",
+                        "type": "password",
                         "platform": "Test",
                     }
                 ),
@@ -120,7 +120,7 @@ def test_cem_notification_on_user_changes(app):
                     {
                         "object_id": str(user["_id"]),
                         "company": str(company_id),
-                        "type": "delete user",
+                        "type": "delete",
                         "platform": "Test",
                     }
                 ),