diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-01 11:07:36 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-01 11:07:36 +0200 |
| commit | 20ca5b1a9f4fa6cc03ce4658c83cdf97f8141ba4 (patch) | |
| tree | ead952a3aa862fa032e8d575ac00b88104fe386c | |
| parent | 96398c69c082ada1f6418b4e90d1d24c5555a3d7 (diff) | |
| parent | d36ca25787caa2c2ac95daca0858f314933c67fd (diff) | |
Merge remote-tracking branch 'chiiph-github/bug/fix_typos' into develop
| -rw-r--r-- | soledad/changes/bug_typos | 2 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/__init__.py | 2 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/auth.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/soledad/changes/bug_typos b/soledad/changes/bug_typos new file mode 100644 index 00000000..056881ec --- /dev/null +++ b/soledad/changes/bug_typos @@ -0,0 +1,2 @@ + o Fix a couple of typos that prevented certain functionality to + work. Fixes #3306
\ No newline at end of file diff --git a/soledad_server/src/leap/soledad_server/__init__.py b/soledad_server/src/leap/soledad_server/__init__.py index afbb057e..18a0546e 100644 --- a/soledad_server/src/leap/soledad_server/__init__.py +++ b/soledad_server/src/leap/soledad_server/__init__.py @@ -61,7 +61,7 @@ class SoledadApp(http_app.HTTPApp): The name of the shared database that holds user's encrypted secrets. """ - USER_DB_PREFIX = 'uuid-' + USER_DB_PREFIX = 'user-' """ The string prefix of users' databases. """ diff --git a/soledad_server/src/leap/soledad_server/auth.py b/soledad_server/src/leap/soledad_server/auth.py index e0169523..3bcfcf04 100644 --- a/soledad_server/src/leap/soledad_server/auth.py +++ b/soledad_server/src/leap/soledad_server/auth.py @@ -343,8 +343,8 @@ class SoledadAuthMiddleware(object): @rtype: bool """ return URLToAuthorization( - uuid, self.app.SHARED_DB_NAME, - self.app.USER_DB_PREFIX + uuid, self._app.SHARED_DB_NAME, + self._app.USER_DB_PREFIX ).is_authorized(environ) @abstractmethod |