Merge pull request #35 from Countly/server_config

Server config

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 25.4.0
+
+* ! Minor Breaking Change ! SDK now has Server Configuration feature and it is enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.
+
+* Mitigated an issue about orientation detection in Safari
+
+* Improved init time Content Zone logic
+* Improved error handler to include script loading issues
+
+* Added `refreshContentZone` method to Content interface for refreshing Content Zone requests
+* Added `behavior_settings` init time method for providing server configuration during first initialization
+
+* `max_logs` config option value will not be used anymore (use `max_breadcrumb_count` instead)
+
 ## 25.1.0
 
 * Mitigated an issue where content resizing did not work in certain orientations.

cypress/e2e/device_id_init_scenarios.cy.js

@@ -115,14 +115,19 @@ function checkRequestsForT(queue, expectedInternalType) {
         expect(queue[i].t).to.eq(expectedInternalType);
     }
 }
-function checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, temp) {
+function checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, temp, afterOffline) {
     var directReqs = Countly._internals.testingGetRequests(); // get direct requests
     cy.log("Requests: " + JSON.stringify(directReqs));
 
-    expect(directReqs.length).to.eq(temp ? 0 : 2);
+    expect(directReqs.length).to.eq(temp ? 0 : afterOffline?4:3);
     for (var i = 0; i < directReqs.length; i++) {
-        expect(directReqs[i].params.device_id).to.eq(afterInitDeviceId);
-        expect(directReqs[i].params.t).to.eq(afterInitDeviceIdType);
+        if (afterOffline && directReqs[i].functionName == "server_config" && i == directReqs.length - 1) {
+            expect(directReqs[i].params.device_id).to.be.oneOf(["id_2", "storedID", "newID"]);
+            expect(directReqs[i].params.t).to.eq(DeviceIdTypeInternalEnumsTest.DEVELOPER_SUPPLIED);
+        } else {
+            expect(directReqs[i].params.device_id).to.eq(afterInitDeviceId);
+            expect(directReqs[i].params.t).to.eq(afterInitDeviceIdType);
+        }
     }
 }
 function checkEachStoredReqForIDandT(afterInitDeviceId, afterInitDeviceIdType) {
@@ -253,7 +258,7 @@ function changeIDTests(afterInitDeviceId, afterInitDeviceIdType, afterOffline) {
         // wait for things to resolve
         cy.wait(550).then(() => {
             // direct requests would have the old device id (hc and session)
-            checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType);
+            checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, false, true);
 
             // after ID events
             checkStoredReqQueueAfterIDChange(changedID2, changedIDType2, afterOffline? 3 : 2); // no end and begin session in offline mode => device id change scenario
@@ -459,7 +464,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true); // no end and begin session in offline mode => device id change scenario
@@ -535,7 +540,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true);
@@ -687,7 +692,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, DeviceIdTypeInternalEnumsTest.URL_PROVIDED);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, DeviceIdTypeInternalEnumsTest.URL_PROVIDED, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true);
@@ -1756,7 +1761,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true); // no end and begin session in offline mode => device id change scenario
@@ -1832,7 +1837,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, afterInitDeviceIdType, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true);
@@ -1984,7 +1989,7 @@ describe("Device Id tests during first init", ()=>{
                 // wait for things to resolve
                 cy.wait(550).then(() => {
                     // direct requests would have the old device id (hc and session)
-                    checkEachDirectReqForIDandT(afterInitDeviceId, DeviceIdTypeInternalEnumsTest.URL_PROVIDED);
+                    checkEachDirectReqForIDandT(afterInitDeviceId, DeviceIdTypeInternalEnumsTest.URL_PROVIDED, false, true);
 
                     // after ID events
                     checkStoredReqQueueAfterIDChange(changedID, changedIDType, true);

cypress/e2e/integration.cy.js

@@ -16,41 +16,14 @@ function initMain() {
 describe("Integration test", () => {
     it("int, no consent, no offline_mode", () => {
         initMain();
-        const idType = Countly.get_device_id_type();
-        const id = Countly.get_device_id();
-        const consentStatus = Countly.check_any_consent();
-        Countly.remove_consent();
-        Countly.disable_offline_mode();
-        Countly.add_event({ key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } });
-        Countly.start_event("test");
-        Countly.cancel_event("gobbledygook");
-        Countly.end_event("test");
-        Countly.report_conversion("camp_id", "camp_user_id");
-        Countly.recordDirectAttribution("camp_id", "camp_user_id");
-        Countly.user_details({ name: "name" });
-        Countly.userData.set("set", "set");
-        Countly.userData.save();
-        Countly.report_trace({ name: "name", stz: 1, type: "type" });
-        Countly.log_error({ error: "error", stack: "stack" });
-        Countly.add_log("error");
-        Countly.fetch_remote_config();
-        Countly.enrollUserToAb();
-        const remote = Countly.get_remote_config();
-        Countly.track_sessions();
-        Countly.track_pageview();
-        Countly.track_errors();
-        Countly.track_clicks();
-        Countly.track_scrolls();
-        Countly.track_links();
-        Countly.track_forms();
-        Countly.collect_from_forms();
-        Countly.collect_from_facebook();
-        Countly.opt_in();
-        // TODO: widgets
-        // TODO: make better
+        var consentStatus = Countly.check_any_consent();
+        var remote = Countly.get_remote_config();
+        var id = Countly.get_device_id();
+        var idType = Countly.get_device_id_type();
+        hp.integrationMethods();
         cy.fetch_local_request_queue().then((rq) => {
             cy.log(rq);
-            hp.testNormalFlow(rq, "/__cypress/iframes/cypress%5Ce2e%5Cintegration.cy.js", hp.appKey);
+            hp.testNormalFlowInt(rq, "/__cypress/iframes/cypress%5Ce2e%5Cintegration.cy.js", hp.appKey);
             expect(consentStatus).to.equal(true); // no consent necessary
             expect(remote).to.eql({}); // deepEqual
             expect(rq[0].device_id).to.equal(id);

cypress/e2e/remaining_requests.cy.js

@@ -28,10 +28,11 @@ describe("Remaining requests tests ", () => {
                 expect(JSON.parse(queues.requestQ[2]["events"])[0].key).to.equal("[CLY]_orientation");
 
                 var requests = Countly._internals.testingGetRequests();
-                expect(requests.length).to.equal(2);
+                expect(requests.length).to.equal(3);
                 expect(requests[0].params["rr"]).to.equal(undefined);
-                expect(requests[1].params["rr"]).to.equal(3);
-                expect(requests[1].params["av"]).to.equal(av);
+                expect(requests[1].params["rr"]).to.equal(undefined);
+                expect(requests[2].params["rr"]).to.equal(3);
+                expect(requests[2].params["av"]).to.equal(av);
             });
         });
     });