Merge branch 'master' of github.com:EddyVerbruggen/nativescript-plugin-firebase

Author: Dick Smith

CHANGELOG.md

@@ -4,6 +4,13 @@
 [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
 
+## 5.1.8 (2018, March 1)
+
+### New
+
+- [#633](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/633) The plugin is too picky about the name of the entitlements file
+
+
 ## 5.1.7 (2018, February 11)
 
 ### New

demo-ng/app/item/items.component.ts

@@ -268,4 +268,4 @@ export class ItemsComponent {
         })
         .catch(error => console.log("doWebGetValueForCompanies error: " + error));
   }
-}
+}

demo-ng/package.json

@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "~5.2.0",
     "@angular/router": "~5.2.0",
     "nativescript-angular": "~5.2.0",
-    "nativescript-plugin-firebase": "5.1.4",
+    "nativescript-plugin-firebase": "5.1.8",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.10",
     "rxjs": "~5.5.0",

demo/app/App_Resources/iOS/demo.entitlements renamed to demo/app/App_Resources/iOS/app.entitlements

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "5.1.5",
+    "nativescript-plugin-firebase": "5.1.8",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~3.4.0"

demo/package.json

@@ -80,6 +80,8 @@ so it's not removed when you remove and re-add the iOS platform. The relevant co
 	</array>
 ```
 
+> Note that since plugin version 5.1.8 the name of the file can either be `<YourAppName>.entitlements` or `app.entitlements`. `YourAppName` is the iOS foldername, see the path above.
+
 ## Functions
 
 ### invites.sendInvitation

docs/INVITES_DYNAMICLINKS.md

@@ -49,8 +49,7 @@ so it's not removed when you remove and re-add the iOS platform. The relevant co
 	<string>development</string>
 ```
 
-Since plugin version 3.11.0 the plugin will pick up that file during a build and integrates it with the built app
-so you no longer need to continually manually enable push notifications in Xcode.
+> Note that since plugin version 5.1.8 the name of the file can either be `<YourAppName>.entitlements` or `app.entitlements`. `YourAppName` is the iOS foldername, see the path above.
 
 #### Allow processing when a background push is received
 Open `app/App_Resources/iOS/Info.plist` and add this to the bottom:
@@ -62,9 +61,6 @@ Open `app/App_Resources/iOS/Info.plist` and add this to the bottom:
 </array>
 ```
 
-#### Cleanup an old script
-Versions up to 3.9.2 of this plugin added the script `/hooks/after-prepare/firebase-install-ios-entitlements.js`, please remove it.
-
 #### Provisioning hell
 Follow [this guide](https://firebase.google.com/docs/cloud-messaging/ios/certs) to the letter. Once you've done it run `tns run ios` and upon starting the app it should prompt you for notification support. That also works on the simulator, but actually receiving (background) notifications is __only__ possible on a real device.
 
@@ -165,8 +161,8 @@ Using the Firebase Console gives you most flexibility, but you can quickly and e
 curl -X POST --header "Authorization: key=SERVER_KEY" --Header "Content-Type: application/json" https://fcm.googleapis.com/fcm/send -d "{\"notification\":{\"title\": \"My title\", \"text\": \"My text\", \"badge\": \"1\", \"sound\": \"default\"}, \"data\":{\"foo\":\"bar\"}, \"priority\": \"High\", \"to\": \"DEVICE_TOKEN\"}"
 ```
 
-* SERVER_KEY: see below
-* DEVICE_TOKEN: the one you got in `addOnPushTokenReceivedCallback` or `init`'s `onPushTokenReceivedCallback`
+* SERVER_KEY: see the image below (make sure to use the 'Legacy' server key).
+* DEVICE_TOKEN: the one you got in `addOnPushTokenReceivedCallback` or `init`'s `onPushTokenReceivedCallback`.
 
 Examples:
 
@@ -181,3 +177,9 @@ curl -X POST --header "Authorization: key=AAAA9SHtZvM:APA91bGoY0H2nS8GlzzypDXSiU
 If you don't want a badge on the app icon, remove the `badge` property or set it to 0. Note that launching the app clears the badge anyway.
 
 <img src="images/push-server-key.png" width="459px" height="220px" alt="Push server key"/>
+
+## What if iOS doesn't receive notifications in the background?
+Make sure you [`require` the plugin in `app.ts`](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/55cfb4f69cf8939f9101712fed22383196b08d36/demo/app/app.ts#L5)
+*before* `application.start()`, and do `init()` *after* the app has started (not in `app.ts` - not even in a timeout; move it out of `app.ts` entirely!).
+
+> Make sure to use `require`, *not* `import` in `app.ts` because TSC will remove the import in case you're not using it.

docs/MESSAGING.md

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "5.1.7",
+  "version": "5.1.8",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",

src/package.json

@@ -8,11 +8,16 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
       projectRoot = path.join(projectData.platformsDir, "ios"),
       project = path.join(projectRoot, projectData.projectName);
 
+  // look for both <projectname.entitlements and app.entitlements
+  if (!fs.existsSync(entitlementsFile)) {
+    entitlementsFile = path.join(appResourcesDirectoryPath, "iOS", "app.entitlements");
+  }
+
   return new Promise(function (resolve, reject) {
     if (platform === 'ios' && fs.existsSync(entitlementsFile)) {
       var dest = path.join(project, projectData.projectName + ".entitlements");
       fs.createReadStream(entitlementsFile).pipe(fs.createWriteStream(dest));
     }
     resolve();
   });
-};
+};

src/scripts/entitlements-after-prepare.js

@@ -7,6 +7,11 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
       entitlementsFile = path.join(appResourcesDirectoryPath, "iOS", projectData.projectName + ".entitlements"),
       platformResourcesDirectory = path.join(appResourcesDirectoryPath, 'iOS');
 
+  // look for both <projectname.entitlements and app.entitlements
+  if (!fs.existsSync(entitlementsFile)) {
+    entitlementsFile = path.join(appResourcesDirectoryPath, "iOS", "app.entitlements");
+  }
+
   return new Promise(function (resolve, reject) {
     if (platform === 'ios' && fs.existsSync(entitlementsFile)) {
       var target = path.join(platformResourcesDirectory, 'build.xcconfig');
@@ -23,4 +28,4 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
     }
     resolve();
   });
-};
+};