GitList
Browse code

removed authentication from get_status

Louis authored on14/03/2019 22:29:25
Showing2 changed files
build/synocam_home_switch.pbw
History View file @2ac9c85
1 1 
Binary files a/build/synocam_home_switch.pbw and b/build/synocam_home_switch.pbw differ
src/pkjs/index.js
History View file @2ac9c85
... ... 
@@ -53,70 +53,47 @@ function authenticate() {
53 53
54 54 
 function get_status() {
55 55 
   var response;
56 
-  sid="";
57 
-  console.log('---- authenticate');
58 
-  if (localStorage.getItem('username')  && localStorage.getItem('password') && localStorage.getItem('server') ){
59 
-    var username=localStorage.getItem('username');
60 
-    var password=localStorage.getItem('password');
61 
-    var server=localStorage.getItem('server');
62 
-    var url = server + "/webapi/auth.cgi?api=SYNO.API.Auth&method=Login&version=2&account="+username+"&passwd="+password+"&session=SurveillanceStation&format=sid";
63 
-    var xhr = new XMLHttpRequest();
64 56
57 
+  if (sid != ""){
58 
+    status = "";
59 
+    console.log('---- get_status');
60 
+    url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;
61 
+
65 62 
     xhr.open("GET", url,false);
66 63 
     xhr.send();
67 64
68 65 
     if(xhr.status == 200) {
69 66 
       response = JSON.parse(xhr.responseText);
70 67 
       if (response.success == true){
71 
-        sid = response.data.sid;
68 
+        status=response.data.on;
69 
+        var message;
70 
+        switch (status) {
71 
+          case true:
72 
+            message = "Your Home mode is ON";
73 
+            break;
74 
+          case false:
75 
+            message = "Your Home mode is OFF";
76 
+            break;
77 
+          default:
78 
+            message = "home mode is unknown !";
79 
+        }
80 
+        // Build message
81 
+        var dict = {
82 
+          'status': message,
83 
+        };
84 
+
85 
+        // Send the message
86 
+        Pebble.sendAppMessage(dict, function(e) {
87 
+          console.log('sent');
88 
+        }, function() {
89 
+          console.log('failed');
90 
+        });
72 91 
       }
73 92 
     }else {
74 93 
       console.log('------Request returned error code ' + xhr.status.toString());
75 94 
     }
76 
-
77 
-    if (sid != ""){
78 
-      status = "";
79 
-      console.log('---- get_status');
80 
-      url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;
81 
-
82 
-      xhr.open("GET", url,false);
83 
-      xhr.send();
84 
-
85 
-      if(xhr.status == 200) {
86 
-        response = JSON.parse(xhr.responseText);
87 
-        if (response.success == true){
88 
-          status=response.data.on;
89 
-          var message;
90 
-          switch (status) {
91 
-            case true:
92 
-              message = "Your Home mode is ON";
93 
-              break;
94 
-            case false:
95 
-              message = "Your Home mode is OFF";
96 
-              break;
97 
-            default:
98 
-              message = "home mode is unknown !";
99 
-          }
100 
-          // Build message
101 
-          var dict = {
102 
-            'status': message,
103 
-          };
104 
-
105 
-          // Send the message
106 
-          Pebble.sendAppMessage(dict, function(e) {
107 
-            console.log('sent');
108 
-          }, function() {
109 
-            console.log('failed');
110 
-          });
111 
-        }
112 
-      }else {
113 
-        console.log('------Request returned error code ' + xhr.status.toString());
114 
-      }
115 
-    }
116 
-
117 
-  }else{
118 
-    Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");
119 95 
   }
96 
+
120 97 
 }
121 98
122 99