Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #85 from phovea/release-9.0.0
Browse files Browse the repository at this point in the history
Prepare Archiving
  • Loading branch information
Anita Steiner authored Nov 30, 2021
2 parents 60434e2 + 86c21bd commit f0656f6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
------------

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "phovea_security_flask",
"description": "",
"version": "8.0.0",
"version": "9.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand Down Expand Up @@ -74,7 +74,7 @@
"node": ">= 12.13"
},
"dependencies": {
"phovea_core": "^7.0.0"
"phovea_core": "^8.0.0"
},
"devDependencies": {
"@types/jest": "~26.0.20",
Expand Down
3 changes: 2 additions & 1 deletion phovea_security_flask/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"admin"
]
}
]
],
"alwaysAppendDummyStore": false
}
5 changes: 2 additions & 3 deletions phovea_security_flask/flask_login_impl.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

import phovea_server.security as security
import phovea_server.config
import flask_login
import logging

Expand Down Expand Up @@ -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())
Expand All @@ -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)

Expand Down

0 comments on commit f0656f6

Please sign in to comment.