Auto-request authorization in case query is called without permission #11

EddyVerbruggen · EddyVerbruggen · commit 2e34b37c2f06 · 2018-03-09T15:40:56.000+01:00
diff --git a/README.md b/README.md
@@ -54,10 +54,12 @@ export class MyHealthyClass {
 ```
 
 ### `isAvailable`
-This function does not return a Promise; it resolves immediately, and tells you whether or not the device supports Health Data. On iOS this is probably always `true`. On Android the user will be prompted to (automatically) update their Play Services version in case it's not sufficiently up to date.
+This tells you whether or not the device supports Health Data. On iOS this is probably always `true`.
+On Android the user will be prompted to (automatically) update their Play Services version in case it's not sufficiently up to date.
+If you don't want this behavior, pass false to this function, as shown below.
 
 ```typescript
-this.healthData.isAvailable()
+this.healthData.isAvailable(false)
     .then(available => console.log(available));
 ```
 
@@ -98,6 +100,9 @@ By default data is not aggregated, so all individual datapoints are returned.
 This plugin however offers a way to aggregate the data by either `hour`, `day`, or `sourceAndDay`,
 the latter will enable you to read daily data per source (Fitbit, Nike Run Club, manual entry, etc).
 
+If you didn't run `requestAuthorization` before running `query`,
+the plugin will run `requestAuthorization` for you (for the requested `dataType`). You're welcome. 😉 
+
 ```typescript
 this.healthData.query(
     {
diff --git a/demo-ng/app/app.component.ts b/demo-ng/app/app.component.ts
@@ -9,8 +9,8 @@ import { AggregateBy, HealthData, HealthDataType } from "nativescript-health-dat
 
 export class AppComponent {
   private static TYPES: Array<HealthDataType> = [
-    {name: "height", accessType: "write"},
-    {name: "weight", accessType: "readAndWrite"},
+    {name: "height", accessType: "read"},
+    {name: "weight", accessType: "readAndWrite"}, // just for show
     {name: "steps", accessType: "read"},
     {name: "distance", accessType: "read"},
     {name: "heartRate", accessType: "read"},
@@ -25,13 +25,17 @@ export class AppComponent {
   }
 
   isAvailable(): void {
-    this.healthData.isAvailable()
+    this.healthData.isAvailable(true)
         .then(available => this.resultToShow = available ? "Health Data available" : "Health Data not available :(");
   }
 
   isAuthorized(): void {
     this.healthData.isAuthorized([<HealthDataType>{name: "weight", accessType: "read"}])
-        .then(authorized => this.resultToShow = (authorized ? "" : "Not ") + "authorized for " + JSON.stringify(AppComponent.TYPES));
+        .then(authorized => setTimeout(() => alert({
+          title: "Authentication result",
+          message: (authorized ? "" : "Not ") + "authorized for " + JSON.stringify(AppComponent.TYPES),
+          okButtonText: "Ok!"
+        }), 300))
   }
 
   requestAuthForVariousTypes(): void {
diff --git a/src/health-data.android.ts b/src/health-data.android.ts
@@ -18,14 +18,14 @@ const FitnessOptions = com.google.android.gms.fitness.FitnessOptions;
 const GoogleSignIn = com.google.android.gms.auth.api.signin.GoogleSignIn;
 
 export class HealthData extends Common implements HealthDataApi {
-  isAvailable(): Promise<boolean> {
+  isAvailable(updateGooglePlayServicesIfNeeded = true): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
       const gApi = GoogleApiAvailability.getInstance();
       const apiResult = gApi.isGooglePlayServicesAvailable(utils.ad.getApplicationContext());
       const available = apiResult === com.google.android.gms.common.ConnectionResult.SUCCESS;
-      if (!available && gApi.isUserResolvableError(apiResult)) {
+      if (!available && updateGooglePlayServicesIfNeeded && gApi.isUserResolvableError(apiResult)) {
         // show a dialog offering the user to update (no need to wait for it to finish)
-        gApi.showErrorDialogFragment(application.android.foregroundActivity, apiResult, 1, new android.content.DialogInterface.OnCancelListener({
+        gApi.showErrorDialogFragment(application.android.foregroundActivity || application.android.startActivity, apiResult, 1, new android.content.DialogInterface.OnCancelListener({
           onCancel: dialogInterface => console.log("Google Play Services update dialog was canceled")
         }));
       }
@@ -81,31 +81,40 @@ export class HealthData extends Common implements HealthDataApi {
   query(opts: QueryRequest): Promise<Array<ResponseItem>> {
     return new Promise((resolve, reject) => {
       try {
-        const readRequest = new DataReadRequest.Builder()
-        // using 'read' instead of 'aggregate' for now, for more finegrain control
-        //     .aggregate(DataType.TYPE_STEP_COUNT_DELTA, DataType.AGGREGATE_STEP_COUNT_DELTA)
-        //     .bucketByTime(1, TimeUnit.HOURS)
-            .read(this.getDataType(opts.dataType))
-            .setTimeRange(opts.startDate.getTime(), opts.endDate.getTime(), TimeUnit.MILLISECONDS)
-            .build();
-
-        Fitness.getHistoryClient(application.android.currentContext, GoogleSignIn.getLastSignedInAccount(application.android.currentContext))
-            .readData(readRequest)
-            .addOnSuccessListener(new com.google.android.gms.tasks.OnSuccessListener({
-              onSuccess: (dataReadResponse: any /* com.google.android.gms.fitness.result.DataReadResponse */) => {
-                resolve(this.parseData(dataReadResponse.getResult(), opts));
-              }
-            }))
-            .addOnFailureListener(new com.google.android.gms.tasks.OnFailureListener({
-              onFailure: (exception: any) => {
-                reject(exception.getMessage());
-              }
-            }))
-            .addOnCompleteListener(new com.google.android.gms.tasks.OnCompleteListener({
-              onComplete: (task: any) => {
-                // noop
-              }
-            }));
+        // make sure the user is authorized
+        this.requestAuthorization([{ name: opts.dataType, accessType: "read"}]).then(authorized => {
+          if (!authorized) {
+            reject("Not authorized");
+            return;
+          }
+
+          const readRequest = new DataReadRequest.Builder()
+          // using 'read' instead of 'aggregate' for now, for more finegrain control
+          //     .aggregate(DataType.TYPE_STEP_COUNT_DELTA, DataType.AGGREGATE_STEP_COUNT_DELTA)
+          //     .bucketByTime(1, TimeUnit.HOURS)
+              .read(this.getDataType(opts.dataType))
+              .setTimeRange(opts.startDate.getTime(), opts.endDate.getTime(), TimeUnit.MILLISECONDS)
+              .build();
+
+          Fitness.getHistoryClient(application.android.currentContext, GoogleSignIn.getLastSignedInAccount(application.android.currentContext))
+              .readData(readRequest)
+              .addOnSuccessListener(new com.google.android.gms.tasks.OnSuccessListener({
+                onSuccess: (dataReadResponse: any /* com.google.android.gms.fitness.result.DataReadResponse */) => {
+                  resolve(this.parseData(dataReadResponse.getResult(), opts));
+                }
+              }))
+              .addOnFailureListener(new com.google.android.gms.tasks.OnFailureListener({
+                onFailure: (exception: any) => {
+                  reject(exception.getMessage());
+                }
+              }))
+              .addOnCompleteListener(new com.google.android.gms.tasks.OnCompleteListener({
+                onComplete: (task: any) => {
+                  // noop
+                }
+              }));
+        });
+
       } catch (e) {
         reject(e);
       }
diff --git a/src/health-data.common.ts b/src/health-data.common.ts
@@ -75,7 +75,7 @@ export function createErrorResponse(action: string, description: string): ErrorR
 */
 
 export interface HealthDataApi {
-  isAvailable(): Promise<boolean>;
+  isAvailable(updateGooglePlayServicesIfNeeded? /* for Android, default true */: boolean): Promise<boolean>;
 
   isAuthorized(types: Array<HealthDataType>): Promise<boolean>;
 
diff --git a/src/health-data.ios.ts b/src/health-data.ios.ts
@@ -1,4 +1,4 @@
-import { AggregateBy, Common, HealthDataApi, HealthDataType, QueryRequest, ResponseItem } from './health-data.common';
+import { Common, HealthDataApi, HealthDataType, QueryRequest, ResponseItem } from './health-data.common';
 
 export class HealthData extends Common implements HealthDataApi {
   private healthStore: HKHealthStore;
@@ -10,7 +10,7 @@ export class HealthData extends Common implements HealthDataApi {
     }
   }
 
-  isAvailable(): Promise<boolean> {
+  isAvailable(updateGooglePlayServicesIfNeeded? /* for Android */: boolean): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
       resolve(this.healthStore !== undefined);
     });
@@ -62,20 +62,28 @@ export class HealthData extends Common implements HealthDataApi {
 
   query(opts: QueryRequest): Promise<Array<ResponseItem>> {
     return new Promise((resolve, reject) => {
-      let typeOfData = acceptableDataTypes[opts.dataType];
-      if (quantityTypes[typeOfData] || categoryTypes[typeOfData]) {
-        this.queryForQuantityOrCategoryData(typeOfData, opts, (res, error) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(res);
-          }
-        });
-      // } else if (characteristicTypes[typeOfData]) {
-      //   resolve(this.queryForCharacteristicData(typeOfData));
-      } else {
-        reject('Type not supported (yet)');
-      }
+      // make sure the user is authorized
+      this.requestAuthorization([{ name: opts.dataType, accessType: "read"}]).then(authorized => {
+        if (!authorized) {
+          reject("Not authorized");
+          return;
+        }
+
+        let typeOfData = acceptableDataTypes[opts.dataType];
+        if (quantityTypes[typeOfData] || categoryTypes[typeOfData]) {
+          this.queryForQuantityOrCategoryData(typeOfData, opts, (res, error) => {
+            if (error) {
+              reject(error);
+            } else {
+              resolve(res);
+            }
+          });
+          // } else if (characteristicTypes[typeOfData]) {
+          //   resolve(this.queryForCharacteristicData(typeOfData));
+        } else {
+          reject('Type not supported (yet)');
+        }
+      });
     });
   }
 
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-health-data",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Health Data plugin for Nativescript, using Google Fit and Apple HealthKit.",
   "main": "health-data",
   "typings": "index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-health-data",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "Health Data plugin for Nativescript, using Google Fit and Apple HealthKit.",`
`5`	`5`	`"main": "health-data",`
`6`	`6`	`"typings": "index.d.ts",`