Add DayType and Child classes

implement result cache
fill more stuff in

Author: Allow2CEO

Allow2/Allow2.cs

@@ -1,15 +1,17 @@
 //
 //  Allow2Unity
+//  Allow2.cs
 //
-//  Created by Andrew Longhorn in early 2019.
+//  Created by Andrew Longhorn in Jan 2019.
 //  Copyright © 2019 Allow2 Pty Ltd. All rights reserved.
 //
 // LICENSE:
 //  See LICENSE file in root directory
 //
 
-using Application;
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -21,24 +23,19 @@ namespace Allow2
     /// </summary>
     public static class Allow2
     {
-        static string uuid;
-        static string _deviceToken = "Not Set";    // ie: "iug893-kjg-fiug23" - not persisted: always set this on start
+        private static readonly string uuid;
+        private static string _deviceToken = "Not Set";    // ie: "iug893-kjg-fiug23" - not persisted: always set this on start
         public static EnvType env = EnvType.Production;
 
         //
         // relevant persistence items
         //
         static int userId;          // ie: 27634
+        static int _childId;        // ie: 34
         static string pairToken;    // ie: "98hbieg87-ilulieugil-dilufkucy"
-        static string _timezone;     // ie: "Australia/Brisbane"
+        static string _timezone;    // ie: "Australia/Brisbane"
 
-        //
-        // cannot instantiate this class
-        //
-        //protected Allow2() {
-        //}
-
-        public static string apiUrl
+        public static string ApiUrl
         {
             get
             {
@@ -54,7 +51,7 @@ public static string apiUrl
             }
         }
 
-        public static string serviceUrl
+        public static string ServiceUrl
         {
             get
             {
@@ -70,7 +67,17 @@ public static string serviceUrl
             }
         }
 
-        public static string timezone
+        public static resultClosure checkResultHandler;
+
+        public static bool IsPaired
+        {
+            get
+            {
+                return (userId > 0) && (pairToken != null);
+            }
+        }
+
+        public static string Timezone
         {
             get
             {
@@ -83,7 +90,7 @@ public static string timezone
             }
         }
 
-        public static string deviceToken
+        public static string DeviceToken
         {
             get
             {
@@ -93,44 +100,51 @@ public static string deviceToken
             {
                 _deviceToken = value;
                 PlayerPrefs.SetString("deviceToken", _deviceToken);
-                if ((userId < 1) || (pairToken == null)) {
+                if (!IsPaired)
+                {
                     // todo: start a regular timer to keep trying to call home on startup until we confirm we are NOT paired.
                     CheckForBrokenPairing();
                 }
             }
         }
 
-        private static void persist() {
+        private static void Persist()
+        {
             // todo: write to protected namespace storage?
             PlayerPrefs.SetInt("userId", userId);
         }
 
+        // no persistence here
+        private static Dictionary<string, Allow2CheckResult> resultCache = new Dictionary<string, Allow2CheckResult>();
+
         public delegate void resultClosure(string err, Allow2CheckResult result);
 
         static Allow2()
         {
             uuid = SystemInfo.deviceUniqueIdentifier;
-            if (uuid == SystemInfo.unsupportedIdentifier) {
-                // cannot use on this platform, kludge is to generate and store one, use auditing on the server side to detect disconnection
+            if (uuid == SystemInfo.unsupportedIdentifier)
+            {
+                // cannot use on this platform, kludge is to generate and store one, use auditing on the server side to detect disconnection in any case
                 uuid = PlayerPrefs.GetString("uuid");
-                if (uuid == null) {
-
+                if (uuid == null)
+                {
+                    uuid = System.Guid.NewGuid().ToString();
                     PlayerPrefs.SetString("uuid", uuid);
                 }
             }
             userId = PlayerPrefs.GetInt("userId");
             pairToken = PlayerPrefs.GetString("pairToken");
-            timezone = PlayerPrefs.GetString("timezone");
+            _timezone = PlayerPrefs.GetString("timezone");
         }
 
         static IEnumerator CheckForBrokenPairing()
         {
-            // here we just ask the question, was this unique ID paired and somehow it lost it's pairing?
+            // here we just ask the question, was our unique ID paired and somehow it lost it's pairing?
             WWWForm form = new WWWForm();
             form.AddField("uuid", uuid);
             form.AddField("deviceToken", _deviceToken);
 
-            using (UnityWebRequest www = UnityWebRequest.Post(apiUrl + "/api/isDevicePaired", form))
+            using (UnityWebRequest www = UnityWebRequest.Post(ApiUrl + "/api/isDevicePaired", form))
             {
                 yield return www.SendWebRequest();
 
@@ -148,11 +162,10 @@ static IEnumerator CheckForBrokenPairing()
             }
         }
 
-        //void Awake()
-        //{
-        //    DontDestroyOnLoad(this);
-        //}
-
+        /*
+         * 
+         * 
+         */
         public static IEnumerator Pair(string user, // ie: "fred@gmail.com",
                          string pass,               // ie: "my super secret password",
                          string deviceName,          // ie: "Fred's iPhone"
@@ -164,16 +177,17 @@ resultClosure callback
             form.AddField("pass", pass);
             form.AddField("deviceToken", _deviceToken);
             form.AddField("name", deviceName);
+            form.AddField("uuid", uuid);
 
-            Debug.Log(apiUrl + "/api/pairDevice");
+            Debug.Log(ApiUrl + "/api/pairDevice");
 
-            using (UnityWebRequest www = UnityWebRequest.Post(apiUrl + "/api/pairDevice", form))
+            using (UnityWebRequest www = UnityWebRequest.Post(ApiUrl + "/api/pairDevice", form))
             {
                 yield return www.SendWebRequest();
 
                 if (www.isNetworkError || www.isHttpError)
                 {
-                    Debug.Log(www.error);
+                    Debug.Log(www.error.ToString());
                     callback(www.error, null);
                 }
                 else
@@ -182,40 +196,62 @@ resultClosure callback
                     var response = Allow2_SimpleJSON.JSON.Parse(www.downloadHandler.text);
                     // extract
 
-                    persist();
+                    Persist();
 
                     // return
                     callback(null, null);
                 }
             }
         }
 
-        public static string getQR()
+        public static string GetQR(string name)
         {
-            return "https://api.allow2.com/genqr/" +
+            return ApiUrl + "/genqr/" +
                WWW.EscapeURL(_deviceToken) + "/" +
                   WWW.EscapeURL(uuid) + "/" +
                   WWW.EscapeURL(name);
         }
 
-        public static IEnumerator Check(int childId,
+        public static IEnumerator Check(int childId,    // childId == 0 ? Get Updated Child List and confirm Pairing
                           int[] activities,
                           resultClosure callback,
                           bool log = false
                          )
         {
-            if ((userId < 1) || (pairToken == null)) {
+            if (!IsPaired)
+            {
                 callback(Allow2Error.NotPaired, null);
                 yield break;
             }
 
             WWWForm form = new WWWForm();
-            form.AddField("user", user);
-            form.AddField("pass", pass);
+            form.AddField("userId", userId);
+            form.AddField("pairToken", pairToken);
             form.AddField("deviceToken", _deviceToken);
-            form.AddField("name", deviceName);
+            form.AddField("tz", _timezone);
+            //form.AddField("activities", activities);
+            form.AddField("log", log ? 1 : 0);
+            if (childId > 0)
+            {
+                form.AddField("childId", childId);
+            }
+
+            // check the cache first
+            string key = form.ToString();
+            if (resultCache.ContainsKey(key)) {
+                Allow2CheckResult checkResult = resultCache[key];
+
+                if (checkResult.Expires.CompareTo(new DateTime()) < 0 ) {
+                    // not expired yet, use cached value
+                    callback(null, checkResult);
+                    yield break;
+                }
+
+                // clear cached value and ask the server again
+                resultCache.Remove(key);
+            }
 
-            UnityWebRequest www = UnityWebRequest.Get(apiUrl + "/api/pairDevice");
+            UnityWebRequest www = UnityWebRequest.Get(ApiUrl + "/api/pairDevice");
             yield return www.SendWebRequest();
 
             if (www.isNetworkError || www.isHttpError)
@@ -235,7 +271,7 @@ public static IEnumerator Check(int childId,
                     // special case, no longer controlled
                     userId = 0;
                     pairToken = null;
-                    persist();
+                    Persist();
                     //childId = 0;
                     //_children = []
                     //_dayTypes = []
@@ -250,7 +286,8 @@ public static IEnumerator Check(int childId,
                     yield break;
                 }
 
-                if (json["allowed"] == null) {
+                if (json["allowed"] == null)
+                {
                     callback(Allow2Error.InvalidResponse, null);
                     yield break;
                 }
@@ -264,8 +301,42 @@ public static IEnumerator Check(int childId,
                 response.Add("allDayTypes", _dayTypes);
                 var _children = json["allDayTypes"];
                 response.Add("children", _children);
+
+                // cache the response
+                resultCache[key] = response;
                 callback(null, response);
             }
         }
+
+        public static IEnumerator Request(
+            int dayTypeId,
+            int[] lift,
+            string message,
+            resultClosure callback)
+        {
+            if (!IsPaired)
+            {
+                callback(Allow2Error.NotPaired, null);
+                yield break;
+            }
+            if (_childId < 1)
+            {
+                callback(Allow2Error.MissingChildId, null);
+                yield break;
+            }
+
+            WWWForm form = new WWWForm();
+            form.AddField("userId", userId);
+            form.AddField("pairToken", pairToken);
+            form.AddField("deviceToken", _deviceToken);
+            form.AddField("childId", _childId);
+            //form.AddField("lift", lift.asJson);
+            //if (dayTypeId != nil) {
+            //    body["dayType"] = JSON(dayTypeId!)
+            //    body["changeDayType"] = true
+            //}
+
+
+        }
     }
-}
+}

Allow2/Allow2CheckResult.cs

@@ -1,10 +1,27 @@
-using System;
+//
+//  Allow2Unity
+//  Allow2CheckResult.cs
+//
+//  Created by Andrew Longhorn in Jan 2019.
+//  Copyright © 2019 Allow2 Pty Ltd. All rights reserved.
+//
+// LICENSE:
+//  See LICENSE file in root directory
+//
+
+using System;
 namespace Allow2
 {
     public class Allow2CheckResult : Allow2_SimpleJSON.JSONObject   // shortcut implementation for now
     {
         //public Allow2CheckResult()
         //{
         //}
+
+        public DateTime Expires {
+            get {
+                return new DateTime();
+            }
+        }
     }
 }

Allow2/Allow2Child.cs

@@ -0,0 +1,26 @@
+//
+//  Allow2Unity
+//  Allow2Child.cs
+//
+//  Created by Andrew Longhorn in May 2019.
+//  Copyright © 2019 Allow2 Pty Ltd. All rights reserved.
+//
+// LICENSE:
+//  See LICENSE file in root directory
+//
+
+namespace Allow2
+{
+    public class Allow2Child   // shortcut implementation for now
+    {
+        public int Id { get; private set; }
+        public string Name { get; private set; }
+        public string Pin { get; private set; }
+
+        Allow2Child(int id, string name, string pin) {
+            Id = id;
+            Name = name;
+            Pin = pin;
+        }
+    }
+}