Merge branch 'edge' into meteor-1.8

2 files changed, 16 insertions, 6 deletions

diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index df495bb1..74a8e4d4 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -25,8 +25,9 @@ BlazeComponent.extendComponent({
       archived: false,
       'members.userId': Meteor.userId(),
       type: 'board',
+      subtasksDefaultListId: null,
     }, {
-      sort: ['title'],
+      sort: { stars: -1, color: 1, title: 1, description: 1 },
     });
   },
 
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 6f7c914a..4305de7c 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -101,8 +101,14 @@ Template.defaultLayout.events({
 });
 
 async function authentication(event, instance) {
-  const match = $('#at-field-username_and_email').val();
-  const password = $('#at-field-password').val();
+
+  // If header login id is set, use it for login.
+  // Header username = Email address
+  // Header password = Login ID
+  // Not user currently: req.headers[process.env.HEADER_LOGIN_FIRSTNAME]
+  //                and  req.headers[process.env.HEADER_LOGIN_LASTNAME]
+  const match = req.headers[process.env.HEADER_LOGIN_EMAIL] || $('#at-field-username_and_email').val();
+  const password = req.headers[process.env.HEADER_LOGIN_ID] || $('#at-field-password').val();
 
   if (!match || !password) return;
 
@@ -110,9 +116,12 @@ async function authentication(event, instance) {
 
   if (result === 'password') return;
 
-  // Stop submit #at-pwd-form
-  event.preventDefault();
-  event.stopImmediatePropagation();
+  // If header login id is not set, don't try to login automatically.
+  if (!process.env.HEADER_LOGIN_ID) {
+    // Stop submit #at-pwd-form
+    event.preventDefault();
+    event.stopImmediatePropagation();
+  }
 
   switch (result) {
   case 'ldap':