Преглед на файлове

Try to allow register and login.

Thanks to xet7 !

Related #4383
Lauri Ojansivu преди 3 години
родител
ревизия
3076547cee
променени са 3 файла, в които са добавени 30 реда и са изтрити 22 реда
  1. 12 0
      client/components/main/layouts.js
  2. 10 10
      config/accounts.js
  3. 8 12
      models/settings.js

+ 12 - 0
client/components/main/layouts.js

@@ -53,6 +53,18 @@ Template.userFormsLayout.onCreated(function() {
       $('.at-pwd-form').hide();
     }
   });
+
+  Meteor.call('isDisableRegistration', (_, result) => {
+    if (result) {
+      $('.at-signUp').hide();
+    }
+  });
+
+  Meteor.call('isDisableForgotPassword', (_, data) => {
+    if (result) {
+      $('.at-forgotPwd').hide();
+    }
+  });
 });
 
 Template.userFormsLayout.onRendered(() => {

+ 10 - 10
config/accounts.js

@@ -1,19 +1,19 @@
 const passwordField = AccountsTemplates.removeField('password');
 const emailField = AccountsTemplates.removeField('email');
-let disableRegistration = true;
-let disableForgotPassword = true;
+let disableRegistration = false;
+let disableForgotPassword = false;
 
-Meteor.call('getDisableRegistration', (err, data) => {
+Meteor.call('isDisableRegistration', (err, data) => {
   if (!err) {
     disableRegistration = data;
-    //console.log(data);
+    console.log(data);
   }
 });
 
-Meteor.call('getDisableForgotPassword', (err, data) => {
+Meteor.call('isDisableForgotPassword', (err, data) => {
   if (!err) {
     disableForgotPassword = data;
-    //console.log(data);
+    console.log(data);
   }
 });
 
@@ -43,8 +43,8 @@ AccountsTemplates.configure({
   confirmPassword: true,
   enablePasswordChange: true,
   sendVerificationEmail: true,
-  showForgotPasswordLink: !disableForgotPassword,
-  forbidClientAccountCreation: disableRegistration,
+  showForgotPasswordLink: disableForgotPassword === false,
+  forbidClientAccountCreation: disableRegistration === true,
   onLogoutHook() {
     const homePage = 'home';
     if (FlowRouter.getRouteName() === homePage) {
@@ -55,14 +55,14 @@ AccountsTemplates.configure({
   },
 });
 
-if (!disableForgotPassword) {
+if (disableForgotPassword === false) {
   [
     'forgotPwd',
     'resetPwd',
   ].forEach(routeName => AccountsTemplates.configureRoute(routeName));
 }
 
-if (!disableRegistration) {
+if (disableRegistration === false) {
   [
     'signUp',
   ].forEach(routeName => AccountsTemplates.configureRoute(routeName));

+ 8 - 12
models/settings.js

@@ -442,25 +442,21 @@ if (Meteor.isServer) {
       }
     },
 
-    getDisableRegistration() {
+    isDisableRegistration() {
       const setting = Settings.findOne({});
-      if (!setting.disableRegistration) {
-        return false;
+      if (setting.disableRegistration === 'true') {
+        return true;
       } else {
-        return {
-          disableRegistration: `${setting.disableRegistration}`,
-        };
+        return false;
       }
     },
 
-   getDisableForgotPassword() {
+   isDisableForgotPassword() {
       const setting = Settings.findOne({});
-      if (!setting.disableForgotPassword) {
-        return false;
+      if (setting.disableForgotPassword === 'true') {
+        return true;
       } else {
-        return {
-          disableForgotPassword: `${setting.disableForgotPassword}`,
-        };
+        return false;
       }
     },