From ce979f8d647e95d6dca41caf617ca2ee4caa31d5 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 8 Sep 2021 09:39:43 +0200 Subject: [PATCH 1/4] prepare next development version 8.0.1-SNAPSHOT --- package.json | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3ebbfb1..46908c0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phovea_security_flask", "description": "", - "version": "8.0.0", + "version": "8.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -74,7 +74,7 @@ "node": ">= 12.13" }, "dependencies": { - "phovea_core": "^7.0.0" + "phovea_core": "github:phovea/phovea_core#develop" }, "devDependencies": { "@types/jest": "~26.0.20", diff --git a/requirements.txt b/requirements.txt index f359433..0fb85fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ flask-login==0.5.0 -phovea_server>=7.2.0,<8.0.0 \ No newline at end of file +-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file From 44387a5887235713fcda3860c53dcef1f3e79ad5 Mon Sep 17 00:00:00 2001 From: Michael Puehringer Date: Fri, 22 Oct 2021 08:39:39 +0200 Subject: [PATCH 2/4] Added alwaysAppendDummyStore to config --- phovea_security_flask/config.json | 3 ++- phovea_security_flask/flask_login_impl.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phovea_security_flask/config.json b/phovea_security_flask/config.json index 0c3eed7..7a62622 100644 --- a/phovea_security_flask/config.json +++ b/phovea_security_flask/config.json @@ -17,5 +17,6 @@ "admin" ] } - ] + ], + "alwaysAppendDummyStore": false } diff --git a/phovea_security_flask/flask_login_impl.py b/phovea_security_flask/flask_login_impl.py index 07b20b3..4c55288 100644 --- a/phovea_security_flask/flask_login_impl.py +++ b/phovea_security_flask/flask_login_impl.py @@ -1,5 +1,6 @@ import phovea_server.security as security +import phovea_server.config import flask_login import logging @@ -44,7 +45,7 @@ def __init__(self): import phovea_server.plugin as plugin self._user_stores = list(filter(None, [p.load().factory() for p in plugin.list('user_stores')])) - if len(self._user_stores) == 0: + if len(self._user_stores) == 0 or phovea_server.config.get('phovea_security_flask.alwaysAppendDummyStore'): _log.info('using dummy store') from . import dummy_store self._user_stores.append(dummy_store.create()) @@ -56,8 +57,6 @@ def _load_user(self, id): return u return None - # return User.query.get(int(id)) - def init_app(self, app): self._manager.init_app(app) From e7385d983958c3953ece07e35a8bed1d5fb4045b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 29 Nov 2021 13:09:49 +0100 Subject: [PATCH 3/4] update versions --- package.json | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 46908c0..5b281fd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phovea_security_flask", "description": "", - "version": "8.0.1-SNAPSHOT", + "version": "9.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -74,7 +74,7 @@ "node": ">= 12.13" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#develop" + "phovea_core": "^8.0.0" }, "devDependencies": { "@types/jest": "~26.0.20", diff --git a/requirements.txt b/requirements.txt index 0fb85fa..f359433 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ flask-login==0.5.0 --e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server \ No newline at end of file +phovea_server>=7.2.0,<8.0.0 \ No newline at end of file From 86c21bdb760c0572250fe891f1f4f8486d8a3701 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 29 Nov 2021 13:09:52 +0100 Subject: [PATCH 4/4] update README --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3504ea6..db63e3f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -phovea_security_flask +DEPRECATED: phovea_security_flask ===================== [![Phovea][phovea-image-client]][phovea-url] [![Phovea][phovea-image-server]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][circleci-image]][circleci-url] Security manager implementation based on [Flask-Login](https://flask-login.readthedocs.io/en/latest/). Additionally, a login module is provided that can be used at client-side. +### DEPRECATION Information +Please note that this project has been archived and is no longer being maintained. There is an active development under https://github.com/datavisyn/tdp_core and we will also contribute our future changes to it. + Installation ------------