move firebase auth handling to core (#151)

* move firebase auth handling to core CPCN-206
superdesk · Nov 24, 2023 · 2f8742c · 2f8742c
1 parent cc4574d
commit 2f8742c
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 17,129 deletions.
diff --git a/client/.npmrc b/client/.npmrc
@@ -1 +1 @@
-package-lock=true
+package-lock=false
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -4,8 +4,7 @@
     "build": "export NODE_ENV=production && webpack --progress --profile --colors"
   },
   "dependencies": {
-    "firebase": "9.6.11",
-    "newsroom-core": "github:superdesk/newsroom-core#release/2.5"
+    "newsroom-core": "github:superdesk/newsroom-core#develop"
   },
   "devDependencies": {
     "babel-plugin-transform-object-rest-spread": "^6.26.0",

diff --git a/client/src/auth.js b/client/src/auth.js
diff --git a/client/src/login.js b/client/src/login.js
diff --git a/client/src/reset-password.js b/client/src/reset-password.js
diff --git a/client/webpack.config.js b/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')
diff --git a/server/cp/auth.py b/server/cp/auth.py
diff --git a/server/cp/common_settings.py b/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,
 }])
diff --git a/server/requirements.in b/server/requirements.in
@@ -1,2 +1 @@
-google-auth==2.6.0
-git+https://github.com/superdesk/newsroom-core.git@release/2.5#egg=Newsroom-Core
+git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -161,7 +161,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
@@ -225,7 +225,7 @@ mongolock==1.3.4
     # via superdesk-core
 natsort==8.4.0
     # via croniter
-newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.5
+newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@develop
     # via -r requirements.in
 oauth2client==4.1.3
     # via flask-oidc-ex

diff --git a/server/settings.py b/server/settings.py
@@ -208,7 +208,6 @@
 
 
 BLUEPRINTS = [
-    "cp.auth",  # we need this one loaded before newsroom.auth to make it override logout
     "cp.mgmt_api_docs",
 ] + [
     blueprint
@@ -233,7 +232,6 @@
 INSTALLED_APPS = [
     "cp.sidenav",
     "cp.signals",
-    "cp.auth",
     "newsroom.auth.saml",
 ]
 

diff --git a/server/theme/cp_reset_password.html b/server/theme/cp_reset_password.html
diff --git a/server/theme/cp_reset_password_confirmation.html b/server/theme/cp_reset_password_confirmation.html