Only call permission request handler when needed

ezzatron · Aug 15, 2023 · 27cec1c · 27cec1c
1 parent e97959f
commit 27cec1c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/location-services.ts b/src/location-services.ts
@@ -26,7 +26,7 @@ export function createLocationServices({
 
   return {
     async requestPermission() {
-      if (handlePermissionRequest) {
+      if (permissionState === PROMPT && handlePermissionRequest) {
         permissionState = await handlePermissionRequest();
       }
 

diff --git a/test/jest/geolocation/get-current-position.spec.ts b/test/jest/geolocation/get-current-position.spec.ts
@@ -128,6 +128,30 @@ describe("Geolocation.getCurrentPosition()", () => {
         expect(successFn).not.toHaveBeenCalled();
       });
     });
+
+    describe("when there is a permission request handler", () => {
+      let handlePermissionRequest: jest.Mock<HandlePermissionRequest>;
+
+      beforeEach(async () => {
+        handlePermissionRequest = jest.fn();
+        locationServices = createLocationServices({
+          handlePermissionRequest,
+        });
+        geolocation = createGeolocation({ locationServices });
+
+        locationServices.setPermissionState(DENIED);
+      });
+
+      describe("when reading the position", () => {
+        beforeEach(async () => {
+          await getCurrentPosition(geolocation, successFn, errorFn);
+        });
+
+        it("does not call the permission request handler", () => {
+          expect(handlePermissionRequest).not.toHaveBeenCalled();
+        });
+      });
+    });
   });
 
   describe("when permission is granted", () => {
@@ -345,6 +369,30 @@ describe("Geolocation.getCurrentPosition()", () => {
         });
       });
     });
+
+    describe("when there is a permission request handler", () => {
+      let handlePermissionRequest: jest.Mock<HandlePermissionRequest>;
+
+      beforeEach(async () => {
+        handlePermissionRequest = jest.fn();
+        locationServices = createLocationServices({
+          handlePermissionRequest,
+        });
+        geolocation = createGeolocation({ locationServices });
+
+        locationServices.setPermissionState(GRANTED);
+      });
+
+      describe("when reading the position", () => {
+        beforeEach(async () => {
+          await getCurrentPosition(geolocation, successFn, errorFn);
+        });
+
+        it("does not call the permission request handler", () => {
+          expect(handlePermissionRequest).not.toHaveBeenCalled();
+        });
+      });
+    });
   });
 
   describe("when permission has not been requested", () => {