From 4bf6b457ae6bfb6d28127f696344019765d0467d Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sun, 23 Jan 2022 11:16:47 +0200
Subject: [PATCH] Fix Snap OAUTH2_REQUEST_PERMISSIONS of Google/OAuth2/OIDC
 login.

Thanks to xet7 !

Fixes #4316
---
 .devcontainer/Dockerfile | 2 +-
 snap-src/bin/config      | 4 ++--
 snap-src/bin/wekan-help  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c4d818284..b7c61064a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -54,7 +54,7 @@ ENV \
     OAUTH2_USERNAME_MAP="" \
     OAUTH2_FULLNAME_MAP="" \
     OAUTH2_ID_TOKEN_WHITELIST_FIELDS="" \
-    OAUTH2_REQUEST_PERMISSIONS="openid profile email" \
+    OAUTH2_REQUEST_PERMISSIONS='openid profile email' \
     OAUTH2_EMAIL_MAP="" \
     LDAP_ENABLE=false \
     LDAP_PORT=389 \
diff --git a/snap-src/bin/config b/snap-src/bin/config
index c8e1c95d2..6b1d0f583 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -252,8 +252,8 @@ DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="OAuth2 ID Token Whitelist Fields."
 DEFAULT_OAUTH2_ID_TOKEN_WHITELIST_FIELDS=""
 KEY_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="oauth2-id-token-whitelist-fields"
 
-DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: openid profile email"
-DEFAULT_OAUTH2_REQUEST_PERMISSIONS="openid profile email"
+DESCRIPTION_OAUTH2_REQUEST_PERMISSIONS="OAuth2 Request Permissions. Example: 'openid profile email'"
+DEFAULT_OAUTH2_REQUEST_PERMISSIONS="'openid profile email'"
 KEY_OAUTH2_REQUEST_PERMISSIONS="oauth2-request-permissions"
 
 DESCRIPTION_OAUTH2_EMAIL_MAP="OAuth2 Email Mapping. Example: email"
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 2f72f7c44..2a2fc717a 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -276,7 +276,7 @@ echo -e "\t$ snap unset $SNAP_NAME oauth2-id-token-whitelist-fields"
 echo -e "\n"
 echo -e "OAuth2 Request Permissions."
 echo -e "To enable the OAuth2 Request Permissions of Wekan:"
-echo -e "\t$ snap set $SNAP_NAME oauth2-request-permissions=\"openid profile email\""
+echo -e "\t$ snap set $SNAP_NAME oauth2-request-permissions=\"'openid profile email'\""
 echo -e "\t-Disable the OAuth2 Request Permissions of Wekan:"
 echo -e "\t$ snap unset $SNAP_NAME oauth2-request-permissions"
 echo -e "\n"