v4.44

this fix also hides the move to another board functionality in the
submenu (only from the worker) so that the worker is still constrained
to a single board.

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=v12.18.4 \
+    NODE_VERSION=v14.15.0 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

.future-snap/broken-snapcraft.yaml

@@ -81,7 +81,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.18.4
+        node-engine: 14.15.0
         node-packages:
             - node-gyp
             - node-pre-gyp

.future-snap/snapcraft.yaml

@@ -83,7 +83,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.18.4
+        node-engine: 14.15.0
         node-packages:
             - node-gyp
             - node-pre-gyp

.meteor/packages

@@ -6,8 +6,8 @@
 meteor-base@1.4.0
 
 # Build system
-ecmascript@0.14.3
-standard-minifier-css@1.6.0
+ecmascript@0.15.0-beta200.3
+standard-minifier-css@1.7.0-beta200.3
 standard-minifier-js@2.6.0
 mquandalle:jade
 coffeescript@2.4.1!
@@ -72,8 +72,7 @@ simple:rest-accounts-password
 useraccounts:core
 email@2.0.0
 horka:swipebox
-dynamic-import@0.5.2
-staringatlights:fast-render
+dynamic-import@0.6.0-beta200.3
 
 accounts-password@1.6.2
 cfs:gridfs
@@ -95,7 +94,6 @@ konecty:mongo-counter
 percolate:synced-cron
 easylogic:summernote
 cfs:filesystem
-ostrio:cookies
 tmeasday:check-npm-versions
 steffo:meteor-accounts-saml
 rajit:bootstrap3-datepicker-fi
@@ -146,3 +144,4 @@ rajit:bootstrap3-datepicker-uk
 rajit:bootstrap3-datepicker-vi
 rajit:bootstrap3-datepicker-zh-cn
 rajit:bootstrap3-datepicker-zh-tw
+hot-module-replacement

.meteor/release

@@ -1 +1 @@
-METEOR@1.11
+METEOR@2.0-beta.3

.meteor/versions

@@ -10,8 +10,8 @@ aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
-autoupdate@1.6.0
-babel-compiler@7.5.3
+autoupdate@1.7.0-beta200.3
+babel-compiler@7.6.0-beta200.3
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
@@ -42,7 +42,6 @@ cfs:tempstore@0.1.6
 cfs:upload-http@0.0.20
 cfs:worker@0.1.5
 check@1.3.1
-chuangbo:cookie@1.1.0
 coagmano:stylus@1.1.0
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
@@ -55,9 +54,9 @@ ddp-rate-limiter@1.0.9
 ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
-dynamic-import@0.5.2
+dynamic-import@0.6.0-beta200.3
 easylogic:summernote@0.8.8
-ecmascript@0.14.3
+ecmascript@0.15.0-beta200.3
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -70,6 +69,7 @@ fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
+hot-module-replacement@0.2.0-beta200.3
 html-tools@1.0.11
 htmljs@1.0.11
 http@1.4.2
@@ -107,9 +107,10 @@ minifiers@1.1.8-faster-rebuild.0
 minimongo@1.6.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
-modules@0.15.0
+modules@0.16.0-beta200.3
 modules-runtime@0.12.0
-momentjs:moment@2.28.0
+modules-runtime-hot@0.13.0-beta200.3
+momentjs:moment@2.29.1
 mongo@1.10.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
@@ -127,12 +128,11 @@ mquandalle:mousetrap-bindglobal@0.0.1
 msavin:usercache@1.8.0
 npm-bcrypt@0.9.3
 npm-mongo@3.8.1
-oauth@1.3.0
+oauth@1.3.2
 oauth2@1.3.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.1.0
-ostrio:cookies@2.6.0
 peerlibrary:assert@0.3.0
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
@@ -199,7 +199,6 @@ reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
 rzymek:fullcalendar@3.8.0
-server-render@0.3.1
 service-configuration@1.0.11
 session@1.2.0
 sha@1.0.9
@@ -214,10 +213,8 @@ softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.1.0
-standard-minifier-css@1.6.1
+standard-minifier-css@1.7.0-beta200.3
 standard-minifier-js@2.6.0
-staringatlights:fast-render@3.3.0
-staringatlights:inject-data@2.3.0
 steffo:meteor-accounts-saml@0.0.18
 tap:i18n@1.8.2
 templates:tabs@2.3.0
@@ -235,8 +232,8 @@ useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.9.1
-webapp-hashing@1.0.9
+webapp@1.10.0-beta200.3
+webapp-hashing@1.1.0-beta200.3
 wekan-accounts-cas@0.1.0
 wekan-accounts-oidc@1.0.10
 wekan-ldap@0.0.2

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 
 env:
   TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.18.4
+  TRAVIS_NODE_VERSION: 14.15.0
   TRAVIS_NPM_VERSION: latest
 
 before_install:

CHANGELOG.md

@@ -1,3 +1,104 @@
+# v4.44 2020-10-28 Wekan release
+
+This release adds the following new features:
+
+- For development, [add Meteor 2.0 Hot Module Replacement](https://github.com/wekan/wekan/commit/e6162472548d9dff497dd76e82d23044f779f757).
+  More info at https://forums.meteor.com/t/meteor-2-0-beta-with-hot-module-replacement-hmr/54313/8 .
+  Thanks to zodern.
+
+and adds the following updates:
+
+- [Upgrade to Node.js 14.15.0](https://github.com/wekan/wekan/commit/045e9db7b8f0de852ef4486cb1ad200d6ca7296d).
+  Thanks to Node.js and Meteor.js developers.
+- [Upgrade to Meteor 2.0-beta.3. Removed fast-render and ostrio:cookies](https://github.com/wekan/wekan/commit/a463f2a855498935db5b66e5fad446ce465adab1).
+  Thanks to Meteor.js developers and xet7.
+
+and fixes the following bugs:
+
+- [Fixed: With ORACLE_OIM_ENABLED, allow setting OAUTH2_REQUEST_PERMISSIONS with environment variable](https://github.com/wekan/wekan/commit/1b429b3f99c32840ebb0ff9a29015aa8c28ec644).
+  Thanks to xet7.
+- [Changed public board changing Swimlanes/Lists/Calendar view and changing Hide minicard label text
+  from using cookies to using browser localStorage](https://github.com/wekan/wekan/commit/460b1d3a664b648bc03c40422b9d175401e229c1),
+  to remove some errors from browser inspect console.
+  Thanks to xet7.
+- [Fix Modern theme board canvas background](https://github.com/wekan/wekan/pull/3312).
+  Thanks to helioguardabaxo.
+- [Fix: 1) Expose moving cards on mobile to workers. 2) Hide the move to another board functionality
+  in the submenu (only from the worker) so that the worker is still constrained to a single
+  board](https://github.com/wekan/wekan/pull/3315).
+  Thanks to jtbairdsr.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.43 2020-10-20 Wekan release
+
+This release adds the following new features:
+
+- [Allow more than one assignee](https://github.com/wekan/wekan/commit/acf9e7caeaf59e1030ae1014c0cb2fb7dae27147).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fixed CSV/TSV export](https://github.com/wekan/wekan/commit/d7333dec84328ca191f430d96aaf9e550840631a).
+  Please test and report any problems [at issue #3173](https://github.com/wekan/wekan/issues/3173).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.42 2020-10-14 Wekan release
+
+This release adds the following updates:
+
+- [Upgrade to Node.js 12.19.0](https://github.com/wekan/wekan/commit/b8a209249e968b90917af319adf24fedf2157396).
+  Thanks to Node.js developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.41 2020-10-03 Wekan release
+
+This release adds the following new features:
+
+- [Login with OIDC OAuth2 Oracle on premise identity manager OIM, with setting ORACLE_OIM_ENABLED=true](https://github.com/wekan/wekan/commit/ec8a78537f1dc40e967de36a02ea09cf7398318a).
+  More info [at wiki](https://github.com/wekan/wekan/wiki/Oracle-OIM).
+  Thanks to xet7.
+- [At Admin Panel / Layout: Text below Custom Login Logo. Can have markdown formatting](https://github.com/wekan/wekan/commit/7223d6e75057d1412862a97b8a43c34ec23b16e9).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Update dependencies](https://github.com/wekan/wekan/commit/b796a6cbf4911c14ff036a51db0252e08d3a5ef8).
+  Thanks to developers of dependencies.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.40 2020-09-18 Wekan release
+
+This release adds the following new features:
+
+- Custom Logo for Login and Top Left Corner. Optional link when clicking logo.
+  Settings at Admin Panel / Layout.
+  [Part 1](https://github.com/wekan/wekan/commit/a7c3317ed696fad8e211b22afbb3012f3a4f2ddb),
+  [Part 2](https://github.com/wekan/wekan/commit/05e3fc31b4633978a6b002a0325aad8e74d57ec4),
+  [Part 3](https://github.com/wekan/wekan/commit/3fc80e1145b23f8e6c7492ef4e3313b02f3d8772).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Upgrade to Meteor v1.11.1](https://github.com/wekan/wekan/commit/185cf163b23280af5a7910381209984e2362a452).
+  Thanks to Meteor developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.39 2020-09-17 Wekan release
+
+This release adds the following new features:
+
+- [Impersonate one user](https://github.com/wekan/wekan/pull/3280) and
+  [related translatable strings](https://github.com/wekan/wekan/commit/81ac0fdba9b52477dbbe7b6ed01b6d299288bcca).
+  Thanks to Akuket and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.38 2020-09-16 Wekan release
 
 This release fixes the following CRITICAL VULNERABILITIES:

Dockerfile

@@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
     DEBUG=false \
-    NODE_VERSION=v12.18.4 \
+    NODE_VERSION=v14.15.0 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
@@ -130,7 +130,8 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     SAML_PUBLIC_CERTFILE="" \
     SAML_IDENTIFIER_FORMAT="" \
     SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \
-    SAML_ATTRIBUTES=""
+    SAML_ATTRIBUTES="" \
+    ORACLE_OIM_ENABLED=false
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app

Dockerfile.arm64v8

@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
     QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.18.4 \
+    NODE_VERSION=v14.15.0 \
     WEKAN_VERSION=3.96  \
     WEKAN_ARCHITECTURE=arm64
 
@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.18.4 \
+    NODE_VERSION=v14.15.0 \
     NODE_ENV=production \
     NPM_VERSION=latest \
     WITH_API=true \

Stackerfile.yml

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

client/components/boards/boardBody.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const subManager = new SubsManager();
 const { calculateIndex } = Utils;
 const swimlaneWhileSortingHeight = 150;
@@ -197,7 +195,7 @@ BlazeComponent.extendComponent({
       if (currentUser) {
         showDesktopDragHandles = (currentUser.profile || {})
           .showDesktopDragHandles;
-      } else if (cookies.has('showDesktopDragHandles')) {
+      } else if (window.localStorage.getItem('showDesktopDragHandles')) {
         showDesktopDragHandles = true;
       } else {
         showDesktopDragHandles = false;
@@ -237,7 +235,9 @@ BlazeComponent.extendComponent({
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
     } else {
-      return cookies.get('boardView') === 'board-view-swimlanes';
+      return (
+        window.localStorage.getItem('boardView') === 'board-view-swimlanes'
+      );
     }
   },
 
@@ -246,7 +246,7 @@ BlazeComponent.extendComponent({
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-lists';
     } else {
-      return cookies.get('boardView') === 'board-view-lists';
+      return window.localStorage.getItem('boardView') === 'board-view-lists';
     }
   },
 
@@ -255,7 +255,7 @@ BlazeComponent.extendComponent({
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-cal';
     } else {
-      return cookies.get('boardView') === 'board-view-cal';
+      return window.localStorage.getItem('boardView') === 'board-view-cal';
     }
   },
 
@@ -417,7 +417,7 @@ BlazeComponent.extendComponent({
     if (currentUser) {
       return (currentUser.profile || {}).boardView === 'board-view-cal';
     } else {
-      return cookies.get('boardView') === 'board-view-cal';
+      return window.localStorage.getItem('boardView') === 'board-view-cal';
     }
   },
 }).register('calendarView');

client/components/boards/boardColors.styl

@@ -602,9 +602,12 @@ setBoardClear(color1,color2)
     height: 21px
     background: #f7f7f7
 
+  .board-canvas
+    background: #f5f5f5
+
   /* Swimlane */
   .swimlane
-    background: #f5f5f5
+    background: none
 
   .swimlane .swimlane-header-wrap .swimlane-header
     font-family: Poppins

client/components/cards/cardDetails.jade

@@ -381,17 +381,18 @@ template(name="cardDetailsActionsPopup")
         a.js-move-card-to-bottom
           i.fa.fa-arrow-down
           | {{_ 'moveCardToBottom-title'}}
-    unless currentUser.isWorker
       hr
-      ul.pop-over-list
-        li
-          a.js-move-card
-            i.fa.fa-arrow-right
-            | {{_ 'moveCardPopup-title'}}
+    ul.pop-over-list
+      li
+        a.js-move-card
+          i.fa.fa-arrow-right
+          | {{_ 'moveCardPopup-title'}}
+      unless currentUser.isWorker
         li
           a.js-copy-card
             i.fa.fa-copy
             | {{_ 'copyCardPopup-title'}}
+    unless currentUser.isWorker
       hr
       ul.pop-over-list
         li
@@ -430,13 +431,14 @@ template(name="copyChecklistToManyCardsPopup")
   +boardsAndLists
 
 template(name="boardsAndLists")
-  label {{_ 'boards'}}:
-  select.js-select-boards(autofocus)
-    each boards
-      if $eq _id currentBoard._id
-        option(value="{{_id}}" selected) {{_ 'current'}}
-      else
-        option(value="{{_id}}") {{title}}
+  unless currentUser.isWorker
+    label {{_ 'boards'}}:
+    select.js-select-boards(autofocus)
+      each boards
+        if $eq _id currentBoard._id
+          option(value="{{_id}}" selected) {{_ 'current'}}
+        else
+          option(value="{{_id}}") {{title}}
 
   label {{_ 'swimlanes'}}:
   select.js-select-swimlanes

client/components/cards/minicard.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
 // });
@@ -34,10 +32,10 @@ BlazeComponent.extendComponent({
       },
       {
         'click .js-toggle-minicard-label-text'() {
-          if (cookies.has('hiddenMinicardLabelText')) {
-            cookies.remove('hiddenMinicardLabelText'); //true
+          if (window.localStorage.getItem('hiddenMinicardLabelText')) {
+            window.localStorage.removeItem('hiddenMinicardLabelText'); //true
           } else {
-            cookies.set('hiddenMinicardLabelText', 'true'); //true
+            window.localStorage.setItem('hiddenMinicardLabelText', 'true'); //true
           }
         },
       },
@@ -50,7 +48,7 @@ Template.minicard.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;
@@ -60,7 +58,7 @@ Template.minicard.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).hiddenMinicardLabelText;
-    } else if (cookies.has('hiddenMinicardLabelText')) {
+    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
       return true;
     } else {
       return false;

client/components/lists/list.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndex } = Utils;
 
 BlazeComponent.extendComponent({
@@ -124,7 +122,7 @@ BlazeComponent.extendComponent({
       if (currentUser) {
         showDesktopDragHandles = (currentUser.profile || {})
           .showDesktopDragHandles;
-      } else if (cookies.has('showDesktopDragHandles')) {
+      } else if (window.localStorage.getItem('showDesktopDragHandles')) {
         showDesktopDragHandles = true;
       } else {
         showDesktopDragHandles = false;
@@ -185,7 +183,7 @@ Template.list.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;

client/components/lists/listHeader.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 let listsColors;
 Meteor.startup(() => {
   listsColors = Lists.simpleSchema()._schema.color.allowedValues;
@@ -110,7 +108,7 @@ Template.listHeader.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;

client/components/main/header.jade

@@ -19,6 +19,19 @@ template(name="header")
                   = title
         #header-new-board-icon
       else
+        //-
+          On sandstorm, the logo shouldn't be clickable, because we only have one
+          page/document on it, and we don't want to see the home page containing
+          the list of all boards.
+        unless currentSetting.hideLogo
+          if currentSetting.customTopLeftCornerLogoImageUrl
+            if currentSetting.customTopLeftCornerLogoLinkUrl
+              a(href="{{currentSetting.customTopLeftCornerLogoLinkUrl}}")
+                img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="27" width="auto" margin="0" padding="0")
+            unless currentSetting.customTopLeftCornerLogoLinkUrl
+              img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="27" width="auto" margin="0" padding="0")
+          unless currentSetting.customTopLeftCornerLogoImageUrl
+            img(src="{{pathFor '/logo-header.png'}}" alt="")
         ul
           li
             a(href="{{pathFor 'home'}}")
@@ -52,17 +65,6 @@ template(name="header")
     #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
       +Template.dynamic(template=headerBar)
 
-      //unless hideLogo
-
-        //-
-          On sandstorm, the logo shouldn't be clickable, because we only have one
-          page/document on it, and we don't want to see the home page containing
-          the list of all boards.
-
-      //  unless currentSetting.hideLogo
-      //    a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-      //    img(src="{{pathFor '/logo-header.png'}}" alt="")
-
   if appIsOffline
     +offlineWarning
 

client/components/main/layouts.jade

@@ -19,6 +19,27 @@ head
 
 template(name="userFormsLayout")
   section.auth-layout
+    if currentSetting.hideLogo
+      h1.at-form-landing-logo
+        br
+        br
+    unless currentSetting.hideLogo
+      h1.at-form-landing-logo
+      if currentSetting.customLoginLogoImageUrl
+        if currentSetting.customLoginLogoLinkUrl
+          a(href="{{currentSetting.customLoginLogoLinkUrl}}")
+            img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
+          br
+        unless currentSetting.customLoginLogoLinkUrl
+          img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
+          br
+      unless currentSetting.customLoginLogoImageUrl
+        img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+        br
+      if currentSetting.textBelowCustomLoginLogo
+        +viewer
+          | {{currentSetting.textBelowCustomLoginLogo}}
+        br
     section.auth-dialog
       if isLoading
         +loader

client/components/main/layouts.styl

@@ -447,7 +447,6 @@ a
   flex-direction: column
   align-items: center
   justify-content: center
-  height: 100%
 
   .auth-dialog
     margin: 0 !important

client/components/settings/peopleBody.jade

@@ -104,6 +104,8 @@ template(name="peopleRow")
       a.edit-user
         i.fa.fa-edit
         | {{_ 'edit'}}
+      a.more-settings-user
+        i.fa.fa-ellipsis-h
 
 template(name="editUserPopup")
   form
@@ -200,3 +202,10 @@ template(name="newUserPopup")
       input.js-profile-password(type="password")
     div.buttonsContainer
       input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="settingsUserPopup")
+  ul.pop-over-list
+    li
+      a.impersonate-user
+        i.fa.fa-user
+        | {{_ 'impersonate-user'}}

client/components/settings/peopleBody.js

@@ -194,6 +194,7 @@ BlazeComponent.extendComponent({
     return [
       {
         'click a.edit-user': Popup.open('editUser'),
+        'click a.more-settings-user': Popup.open('settingsUser'),
       },
     ];
   },
@@ -343,3 +344,16 @@ Template.newUserPopup.events({
     Popup.close();
   },
 });
+
+Template.settingsUserPopup.events({
+  'click .impersonate-user'(event) {
+    event.preventDefault();
+
+    Meteor.call('impersonate', this.userId, err => {
+      if (!err) {
+        FlowRouter.go('/');
+        Meteor.connection.setUserId(this.userId);
+      }
+    });
+  },
+});

client/components/settings/peopleBody.styl

@@ -46,3 +46,6 @@ table
 
   div
     margin: auto
+
+.more-settings-user
+  margin-left: 10px;

client/components/settings/settingBody.jade

@@ -163,13 +163,6 @@ template(name='announcementSettings')
 
 template(name='layoutSettings')
   ul#layout-setting.setting-detail
-    //li.layout-form
-      .title {{_ 'hide-logo'}}
-      .form-group.flex
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
-        span {{_ 'yes'}}
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
-        span {{_ 'no'}}
     li.layout-form
       .title {{_ 'display-authentication-method'}}
       .form-group.flex
@@ -184,10 +177,36 @@ template(name='layoutSettings')
       .title {{_ 'custom-product-name'}}
       .form-group
         input.wekan-form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
+    li.layout-form
+      .title {{_ 'hide-logo'}}
+      .form-group.flex
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'custom-login-logo-image-url'}}
+      .form-group
+        input.wekan-form-control#custom-login-logo-image-url(type="text", placeholder="" value="{{currentSetting.customLoginLogoImageUrl}}")
+    li.layout-form
+      .title {{_ 'custom-login-logo-link-url'}}
+      .form-group
+        input.wekan-form-control#custom-login-logo-link-url(type="text", placeholder="" value="{{currentSetting.customLoginLogoLinkUrl}}")
+    li.layout-form
+      .title {{_ 'text-below-custom-login-logo'}}
+      .form-group
+        textarea#text-below-custom-login-logo.wekan-form-control= currentSetting.textBelowCustomLoginLogo
+    li.layout-form
+      .title {{_ 'custom-top-left-corner-logo-image-url'}}
+      .form-group
+        input.wekan-form-control#custom-top-left-corner-logo-image-url(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoImageUrl}}")
+    li.layout-form
+      .title {{_ 'custom-top-left-corner-logo-link-url'}}
+      .form-group
+        input.wekan-form-control#custom-top-left-corner-logo-link-url(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoLinkUrl}}")
     li
       button.js-save-layout.primary {{_ 'save'}}
 
-
 template(name='selectAuthenticationMethod')
   select#defaultAuthenticationMethod
     each authentications

client/components/settings/settingBody.js

@@ -167,6 +167,25 @@ BlazeComponent.extendComponent({
     const productName = $('#product-name')
       .val()
       .trim();
+    const customLoginLogoImageUrl = $('#custom-login-logo-image-url')
+      .val()
+      .trim();
+    const customLoginLogoLinkUrl = $('#custom-login-logo-link-url')
+      .val()
+      .trim();
+    const textBelowCustomLoginLogo = $('#text-below-custom-login-logo')
+      .val()
+      .trim();
+    const customTopLeftCornerLogoImageUrl = $(
+      '#custom-top-left-corner-logo-image-url',
+    )
+      .val()
+      .trim();
+    const customTopLeftCornerLogoLinkUrl = $(
+      '#custom-top-left-corner-logo-link-url',
+    )
+      .val()
+      .trim();
     const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
     const displayAuthenticationMethod =
       $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
@@ -177,6 +196,11 @@ BlazeComponent.extendComponent({
         $set: {
           productName,
           hideLogo: hideLogoChange,
+          customLoginLogoImageUrl,
+          customLoginLogoLinkUrl,
+          textBelowCustomLoginLogo,
+          customTopLeftCornerLogoImageUrl,
+          customTopLeftCornerLogoLinkUrl,
           displayAuthenticationMethod,
           defaultAuthenticationMethod,
         },

client/components/sidebar/sidebar.jade

@@ -366,14 +366,14 @@ template(name="exportBoard")
       a.download-json-link(href="{{exportUrl}}", download="{{exportJsonFilename}}")
         i.fa.fa-share-alt
         | {{_ 'export-board-json'}}
-    //li
-    //  a(href="{{exportCsvUrl}}", download="{{exportCsvFilename}}")
-    //    i.fa.fa-share-alt
-    //    | {{_ 'export-board-csv'}}
-    //li
-    //  a(href="{{exportTsvUrl}}", download="{{exportTsvFilename}}")
-    //    i.fa.fa-share-alt
-    //    | {{_ 'export-board-tsv'}}
+    li
+      a(href="{{exportCsvUrl}}", download="{{exportCsvFilename}}")
+        i.fa.fa-share-alt
+        | {{_ 'export-board-csv'}}
+    li
+      a(href="{{exportTsvUrl}}", download="{{exportTsvFilename}}")
+        i.fa.fa-share-alt
+        | {{_ 'export-board-tsv'}}
     li
       a.html-export-board
         i.fa.fa-archive

client/components/sidebar/sidebar.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 Sidebar = null;
 
 const defaultView = 'home';
@@ -112,10 +110,12 @@ BlazeComponent.extendComponent({
           currentUser = Meteor.user();
           if (currentUser) {
             Meteor.call('toggleMinicardLabelText');
-          } else if (cookies.has('hiddenMinicardLabelText')) {
-            cookies.remove('hiddenMinicardLabelText');
+          } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
+            window.localStorage.removeItem('hiddenMinicardLabelText');
+            location.reload();
           } else {
-            cookies.set('hiddenMinicardLabelText', 'true');
+            window.localStorage.setItem('hiddenMinicardLabelText', 'true');
+            location.reload();
           }
         },
         'click .js-shortcuts'() {
@@ -133,7 +133,7 @@ Template.homeSidebar.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).hiddenMinicardLabelText;
-    } else if (cookies.has('hiddenMinicardLabelText')) {
+    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
       return true;
     } else {
       return false;

client/components/swimlanes/swimlaneHeader.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndexData } = Utils;
 
 let swimlaneColors;
@@ -35,7 +33,7 @@ Template.swimlaneHeader.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;

client/components/swimlanes/swimlanes.js

@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndex } = Utils;
 
 function currentListIsInThisSwimlane(swimlaneId) {
@@ -102,7 +100,7 @@ function initSortable(boardComponent, $listsDom) {
     if (currentUser) {
       showDesktopDragHandles = (currentUser.profile || {})
         .showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       showDesktopDragHandles = true;
     } else {
       showDesktopDragHandles = false;
@@ -178,7 +176,7 @@ BlazeComponent.extendComponent({
           if (currentUser) {
             showDesktopDragHandles = (currentUser.profile || {})
               .showDesktopDragHandles;
-          } else if (cookies.has('showDesktopDragHandles')) {
+          } else if (window.localStorage.getItem('showDesktopDragHandles')) {
             showDesktopDragHandles = true;
           } else {
             showDesktopDragHandles = false;
@@ -269,7 +267,7 @@ Template.swimlane.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;

client/components/users/userHeader.js

@@ -1,6 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
-
 Template.headerUserBar.events({
   'click .js-open-header-member-menu': Popup.open('memberMenu'),
   'click .js-change-avatar': Popup.open('changeAvatar'),
@@ -200,7 +197,7 @@ Template.changeSettingsPopup.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
       return true;
     } else {
       return false;
@@ -210,7 +207,7 @@ Template.changeSettingsPopup.helpers({
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).hasHiddenSystemMessages;
-    } else if (cookies.has('hasHiddenSystemMessages')) {
+    } else if (window.localStorage.getItem('hasHiddenSystemMessages')) {
       return true;
     } else {
       return false;
@@ -221,7 +218,7 @@ Template.changeSettingsPopup.helpers({
     if (currentUser) {
       return Meteor.user().getLimitToShowCardsCount();
     } else {
-      return cookies.get('limitToShowCardsCount');
+      return window.localStorage.getItem('limitToShowCardsCount');
     }
   },
   weekDays(startDay) {
@@ -242,7 +239,7 @@ Template.changeSettingsPopup.helpers({
     if (currentUser) {
       return currentUser.getStartDayOfWeek();
     } else {
-      return cookies.get('startDayOfWeek');
+      return window.localStorage.getItem('startDayOfWeek');
     }
   },
 });
@@ -252,20 +249,20 @@ Template.changeSettingsPopup.events({
     currentUser = Meteor.user();
     if (currentUser) {
       Meteor.call('toggleDesktopDragHandles');
-    } else if (cookies.has('showDesktopDragHandles')) {
-      cookies.remove('showDesktopDragHandles');
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
+      window.localStorage.removeItem('showDesktopDragHandles');
     } else {
-      cookies.set('showDesktopDragHandles', 'true');
+      window.localStorage.setItem('showDesktopDragHandles', 'true');
     }
   },
   'click .js-toggle-system-messages'() {
     currentUser = Meteor.user();
     if (currentUser) {
       Meteor.call('toggleSystemMessages');
-    } else if (cookies.has('hasHiddenSystemMessages')) {
-      cookies.remove('hasHiddenSystemMessages');
+    } else if (window.localStorage.getItem('hasHiddenSystemMessages')) {
+      window.localStorage.removeItem('hasHiddenSystemMessages');
     } else {
-      cookies.set('hasHiddenSystemMessages', 'true');
+      window.localStorage.setItem('hasHiddenSystemMessages', 'true');
     }
   },
   'click .js-apply-user-settings'(event, templateInstance) {
@@ -283,14 +280,14 @@ Template.changeSettingsPopup.events({
       if (currentUser) {
         Meteor.call('changeLimitToShowCardsCount', minLimit);
       } else {
-        cookies.set('limitToShowCardsCount', minLimit);
+        window.localStorage.setItem('limitToShowCardsCount', minLimit);
       }
     }
     if (!isNaN(startDay)) {
       if (currentUser) {
         Meteor.call('changeStartDayOfWeek', startDay);
       } else {
-        cookies.set('startDayOfWeek', startDay);
+        window.localStorage.setItem('startDayOfWeek', startDay);
       }
     }
     Popup.back();

client/lib/utils.js

@@ -1,43 +1,44 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
-
 Utils = {
   setBoardView(view) {
     currentUser = Meteor.user();
     if (currentUser) {
       Meteor.user().setBoardView(view);
     } else if (view === 'board-view-swimlanes') {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
       location.reload();
     } else if (view === 'board-view-lists') {
-      cookies.set('boardView', 'board-view-lists'); //true
+      window.localStorage.setItem('boardView', 'board-view-lists'); //true
       location.reload();
     } else if (view === 'board-view-cal') {
-      cookies.set('boardView', 'board-view-cal'); //true
+      window.localStorage.setItem('boardView', 'board-view-cal'); //true
       location.reload();
     } else {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
       location.reload();
     }
   },
 
   unsetBoardView() {
-    cookies.remove('boardView');
-    cookies.remove('collapseSwimlane');
+    window.localStorage.removeItem('boardView');
+    window.localStorage.removeItem('collapseSwimlane');
   },
 
   boardView() {
     currentUser = Meteor.user();
     if (currentUser) {
       return (currentUser.profile || {}).boardView;
-    } else if (cookies.get('boardView') === 'board-view-swimlanes') {
+    } else if (
+      window.localStorage.getItem('boardView') === 'board-view-swimlanes'
+    ) {
       return 'board-view-swimlanes';
-    } else if (cookies.get('boardView') === 'board-view-lists') {
+    } else if (
+      window.localStorage.getItem('boardView') === 'board-view-lists'
+    ) {
       return 'board-view-lists';
-    } else if (cookies.get('boardView') === 'board-view-cal') {
+    } else if (window.localStorage.getItem('boardView') === 'board-view-cal') {
       return 'board-view-cal';
     } else {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
       location.reload();
       return 'board-view-swimlanes';
     }

docker-compose.yml

@@ -323,6 +323,9 @@ services:
       # ==== Debug OIDC OAuth2 etc ====
       #- DEBUG=true
       #-----------------------------------------------------------------
+      # ==== OAUTH2 ORACLE on premise identity manager OIM ====
+      #- ORACLE_OIM_ENABLED=true
+      #-----------------------------------------------------------------
       # ==== OAUTH2 AZURE ====
       # https://github.com/wekan/wekan/wiki/Azure
       # 1) Register the application with Azure. Make sure you capture

i18n/en.i18n.json

@@ -359,6 +359,7 @@
   "headerBarCreateBoardPopup-title": "Create Board",
   "home": "Home",
   "import": "Import",
+  "impersonate-user": "Impersonate user",
   "link": "Link",
   "import-board": "import board",
   "import-board-c": "Import board",
@@ -403,6 +404,7 @@
   "list-select-cards": "Select all cards in this list",
   "set-color-list": "Set Color",
   "listActionPopup-title": "List Actions",
+  "settingsUserPopup-title": "User Settings",
   "swimlaneActionPopup-title": "Swimlane Actions",
   "swimlaneAddPopup-title": "Add a Swimlane below",
   "listImportCardPopup-title": "Import a Trello card",
@@ -512,6 +514,11 @@
   "upload": "Upload",
   "upload-avatar": "Upload an avatar",
   "uploaded-avatar": "Uploaded an avatar",
+  "custom-top-left-corner-logo-image-url": "Custom Top Left Corner Logo Image URL",
+  "custom-top-left-corner-logo-link-url": "Custom Top Left Corner Logo Link URL",
+  "custom-login-logo-image-url": "Custom Login Logo Image URL",
+  "custom-login-logo-link-url": "Custom Login Logo Link URL",
+  "text-below-custom-login-logo": "Text below Custom Login Logo",
   "username": "Username",
   "view-it": "View it",
   "warn-list-archived": "warning: this card is in an list at Archive",

models/cards.js

@@ -1412,15 +1412,24 @@ Cards.mutations({
 
   assignAssignee(assigneeId) {
     // If there is not any assignee, allow one assignee, not more.
+    /*
     if (this.getAssignees().length === 0) {
       return {
         $addToSet: {
           assignees: assigneeId,
         },
       };
-    } else {
-      return false;
-    }
+    */
+    // Allow more that one assignee:
+    // https://github.com/wekan/wekan/issues/3302
+    return {
+      $addToSet: {
+        assignees: assigneeId,
+      },
+    };
+    //} else {
+    //  return false,
+    //}
   },
 
   unassignMember(memberId) {

models/exporter.js

@@ -1,4 +1,4 @@
-//const stringify = require('csv-stringify');
+const Papa = require('papaparse');
 
 // exporter maybe is broken since Gridfs introduced, add fs and path
 export class Exporter {
@@ -192,6 +192,40 @@ export class Exporter {
     const result = this.build();
     const columnHeaders = [];
     const cardRows = [];
+
+    const papaconfig = {
+      delimiter, // get parameter (was: auto-detect)
+      worker: true,
+    };
+
+    /*
+      newline: "",	// auto-detect
+      quoteChar: '"',
+      escapeChar: '"',
+      header: true,
+      transformHeader: undefined,
+      dynamicTyping: false,
+      preview: 0,
+      encoding: "",
+      comments: false,
+      step: undefined,
+      complete: undefined,
+      error: undefined,
+      download: false,
+      downloadRequestHeaders: undefined,
+      downloadRequestBody: undefined,
+      skipEmptyLines: false,
+      chunk: undefined,
+      chunkSize: undefined,
+      fastMode: undefined,
+      beforeFirstChunk: undefined,
+      withCredentials: undefined,
+      transform: undefined
+    };
+    */
+
+    //delimitersToGuess: [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP]
+
     columnHeaders.push(
       'Title',
       'Description',
@@ -240,6 +274,7 @@ export class Exporter {
       }
       i++;
     });
+    cardRows.push([[columnHeaders]]);
     /* TODO: Try to get translations working.
              These currently only bring English translations.
     TAPi18n.__('title'),
@@ -264,24 +299,6 @@ export class Exporter {
     TAPi18n.__('archived'),
     */
 
-    const stringifier = stringify({
-      header: true,
-      delimiter,
-      columns: columnHeaders,
-    });
-
-    stringifier.on('readable', function() {
-      let row;
-      while ((row = stringifier.read())) {
-        cardRows.push(row);
-      }
-    });
-
-    stringifier.on('error', function(err) {
-      // eslint-disable-next-line no-console
-      console.error(err.message);
-    });
-
     result.cards.forEach(card => {
       const currentRow = [];
       currentRow.push(card.title);
@@ -385,10 +402,10 @@ export class Exporter {
           currentRow.push(customFieldValuesToPush[valueIndex]);
         }
       }
-      stringifier.write(currentRow);
+      cardRows.push([[currentRow]]);
     });
-    stringifier.end();
-    return cardRows[0];
+
+    return Papa.unparse(cardRows, papaconfig);
   }
 
   canExport(user) {

models/settings.js

@@ -45,6 +45,26 @@ Settings.attachSchema(
       type: Boolean,
       optional: true,
     },
+    customLoginLogoImageUrl: {
+      type: String,
+      optional: true,
+    },
+    customLoginLogoLinkUrl: {
+      type: String,
+      optional: true,
+    },
+    textBelowCustomLoginLogo: {
+      type: String,
+      optional: true,
+    },
+    customTopLeftCornerLogoImageUrl: {
+      type: String,
+      optional: true,
+    },
+    customTopLeftCornerLogoLinkUrl: {
+      type: String,
+      optional: true,
+    },
     createdAt: {
       type: Date,
       denyUpdate: true,

models/users.js

@@ -905,6 +905,16 @@ if (Meteor.isServer) {
       }
       return { username: user.username, email: user.emails[0].address };
     },
+    impersonate(userId) {
+      check(userId, String);
+
+      if (!Meteor.users.findOne(userId))
+        throw new Meteor.Error(404, 'User not found');
+      if (!Meteor.user().isAdmin)
+        throw new Meteor.Error(403, 'Permission denied');
+
+      this.setUserId(userId);
+    },
   });
   Accounts.onCreateUser((options, user) => {
     const userCount = Users.find().count();

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.38.0",
+  "version": "v4.44.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.38.0",
+  "version": "v4.44.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

packages/wekan-oidc/oidc_server.js

@@ -33,7 +33,19 @@ OAuth.registerService('oidc', 2, null, function (query) {
   serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"];
   serviceData.accessToken = accessToken;
   serviceData.expiresAt = expiresAt;
-  serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
+
+  // If on Oracle OIM email is empty or null, get info from username
+  if (process.env.ORACLE_OIM_ENABLED === 'true' || process.env.ORACLE_OIM_ENABLED === true) {
+    if (userinfo[process.env.OAUTH2_EMAIL_MAP]) {
+      serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP];
+    } else {
+      serviceData.email = userinfo[process.env.OAUTH2_USERNAME_MAP];
+    }
+  }
+
+  if (process.env.ORACLE_OIM_ENABLED !== 'true' && process.env.ORACLE_OIM_ENABLED !== true) {
+    serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
+  }
 
   if (accessToken) {
     var tokenContent = getTokenContent(accessToken);
@@ -61,47 +73,108 @@ if (Meteor.release) {
   userAgent += "/" + Meteor.release;
 }
 
-var getToken = function (query) {
-  var debug = process.env.DEBUG || false;
-  var config = getConfiguration();
-  if(config.tokenEndpoint.includes('https://')){
-    var serverTokenEndpoint = config.tokenEndpoint;
-  }else{
-    var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint;
-  }
-  var requestPermissions = config.requestPermissions;
-  var response;
+if (process.env.ORACLE_OIM_ENABLED !== 'true' && process.env.ORACLE_OIM_ENABLED !== true) {
+  var getToken = function (query) {
+    var debug = process.env.DEBUG || false;
+    var config = getConfiguration();
+    if(config.tokenEndpoint.includes('https://')){
+      var serverTokenEndpoint = config.tokenEndpoint;
+    }else{
+      var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint;
+    }
+    var requestPermissions = config.requestPermissions;
+    var response;
 
-  try {
-    response = HTTP.post(
-      serverTokenEndpoint,
-      {
-        headers: {
-          Accept: 'application/json',
-          "User-Agent": userAgent
-        },
-        params: {
-          code: query.code,
-          client_id: config.clientId,
-          client_secret: OAuth.openSecret(config.secret),
-          redirect_uri: OAuth._redirectUri('oidc', config),
-          grant_type: 'authorization_code',
-          state: query.state
+    try {
+      response = HTTP.post(
+        serverTokenEndpoint,
+        {
+          headers: {
+            Accept: 'application/json',
+            "User-Agent": userAgent
+          },
+          params: {
+            code: query.code,
+            client_id: config.clientId,
+            client_secret: OAuth.openSecret(config.secret),
+            redirect_uri: OAuth._redirectUri('oidc', config),
+            grant_type: 'authorization_code',
+            state: query.state
+          }
         }
-      }
-    );
-  } catch (err) {
-    throw _.extend(new Error("Failed to get token from OIDC " + serverTokenEndpoint + ": " + err.message),
-      { response: err.response });
-  }
-  if (response.data.error) {
-    // if the http response was a json object with an error attribute
-    throw new Error("Failed to complete handshake with OIDC " + serverTokenEndpoint + ": " + response.data.error);
-  } else {
-    if (debug) console.log('XXX: getToken response: ', response.data);
-    return response.data;
-  }
-};
+      );
+    } catch (err) {
+      throw _.extend(new Error("Failed to get token from OIDC " + serverTokenEndpoint + ": " + err.message),
+        { response: err.response });
+    }
+    if (response.data.error) {
+      // if the http response was a json object with an error attribute
+      throw new Error("Failed to complete handshake with OIDC " + serverTokenEndpoint + ": " + response.data.error);
+    } else {
+      if (debug) console.log('XXX: getToken response: ', response.data);
+      return response.data;
+    }
+  };
+}
+
+if (process.env.ORACLE_OIM_ENABLED === 'true' || process.env.ORACLE_OIM_ENABLED === true) {
+
+  var getToken = function (query) {
+    var debug = (process.env.DEBUG === 'true' || process.env.DEBUG === true) || false;
+    var config = getConfiguration();
+    if(config.tokenEndpoint.includes('https://')){
+      var serverTokenEndpoint = config.tokenEndpoint;
+    }else{
+      var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint;
+    }
+    var requestPermissions = config.requestPermissions;
+    var response;
+
+    // OIM needs basic Authentication token in the header - ClientID + SECRET in base64
+    var dataToken=null;
+    var strBasicToken=null;
+    var strBasicToken64=null;
+
+    dataToken = process.env.OAUTH2_CLIENT_ID + ':' + process.env.OAUTH2_SECRET;
+    strBasicToken = new Buffer(dataToken);
+    strBasicToken64 = strBasicToken.toString('base64');
+
+    // eslint-disable-next-line no-console
+    if (debug) console.log('Basic Token: ', strBasicToken64);
+
+    try {
+      response = HTTP.post(
+        serverTokenEndpoint,
+        {
+          headers: {
+            Accept: 'application/json',
+            "User-Agent": userAgent,
+            "Authorization": "Basic " + strBasicToken64
+          },
+          params: {
+            code: query.code,
+            client_id: config.clientId,
+            client_secret: OAuth.openSecret(config.secret),
+            redirect_uri: OAuth._redirectUri('oidc', config),
+            grant_type: 'authorization_code',
+            state: query.state
+          }
+        }
+      );
+    } catch (err) {
+      throw _.extend(new Error("Failed to get token from OIDC " + serverTokenEndpoint + ": " + err.message),
+        { response: err.response });
+    }
+    if (response.data.error) {
+      // if the http response was a json object with an error attribute
+      throw new Error("Failed to complete handshake with OIDC " + serverTokenEndpoint + ": " + response.data.error);
+    } else {
+      // eslint-disable-next-line no-console
+      if (debug) console.log('XXX: getToken response: ', response.data);
+      return response.data;
+    }
+  };
+}
 
 var getUserInfo = function (accessToken) {
   var debug = process.env.DEBUG || false;

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.38">Wekan REST API v4.38</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.44">Wekan REST API v4.44</a>
             
           </li>
         
@@ -2027,7 +2027,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v4.38</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v4.44</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v4.38
+  version: v4.44
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

public/wekan-logo.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 302.5 210.37"><defs><style>.cls-1{fill:none;}.cls-2{clip-path:url(#clip-path);}.cls-3{fill:url(#linear-gradient);}.cls-4{fill:#7addfc;}.cls-5{fill:#529fdd;}.cls-6{fill:#fff;}</style><clipPath id="clip-path" transform="translate(0 0)"><path class="cls-1" d="M260.63,180.45H39.9c-7,0-9-2.27-9-9V31.71c0-6.81,2.1-9,9-9H260.63c6.8,0,9,2.13,9,9V171.45c0,6.57-2.08,9-9,9"/></clipPath><linearGradient id="linear-gradient" x1="-716.13" y1="35.06" x2="-715.13" y2="35.06" gradientTransform="matrix(0, -157.69, -157.69, 0, 5678.87, -112746.33)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#007c8f"/><stop offset="0.37" stop-color="#007088"/><stop offset="1" stop-color="#005377"/></linearGradient></defs><title>wekan-1_2</title><g class="cls-2"><rect class="cls-3" x="30.9" y="22.76" width="238.73" height="157.69"/><path class="cls-4" d="M225.06,138.25v-.54h-149a2.5,2.5,0,0,1-2.5-2.5v-69a2.5,2.5,0,0,1,2.5-2.5h149a2.5,2.5,0,0,1,2.5,2.5v69.07a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V66.18a3.5,3.5,0,0,0-3.5-3.5h-149a3.5,3.5,0,0,0-3.5,3.5v69.07a3.5,3.5,0,0,0,3.5,3.5h149Z" transform="translate(0 0)"/><path class="cls-5" d="M143.05,55.9v-.5H75.93a2.5,2.5,0,0,1-2.5-2.5V3.5A2.5,2.5,0,0,1,75.93,1h67.12a2.5,2.5,0,0,1,2.5,2.5V52.9a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V3.5a3.5,3.5,0,0,0-3.5-3.5H75.93a3.5,3.5,0,0,0-3.5,3.5V52.9a3.5,3.5,0,0,0,3.5,3.5h67.12Z" transform="translate(0 0)"/><path class="cls-5" d="M143.05,200.92v-.5H75.93a2.5,2.5,0,0,1-2.5-2.5v-49.4a2.5,2.5,0,0,1,2.5-2.5h67.12a2.5,2.5,0,0,1,2.5,2.5v49.4a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5v-49.4a3.5,3.5,0,0,0-3.5-3.5H75.93a3.5,3.5,0,0,0-3.5,3.5v49.4a3.5,3.5,0,0,0,3.5,3.5h67.12Z" transform="translate(0 0)"/><path class="cls-5" d="M224.43,55.9v-.5H157.32a2.5,2.5,0,0,1-2.5-2.5V3.5a2.5,2.5,0,0,1,2.5-2.5h67.12a2.5,2.5,0,0,1,2.5,2.5V52.9a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V3.5a3.5,3.5,0,0,0-3.5-3.5H157.32a3.5,3.5,0,0,0-3.5,3.5V52.9a3.5,3.5,0,0,0,3.5,3.5h67.12Z" transform="translate(0 0)"/><path class="cls-5" d="M224.43,200.92v-.5H157.32a2.5,2.5,0,0,1-2.5-2.5v-49.4a2.5,2.5,0,0,1,2.5-2.5h67.12a2.5,2.5,0,0,1,2.5,2.5v49.4a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5v-49.4a3.5,3.5,0,0,0-3.5-3.5H157.32a3.5,3.5,0,0,0-3.5,3.5v49.4a3.5,3.5,0,0,0,3.5,3.5h67.12Z" transform="translate(0 0)"/><path class="cls-5" d="M299,94.93v-.5H238.16a2.5,2.5,0,0,1-2.5-2.5V5.08a2.5,2.5,0,0,1,2.5-2.5H299a2.5,2.5,0,0,1,2.5,2.5V91.93a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V5.08a3.5,3.5,0,0,0-3.5-3.5H238.16a3.5,3.5,0,0,0-3.5,3.5V91.93a3.5,3.5,0,0,0,3.5,3.5H299Z" transform="translate(0 0)"/><path class="cls-5" d="M299,209.87v-.5H238.16a2.5,2.5,0,0,1-2.5-2.5V105.18a2.5,2.5,0,0,1,2.5-2.5H299a2.5,2.5,0,0,1,2.5,2.5V206.87a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V105.18a3.5,3.5,0,0,0-3.5-3.5H238.16a3.5,3.5,0,0,0-3.5,3.5V206.87a3.5,3.5,0,0,0,3.5,3.5H299Z" transform="translate(0 0)"/><path class="cls-5" d="M63,94.93v-.5H3.5A2.5,2.5,0,0,1,1,91.93V5.08a2.5,2.5,0,0,1,2.5-2.5H63a2.5,2.5,0,0,1,2.5,2.5V91.93a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V5.08A3.5,3.5,0,0,0,63,1.58H3.5A3.5,3.5,0,0,0,0,5.08V91.93a3.5,3.5,0,0,0,3.5,3.5H63Z" transform="translate(0 0)"/><path class="cls-5" d="M63,209.87v-.5H3.5a2.5,2.5,0,0,1-2.5-2.5V105.18a2.5,2.5,0,0,1,2.5-2.5H63a2.5,2.5,0,0,1,2.5,2.5V206.87a2.5,2.5,0,0,1-2.5,2.5v1a3.5,3.5,0,0,0,3.5-3.5V105.18a3.5,3.5,0,0,0-3.5-3.5H3.5a3.5,3.5,0,0,0-3.5,3.5V206.87a3.5,3.5,0,0,0,3.5,3.5H63Z" transform="translate(0 0)"/><path class="cls-6" d="M208.62,108.44a1.51,1.51,0,0,0-.83.33q-3.12,8.16-4.95,7.92c-.35,0-.56-.37-.58-1a10.31,10.31,0,0,1,.31-2.53c.23-1.06.5-2.12.78-3.19s.56-2.28.89-3.61.6-2.38.75-3.14a1.15,1.15,0,0,0-.47-1.28,2.48,2.48,0,0,0-1.89-.06c-3.55.79-6.33,3.92-8.31,9.36q.92-6.36,1.14-7.17c.25-1.11.45-1.82.56-2.14a9.13,9.13,0,0,0-1.81-.11,17.39,17.39,0,0,0-3.45.33c-1.27.24-1.93.54-2,.92-.22,1.92-.24,3.93-.44,5.92s-.32,3.69-.44,5.31a10.85,10.85,0,0,1-1.25,1.69c-.53.55-1,.81-1.42.75-1-.16-.37-3,1.53-8.64,1.45-4.33.71-6.16-5.22-6.2a10.64,10.64,0,0,0-5.47,1.67,12.27,12.27,0,0,0-5.33,7c-.09.31-.16.6-.22.89a13.11,13.11,0,0,1-.83,1.36,6.94,6.94,0,0,1-1.64,1.94,1.67,1.67,0,0,1-1.14.33c-1-.16-2.28-1-3.7-2.58-1-1.09-2.86-3-3.78-4.14,5.64-10.17,20.73-12.5,25.06-12.5,1.36,0,1.41-6.25,0-6.25-17.55,0-25.36,14.85-27.09,20,.15-1.65.27-2.71.5-4.86s.4-3.85.53-5.11.26-2.73.42-4.36.32-2.91.42-3.86.23-2,.36-3.11.23-2,.33-2.69l.31-1.94c.1-.65.18-1.19.28-1.58a.94.94,0,0,0-.69-1.31,5,5,0,0,0-.94-.06A1.87,1.87,0,0,0,158,81a1.92,1.92,0,0,0-.69.94q-3.71,8.75-6.14,27.17a13.62,13.62,0,0,1-4.25,6,7.65,7.65,0,0,1-5.33,1.86,3.36,3.36,0,0,1-2.83-2.42,9.53,9.53,0,0,1-.19-5.47c.86-4.11,2-6.17,3.33-6.17.91,0,.95,1.54.08,4.64-.66,2.21-1.58,3.69-2.75,4.42-.41.25-.58.46-.53.58s.36.19.92,0a19.09,19.09,0,0,0,5.56-2.31,6.17,6.17,0,0,0,3-3.28,3.08,3.08,0,0,0-1.27-3.25,7.24,7.24,0,0,0-4.33-1.53,11.24,11.24,0,0,0-5.08,1l.11-.19a47.7,47.7,0,0,0,5.75-12q1.Line truncated

rebuild-wekan.bat

@@ -18,8 +18,8 @@ REM Install chocolatey
 
 choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
 
-curl -O https://nodejs.org/dist/v12.16.3/node-v12.16.2-x64.msi
-call node-v12.16.3-x64.msi
+curl -O https://nodejs.org/dist/v14.15.0/node-v14.15.0-x64.msi
+call node-v14.15.0-x64.msi
 
 call npm config -g set msvs_version 2015
 call meteor npm config -g set msvs_version 2015

rebuild-wekan.sh

@@ -28,7 +28,7 @@ do
 			curl -0 -L https://npmjs.org/install.sh | sudo sh
 			sudo chown -R $(id -u):$(id -g) $HOME/.npm
 			sudo npm -g install n
-			sudo n 12.18.3
+			sudo n 14.15.0
 			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
 			#sudo apt-get install -y nodejs
 		elif [[ "$OSTYPE" == "darwin"* ]]; then

releases/release-sandstorm.sh

@@ -18,7 +18,7 @@ cd $REPODIR
 rm -rf $WEKANDIR
 git clone git@github.com:wekan/wekan.git
 cd $WEKANDIR
-sudo n 12.18.4
+sudo n 14.15.0
 sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp
 # Build Wekan
 ./releases/rebuild-release.sh

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 = 438,
+    appVersion = 444,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "4.38.0~2020-09-16"),
+    appMarketingVersion = (defaultText = "4.44.0~2020-10-28"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,