From 9c32ba9149c3ba7f1c2781b47b2d58a340451253 Mon Sep 17 00:00:00 2001
From: Jules Bertholet <jules.bertholet@gmail.com>
Date: Fri, 21 May 2021 13:38:59 -0400
Subject: [PATCH] Update to v0.6.0

---
 README.md                                     |  2 +-
 README_fr.md                                  |  2 +-
 conf/app.src                                  |  6 ++---
 conf/photonix.env                             |  2 +-
 manifest.json                                 |  2 +-
 .../app-00-photonix-web-settings.py.patch     | 24 ++++++++-----------
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index fca3395..5fb0150 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Photonix is a photo management application that streamlines the process of storing, presenting and re-discovering photos. Smart filtering is made possible automatically by object recognition, location awareness, color analysis and other algorithms.
 
-**Shipped version:** 0.4.0
+**Shipped version:** 0.6.0
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 148fc6a..f1531f7 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Photonix est une application de gestion de photos qui simplifie le processus de stocker, présenter er re-découvrir ses photos. Le filtrage intelligent est rendu possible automatiquement grâce à la reconnaissance d'objets, la localisation, l'analyse de couleurs, et d'autres algorithmes.
 
-**Version incluse :** 0.4.0
+**Version incluse :** 0.6.0
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 30e6bdf..65c6b18 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/photonixapp/photonix/archive/refs/tags/v0.4.0.tar.gz
-SOURCE_SUM=5e550f77058b665707c1d0212dcb4da7c5c212c49f97de1e25bf0d662015c7c3
+SOURCE_URL=https://github.com/photonixapp/photonix/archive/refs/tags/v0.6.0.tar.gz
+SOURCE_SUM=5ded04d9edec11e42de85a0c9398c8bfa8841bef93df851a4f74d5b57ad7a9a2
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=v0.4.0.tar.gz
+SOURCE_FILENAME=v0.6.0.tar.gz
 SOURCE_EXTRACT=true
diff --git a/conf/photonix.env b/conf/photonix.env
index 3854d1a..822b4da 100644
--- a/conf/photonix.env
+++ b/conf/photonix.env
@@ -8,6 +8,6 @@ ALLOWED_HOSTS='*'
 DEMO=0
 
 PHOTONIX_PORT=__PORT__
-SECRET_KEY=__SECRET_KEY__
+DJANGO_SECRET_KEY=__SECRET_KEY__
 
 PYTHONPATH=__FINALPATH__/srv
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ca00fe4..ec9acd7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Photo management application that streamlines the process of storing, presenting and re-discovering photos",
         "fr": "Application de gestion de photos qui simplifie le processus de stocker, présenter er re-découvrir ses photos"
     },
-    "version": "0.4.0~ynh1",
+    "version": "0.6.0~ynh1",
     "url": "https://photonix.org/",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/sources/patches/app-00-photonix-web-settings.py.patch b/sources/patches/app-00-photonix-web-settings.py.patch
index 5378249..9d53b72 100644
--- a/sources/patches/app-00-photonix-web-settings.py.patch
+++ b/sources/patches/app-00-photonix-web-settings.py.patch
@@ -1,22 +1,16 @@
 diff --git a/photonix/web/settings.py b/photonix/web/settings.py
-index 8428b0c..9008613 100644
+index 8397662..5ebaa37 100644
 --- a/photonix/web/settings.py
 +++ b/photonix/web/settings.py
-@@ -16,11 +16,12 @@ from pathlib import Path
+@@ -16,6 +16,7 @@ from pathlib import Path
  
- from django.core.management import utils
+ from .utils import get_secret_key
  
 +import ldap
  
  # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
  BASE_DIR = str(Path(__file__).parent.parent.resolve())
- 
--SECRET_KEY = utils.get_random_secret_key()
-+SECRET_KEY = os.environ['SECRET_KEY']
- 
- DEBUG = os.environ.get('ENV', 'prd') != 'prd'
- 
-@@ -92,6 +93,7 @@ DATABASES = {
+@@ -92,12 +93,17 @@ DATABASES = {
  }
  
  AUTHENTICATION_BACKENDS = [
@@ -24,11 +18,13 @@ index 8428b0c..9008613 100644
      'graphql_jwt.backends.JSONWebTokenBackend',
      'django.contrib.auth.backends.ModelBackend',
  ]
-@@ -189,3 +191,7 @@ GRAPHQL_JWT = {
- APPEND_SLASHES = False
  
- CORS_ORIGIN_WHITELIST = []
-+
+ AUTH_USER_MODEL = 'accounts.User'
+ 
 +AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=users,dc=yunohost,dc=org"
 +
 +AUTH_LDAP_USER_ATTR_MAP = {"username": "uid", "first_name": "givenName", "email": "mail", "last_name": "sn"}
++
+ # Password validation
+ # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
+