v2.23

Thanks to Akuket.

.meteor/packages

@@ -90,3 +90,4 @@ wekan:wekan-ldap
 wekan:accounts-cas
 wekan-scrollbar
 mquandalle:perfect-scrollbar
+mdg:meteor-apm-agent

.meteor/versions

@@ -84,6 +84,7 @@ localstorage@1.2.0
 logging@1.1.19
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
+mdg:meteor-apm-agent@3.1.2
 mdg:validation-error@0.5.1
 meteor@1.8.2
 meteor-base@1.2.0

CHANGELOG.md

@@ -1,3 +1,29 @@
+# v2.23 2019-02-17 Wekan relase
+
+This release fixes the following bugs:
+
+- [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191).
+  Thanks to Akuket.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.22 2019-02-13 Wekan release
+
+This release adds the following new features:
+
+- [Kadira integration](https://github.com/wekan/wekan/issues/2152). Thanks to GavinLilly.
+- Add [configurable](https://github.com/wekan/wekan/issues/1874#issuecomment-462759627)
+  settings [OAUTH2_ID_TOKEN_WHITELIST_FIELDS and
+  OAUTH2_REQUEST_PERMISSIONS](https://github.com/wekan/wekan/commit/b66f471e530d41a3f12e4bfc29548313e9a73c35).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix: Remove overlap of side bar button with card/list menu button on
+   mobile browser](https://github.com/wekan/wekan/issues/2183). Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+    
 # v2.21 2019-02-12 Wekan release
 
 This release adds the following new features:

Dockerfile

@@ -30,6 +30,8 @@ ARG OAUTH2_ID_MAP
 ARG OAUTH2_USERNAME_MAP
 ARG OAUTH2_FULLNAME_MAP
 ARG OAUTH2_EMAIL_MAP
+ARG OAUTH2_ID_TOKEN_WHITELIST_FIELDS
+ARG OAUTH2_REQUEST_PERMISSIONS
 ARG LDAP_ENABLE
 ARG LDAP_PORT
 ARG LDAP_HOST
@@ -109,6 +111,8 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     OAUTH2_USERNAME_MAP="" \
     OAUTH2_FULLNAME_MAP="" \
     OAUTH2_EMAIL_MAP="" \
+    OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \
+    OAUTH2_REQUEST_PERMISSIONS=[openid] \
     LDAP_ENABLE=false \
     LDAP_PORT=389 \
     LDAP_HOST="" \

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.21.0"
+appVersion: "v2.23.0"
 files:
   userUploads:
     - README.md

client/components/lists/list.styl

@@ -84,6 +84,7 @@
     padding-left: 10px
     color: #a6a6a6
 
+
   .list-header-menu
     position: absolute
     padding: 27px 19px
@@ -155,6 +156,9 @@
     float: left
 
 @media screen and (max-width: 800px)
+  .list-header-menu
+    margin-right: 30px
+
   .mini-list
     flex: 0 0 60px
     height: 60px

client/components/main/layouts.jade

@@ -24,7 +24,7 @@ template(name="userFormsLayout")
     section.auth-dialog
       +Template.dynamic(template=content)
       if currentSetting.displayAuthenticationMethod
-        +connectionMethod
+        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
       div.at-form-lang
         select.select-lang.js-userform-set-language
           each languages

client/components/settings/connectionMethod.jade

@@ -2,5 +2,8 @@ template(name='connectionMethod')
   div.at-form-authentication
     label {{_ 'authentication-method'}}
     select.select-authentication
-        each authentications
-            option(value="{{value}}") {{_ value}}
+      each authentications
+        if isSelected value
+          option(value="{{value}}" selected) {{_ value}}
+        else
+          option(value="{{value}}") {{_ value}}

client/components/settings/connectionMethod.js

@@ -31,4 +31,7 @@ Template.connectionMethod.helpers({
   authentications() {
     return Template.instance().authenticationMethods.get();
   },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
 });

docker-compose.yml

@@ -191,9 +191,12 @@ services:
       # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
       #---------------------------------------------------------------
       # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
-      # https://github.com/smeijer/kadira
+      # https://github.com/edemaine/kadira-compose
+      # https://github.com/meteor/meteor-apm-agent
       # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
-      # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
+      #- APM_APP_ID=
+      #- APM_APP_SECRET=
       #---------------------------------------------------------------
       # ==== OPTIONAL: LOGS AND STATS ====
       # https://github.com/wekan/wekan/wiki/Logs
@@ -308,6 +311,10 @@ services:
       #- OAUTH2_FULLNAME_MAP=
       # OAuth2 Email Mapping
       #- OAUTH2_EMAIL_MAP=
+      # OAUTH2 ID Token Whitelist Fields.
+      #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+      # OAUTH2 Request Permissions.
+      #- OAUTH2_REQUEST_PERMISSIONS=[openid email profile]
       #-----------------------------------------------------------------
       # ==== LDAP ====
       # https://github.com/wekan/wekan/wiki/LDAP

i18n/pt-BR.i18n.json

@@ -654,7 +654,7 @@
     "authentication-method": "Método de autenticação",
     "authentication-type": "Tipo de autenticação",
     "custom-product-name": "Nome Customizado do Produto",
-    "layout": "Leiaute",
+    "layout": "Layout",
     "hide-logo": "Esconder Logo",
     "add-custom-html-after-body-start": "Adicionar HTML Customizado depois do início do <body>",
     "add-custom-html-before-body-end": "Adicionar HTML Customizado antes do fim do </body>",

i18n/sv.i18n.json

@@ -78,7 +78,7 @@
     "and-n-other-card": "Och __count__ annat kort",
     "and-n-other-card_plural": "Och __count__ andra kort",
     "apply": "Tillämpa",
-    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "app-is-offline": "Läser in, vänligen vänta. Uppdatering av sidan kommer att orsaka förlust av data. Om inläsningen inte fungerar, kontrollera att servern inte har stoppats.",
     "archive": "Flytta till Arkiv",
     "archive-all": "Flytta alla till Arkiv",
     "archive-board": "Flytta Anslagstavla till Arkiv",
@@ -86,11 +86,11 @@
     "archive-list": "Flytta Lista till Arkiv",
     "archive-swimlane": "Move Swimlane to Archive",
     "archive-selection": "Flytta markerade till Arkiv",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archiveBoardPopup-title": "Flytta Anslagstavla till Arkiv?",
     "archived-items": "Arkiv",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Anslagstavlor i Arkiv",
     "restore-board": "Återställ anslagstavla",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "Inga anslagstavlor i Arkiv.",
     "archives": "Arkiv",
     "assign-member": "Tilldela medlem",
     "attached": "bifogad",
@@ -123,7 +123,7 @@
     "card-comments-title": "Detta kort har %s kommentar.",
     "card-delete-notice": "Ta bort är permanent. Du kommer att förlora alla åtgärder i samband med detta kort.",
     "card-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsflöde och du kommer inte att kunna öppna kortet igen. Det går inte att ångra.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Du kan flytta ett kort för att Arkiv för att ta bort det från anslagstavlan och bevara aktiviteten.",
     "card-due": "Förfaller",
     "card-due-on": "Förfaller på",
     "card-spent": "Spenderad tid",
@@ -166,7 +166,7 @@
     "clipboard": "Urklipp eller dra och släpp",
     "close": "Stäng",
     "close-board": "Stäng anslagstavla",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Du kommer att kunna återställa anslagstavlan genom att klicka på knappen \"Arkiv\" från hemrubriken.",
     "color-black": "svart",
     "color-blue": "blå",
     "color-crimson": "crimson",
@@ -299,17 +299,17 @@
     "import-board": "importera anslagstavla",
     "import-board-c": "Importera anslagstavla",
     "import-board-title-trello": "Importera anslagstavla från Trello",
-    "import-board-title-wekan": "Import board from previous export",
+    "import-board-title-wekan": "Importera anslagstavla från tidigare export",
     "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Importerad anslagstavla raderar all befintlig data på anslagstavla och ersätter den med importerat anslagstavla.",
     "from-trello": "Från Trello",
     "from-wekan": "Från tidigare export",
     "import-board-instruction-trello": "I din Trello-anslagstavla, gå till 'Meny', sedan 'Mera', 'Skriv ut och exportera', 'Exportera JSON' och kopiera den resulterande text.",
-    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "På din anslagstavla, gå till \"Meny\", sedan \"Exportera anslagstavla\" och kopiera texten i den hämtade filen.",
     "import-board-instruction-about-errors": "Om du får fel vid import av anslagstavla, ibland importerar fortfarande fungerar, och styrelsen är på alla sidor för anslagstavlor.",
     "import-json-placeholder": "Klistra in giltigt JSON data här",
     "import-map-members": "Kartlägg medlemmar",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-members-map": "Din importerade anslagstavla har några medlemmar. Vänligen kartlägg medlemmarna du vill importera till dina användare",
     "import-show-user-mapping": "Granska medlemskartläggning",
     "import-user-select": "Pick your existing user you want to use as this member",
     "importMapMembersAddPopup-title": "Välj medlem",
@@ -332,10 +332,10 @@
     "leaveBoardPopup-title": "Lämna anslagstavla ?",
     "link-card": "Länka till detta kort",
     "list-archive-cards": "Flytta alla kort i den här listan till Arkiv",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards-pop": "Detta kommer att ta bort alla kort i denna lista från anslagstavlan. För att visa kort i Arkiv och få dem tillbaka till anslagstavlan, klicka på \"Meny\" > \"Arkiv\".",
     "list-move-cards": "Flytta alla kort i denna lista",
     "list-select-cards": "Välj alla kort i denna lista",
-    "set-color-list": "Set Color",
+    "set-color-list": "Ange färg",
     "listActionPopup-title": "Liståtgärder",
     "swimlaneActionPopup-title": "Simbana-åtgärder",
     "swimlaneAddPopup-title": "Add a Swimlane below",
@@ -343,7 +343,7 @@
     "listMorePopup-title": "Mera",
     "link-list": "Länk till den här listan",
     "list-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsmatningen och du kommer inte att kunna återställa listan. Det går inte att ångra.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Du kan flytta en lista till Arkiv för att ta bort den från anslagstavlan och bevara aktiviteten.",
     "lists": "Listor",
     "swimlanes": "Simbanor ",
     "log-out": "Logga ut",
@@ -568,7 +568,7 @@
     "r-removed-from": "Borttagen från",
     "r-the-board": "anslagstavlan",
     "r-list": "lista",
-    "set-filter": "Set Filter",
+    "set-filter": "Ställ in filter",
     "r-moved-to": "Flyttad till",
     "r-moved-from": "Flyttad från",
     "r-archived": "Flyttad till Arkiv",
@@ -576,13 +576,13 @@
     "r-a-card": "ett kort",
     "r-when-a-label-is": "När en etikett är",
     "r-when-the-label-is": "När etiketten är",
-    "r-list-name": "list name",
+    "r-list-name": "listnamn",
     "r-when-a-member": "När en medlem är",
     "r-when-the-member": "När medlemmen",
     "r-name": "namn",
-    "r-when-a-attach": "When an attachment",
-    "r-when-a-checklist": "When a checklist is",
-    "r-when-the-checklist": "When the checklist",
+    "r-when-a-attach": "När en bilaga",
+    "r-when-a-checklist": "När en checklista är",
+    "r-when-the-checklist": "När checklistan",
     "r-completed": "Avslutad",
     "r-made-incomplete": "Made incomplete",
     "r-when-a-item": "When a checklist item is",
@@ -660,6 +660,6 @@
     "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
     "error-undefined": "Något gick fel",
     "error-ldap-login": "Ett fel uppstod när du försökte logga in",
-    "display-authentication-method": "Display Authentication Method",
-    "default-authentication-method": "Default Authentication Method"
+    "display-authentication-method": "Visa autentiseringsmetod",
+    "default-authentication-method": "Standard autentiseringsmetod"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.21.0",
+  "version": "v2.23.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

releases/virtualbox/start-wekan.sh

@@ -114,6 +114,10 @@
         #export OAUTH2_FULLNAME_MAP=
         # OAuth2 Email Mapping
         #export OAUTH2_EMAIL_MAP=
+        # OAUTH2 ID Token Whitelist Fields.
+        #export OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+        # OAUTH2 Request Permissions.
+        #export OAUTH2_REQUEST_PERMISSIONS=[openid profile email]
         #---------------------------------------------
         # LDAP_ENABLE : Enable or not the connection by the LDAP
         # example :  export LDAP_ENABLE=true

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 223,
+    appVersion = 225,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.21.0~2019-02-12"),
+    appMarketingVersion = (defaultText = "2.23.0~2019-02-17"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

server/authentication.js

@@ -76,8 +76,8 @@ Meteor.startup(() => {
             authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
             userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
             tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
-            idTokenWhitelistFields: [],
-            requestPermissions: ['openid'],
+            idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
+            requestPermissions: process.OAUTH2_REQUEST_PERMISSIONS || ['openid'],
           },
         }
       );

snap-src/bin/config

@@ -3,7 +3,7 @@
 # All supported keys are defined here together with descriptions and default values
 
 # list of supported keys
-keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
 
 # default values
 DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
@@ -138,6 +138,14 @@ DESCRIPTION_OAUTH2_EMAIL_MAP="OAuth2 Email Mapping. Example: email"
 DEFAULT_OAUTH2_EMAIL_MAP=""
 KEY_OAUTH2_EMAIL_MAP="oauth2-email-map"
 
+DESCRIPTION_OAUTH2_ID_TOKEN_WHITELIST_FIELDS="OAuth2 ID Token Whitelist Fields. Example: []"
+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=""
+KEY_OAUTH2_REQUEST_PERMISSIONS="oauth2-request-permissions"
+
 DESCRIPTION_LDAP_ENABLE="Enable or not the connection by the LDAP"
 DEFAULT_LDAP_ENABLE="false"
 KEY_LDAP_ENABLE="ldap-enable"

snap-src/bin/wekan-help

@@ -102,29 +102,41 @@ echo -e "\t-Disable the OAuth2 Token Endpoint of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint=''"
 echo -e "\n"
 echo -e "OAuth2 ID Mapping."
-echo -e "To enable the ID Mapping of Wekan:"
+echo -e "To enable the OAuth2 ID Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-id-map='username.uid'"
-echo -e "\t-Disable the ID Mapping of Wekan:"
+echo -e "\t-Disable the OAuth2 ID Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-id-map=''"
 echo -e "\n"
 echo -e "OAuth2 Username Mapping."
-echo -e "To enable the Username Mapping of Wekan:"
+echo -e "To enable the OAuth2 Username Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-username-map='username'"
-echo -e "\t-Disable the Username Mapping of Wekan:"
+echo -e "\t-Disable the OAuth2 Username Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-username-map=''"
 echo -e "\n"
 echo -e "OAuth2 Fullname Mapping."
-echo -e "To enable the Fullname Mapping of Wekan:"
+echo -e "To enable the OAuth2 Fullname Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map='fullname'"
-echo -e "\t-Disable the Fullname Mapping of Wekan:"
+echo -e "\t-Disable the OAuth2 Fullname Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map=''"
 echo -e "\n"
 echo -e "OAuth2 Email Mapping."
-echo -e "To enable the Email Mapping of Wekan:"
+echo -e "To enable the OAuth2 Email Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-email-map='email'"
-echo -e "\t-Disable the Email Mapping of Wekan:"
+echo -e "\t-Disable the OAuth2 Email Mapping of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME oauth2-email-map=''"
 echo -e "\n"
+echo -e "OAuth2 ID Token Whitelist Fields."
+echo -e "To enable the OAuth2 ID Token Whitelist Fields of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-token-whitelist-fields='[]'"
+echo -e "\t-Disable the OAuth2 ID Token Whitelist Fields of Wekan:"
+echo -e "\t$ snap set $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-Disable the OAuth2 Request Permissions of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-request-permissions=''"
+echo -e "\n"
 echo -e "Ldap Enable."
 echo -e "To enable the ldap of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME ldap-enable='true'"

start-wekan.bat

@@ -74,6 +74,11 @@ REM # OAuth2 Token Endpoint. Example: /oauth/token
 REM # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
 REM SET OAUTH2_TOKEN_ENDPOINT=
 
+REM # OAUTH2 ID Token Whitelist Fields.
+REM SET OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+REM # OAUTH2 Request Permissions.
+REM SET OAUTH2_REQUEST_PERMISSIONS=[openid email profile]
+
 REM ------------------------------------------------------------
 
 REM # LDAP_ENABLE : Enable or not the connection by the LDAP

start-wekan.sh

@@ -72,7 +72,7 @@ function wekan_repo_check(){
       # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
       export WEBHOOKS_ATTRIBUTES=''
       #---------------------------------------------
-            # ==== OAUTH2 AZURE ====
+      # ==== OAUTH2 AZURE ====
       # https://github.com/wekan/wekan/wiki/Azure
       # 1) Register the application with Azure. Make sure you capture
       #    the application ID as well as generate a secret key.
@@ -93,8 +93,12 @@ function wekan_repo_check(){
       #export OAUTH2_USERNAME_MAP=email
       # The claim name you want to map to the full name field:
       #export OAUTH2_FULLNAME_MAP=name
-      # Tthe claim name you want to map to the email field:
+      # The claim name you want to map to the email field:
       #export OAUTH2_EMAIL_MAP=email
+      # OAUTH2 ID Token Whitelist Fields.
+      #export OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+      # OAUTH2 Request Permissions.
+      #export OAUTH2_REQUEST_PERMISSIONS=[openid profile email]
       #-----------------------------------------------------------------
       # ==== OAUTH2 KEYCLOAK ====
       # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED