Merge pull request #2191 from Akuket/feature-improve-authentication

Fix authentication dropdown

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;
+  },
 });