PHP8

[Pman.BAdmin] / Pman.Login.js

diff --git a/Pman.Login.js b/Pman.Login.js
index c2feea9..77fb3b4 100644 (file)
--- a/Pman.Login.js
+++ b/Pman.Login.js
@@ -51,7 +51,7 @@ Pman.Login =  new Roo.util.Observable({
         // check if we are logged in..
         new Pman.Request({  
             url: baseURL + '/Login',
-            method: 'GET',  
+            method: 'POST',  
             params: {
                 getAuthUser: true
             },  
@@ -67,14 +67,27 @@ Pman.Login =  new Roo.util.Observable({
                     //console.log('call failure');
                     return Pman.Login.failure(response,opts);
                 }
-                if (res.data.id*1 < 0) { 
-                   this.fillAuth(res.data);
+                
+                if (res.data.id*1 < 0) {
+                    this.fillAuth(res.data);
                     return this.openSystem();
                 }
                     
                 var _this = this;
                 if (!res.data.id) { // id=0 == login failure.
-                    return Pman.Dialog.Login.show({},
+                    
+                    if(window.location.pathname.substr(baseURL.length).match(/\/PasswordReset\//)){
+                        Pman.Dialog.BAdminPasswordReset.show({}, function(){
+                            window.location.href = baseURL;
+                        });
+                        
+                        return;
+                    }
+                     
+                    
+                    
+                    return Pman.Dialog.Login.show(
+                        {},
                         function(data) {
                            Pman.Login.success(data);
                         }
@@ -84,23 +97,6 @@ Pman.Login =  new Roo.util.Observable({
             },
             failure : function(res)
             {
-                switch (res.errorMsg) {
-                    case 'NEW-IP-ADDRESS' :
-                    case 'PENDING-IP-ADDRESS' :
-                    case 'BAD-IP-ADDRESS' :
-                    case 'BLOCKED-IP-ADDRESS' :
-                        
-                        Pman.Dialog.LoginNotice.show({
-                            status : res.errorMsg,
-                            ip : res.errors.ip
-                        });
-                        
-                        return;
-                        
-                    default:
-                        break;
-                }
-                
                 return Pman.Dialog.Login.show({},
                     function(data) {
                        Pman.Login.success(data);
@@ -143,7 +139,7 @@ Pman.Login =  new Roo.util.Observable({
             params: {
                 getAuthUser: true
             },  
-            method: 'GET',  
+            method: 'POST',  
             success:  Pman.Login.success,
             failure : Pman.Login.failure,
             scope : Pman.Login
@@ -174,8 +170,6 @@ Pman.Login =  new Roo.util.Observable({
     
     success : function(res)  // check successfull...
     {  
-        
-        Roo.log(res);
         this.sending = false;
         
         if (!res.success) {
@@ -201,7 +195,12 @@ Pman.Login =  new Roo.util.Observable({
     },
     
     fillAuth: function(au) {
-        this.startAuthCheck();
+        
+        //pause auth check in open system
+        if(au.id * 1 > 0) {
+            this.startAuthCheck();
+        }
+        
         this.authUserId = au.id;
         this.authUser = au;
         this.lastChecked = new Date();
@@ -215,17 +214,16 @@ Pman.Login =  new Roo.util.Observable({
         //this.switchLang(Roo.state.Manager.get('Pman.Login.lang', 'en'));
         Roo.state.Manager.set('Pman.Login.lang.'+appNameShort, au.lang);
         this.switchLang(au.lang);
-        
      
         // open system... - -on setyp..
         if (this.authUserId  < 0) {
-            Roo.bootstrap.MessageBox.alert("Warning", 
-                "This is an open system - please set up a admin user with a password.");  
+            Roo.bootstrap.MessageBox.alert(
+                "Warning",
+                "This is an open system - please set up a admin user with a password."
+            );  
         }
          
         //Pman.onload(); // which should do nothing if it's a re-auth result...
-        
-             
     },
     
     
@@ -351,10 +349,11 @@ Pman.Login =  new Roo.util.Observable({
                 { 
                     id : 0, 
                     company_id : Pman.Login.authUser.company_id* 1,
-                    company_id_name : Pman.Login.authUser.company_id_name
+                    company_id_name : Pman.Login.authUser.company_id_name,
+                    role : 'Administrators'
                 }, function(data) {
                     //forceAdmin(data);
-                   Pman.Login.openSystemCreateUser(data);
+                    Pman.Login.openSystemCreateUser(data);
                 }
             );
             return;
@@ -363,12 +362,12 @@ Pman.Login =  new Roo.util.Observable({
         window.onbeforeunload = false;
         document.location = baseURL + '?ts=' + Math.random();
     },
+    
     openSystemCreateCompany: function(data)
     {
-            
-         if (Pman.Login.authUser.company_id * 1 > 0) {
+        if (Pman.Login.authUser.company_id * 1 > 0) {
             //forceAdmin();
-           Pman.Login.openSystemCreateUser(data);
+            Pman.Login.openSystemCreateUser(data);
             return;
         }
         if (!data || !data.id) {
@@ -385,28 +384,47 @@ Pman.Login =  new Roo.util.Observable({
         Pman.Login.authUser.company_id_name  = data.name;
         Roo.log("forcing admin");
         this.openSystemCreateUser();
-       
-        
     },
+    
     openSystem : function()
     {
-          
         Roo.bootstrap.MessageBox.alert("Error", "Admin accounts have not been created - use the old admin at present");
-
-        // create company if company_id is -1 
-        if (Pman.Login.authUser.company_id* 1 < 0) {
-            this.openSystemCreateCompany();
-            return;
-        }
-        
-        // create user if id is -1 
-        if (Pman.Login.authUser.id* 1 < 0) {
-            this.openSystemCreateUser();
-            return;
-        }
-        
-        
         
+        new Pman.Request({  
+            url: baseURL + '/Login',
+            method: 'POST',  
+            params: {
+                check_owner_company: true
+            },  
+            success:  function(res)  {  // check successfull...
+                
+                if(res.data == 1) {
+                    this.openSystemCreateUser();
+                    return;
+                }
+                
+                if(res.data == 0) {
+                    this.openSystemCreateCompany();
+                    return;
+                }
+                
+                if(res.data > 0) {
+                    Roo.bootstrap.MessageBox.alert(
+                        "Error",  
+                        "There are more than 1 company in the system. please fix the data"
+                    );
+                    return;
+                }
+            },
+            failure : function(res)
+            {
+                Roo.bootstrap.MessageBox.alert(
+                    "Error",  
+                    "Invalid params for check owner company"
+                );
+            },
+            scope : Pman.Login
+        });
     },
      /**
      * hasPerm: