From 256dca59b17d6d40511fc807bd3e0a2d7a5d80ee Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Mon, 31 Oct 2022 17:04:31 +0100
Subject: [PATCH] mino

---
 CHANGELOG                      | 3 ++-
 docs/contact.md                | 1 +
 docs/instances.md              | 2 +-
 nuxt.config.js                 | 2 ++
 server/api/controller/oauth.js | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3486d19c..12056700 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,10 +2,11 @@ All notable changes to this project will be documented in this file.
 
 ### UNRELEASED
   - new plugin system
-    - new "publish on telegram" plugin: thanks
+    - new "publish on telegram" plugin: thanks @fadelkon
   - i18n refactoring
   - people can now choose the language displayed - fix #171
   - fix place "[Object]" issue - #194
+  - admin could choose a custom fallback image - fix #195
 
 
 ### 1.5.6 - 22 set '22
diff --git a/docs/contact.md b/docs/contact.md
index 219d21fe..ed7bb3db 100644
--- a/docs/contact.md
+++ b/docs/contact.md
@@ -11,4 +11,5 @@ nav_order: 9
 - :elephant: Mastodon ⇒  [@gancio@mastodon.cisti.org](https://mastodon.cisti.org/@gancio)
 - :email: Email ⇒ [info@cisti.org](mailto:info@cisti.org)
 - IRC ⇒ #gancio @ irc.autistici.org (sometimes...)
+- Issues ⇒ https://framagit.org/les/gancio/-/issues
 
diff --git a/docs/instances.md b/docs/instances.md
index 8b92c039..74dbedf2 100644
--- a/docs/instances.md
+++ b/docs/instances.md
@@ -19,7 +19,7 @@ nav_order: 7
 - [agenda.eskoria.eus](https://agenda.eskoria.eus/)
 - [lubakiagenda.net](https://lubakiagenda.net/)
 - [eventos.coletivos.org](https://eventos.coletivos.org/)
-
+- [calendario.extinctionrebellion.es](https://calendario.extinctionrebellion.es/)
 
 
 <small>Do you want your instance to appear here? [Write us]({% link contact.md %}).</small>
diff --git a/nuxt.config.js b/nuxt.config.js
index 5561fcd8..18e28ab2 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -105,6 +105,8 @@ module.exports = {
     prefix: '/api'
   },
   auth: {
+    rewriteRedirects: true,
+    fullPathRedirect: true,
     // localStorage: false, // https://github.com/nuxt-community/auth-module/issues/425
     cookie: {
       prefix: 'auth.',
diff --git a/server/api/controller/oauth.js b/server/api/controller/oauth.js
index f72d0b6b..77eabafe 100644
--- a/server/api/controller/oauth.js
+++ b/server/api/controller/oauth.js
@@ -87,7 +87,7 @@ const oauthController = {
      */
     async getClient (client_id, client_secret) {
       const client = await OAuthClient.findByPk(client_id, { raw: true })
-      if (client_secret && client_secret !== client.client_secret) {
+      if (!client || (client_secret && client_secret !== client.client_secret)) {
         return false
       }