Browse Source

Fix Snap OAUTH2_REQUEST_PERMISSIONS of Google/OAuth2/OIDC login.

Thanks to xet7 !

Fixes #4316
Lauri Ojansivu 3 years ago
parent
commit
4bf6b457ae
3 changed files with 4 additions and 4 deletions
  1. 1 1
      .devcontainer/Dockerfile
  2. 2 2
      snap-src/bin/config
  3. 1 1
      snap-src/bin/wekan-help

+ 1 - 1
.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 \

+ 2 - 2
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"

+ 1 - 1
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"