Merge pull request #2 from spoonconsulting/ios-fix

Ios fix

Author: HashirRajah

.github/workflows/npm-publish.yml

@@ -0,0 +1,12 @@
+name: Node.js Package
+on: push
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: bahmutov/npm-install@v1
+      - id: publish
+        uses: JS-DevTools/npm-publish@v2
+        with:
+          token: ${{ secrets.npm_token }}

package-lock.json

@@ -1,26 +1,28 @@
 {
-  "name": "cordova-plugin-firebase-messaging",
-  "version": "8.0.1",
+  "name": "@spoonconsulting/cordova-plugin-firebase-messaging",
+  "version": "1.0.0",
   "description": "Cordova plugin for Firebase Messaging",
   "types": "./types/index.d.ts",
   "cordova": {
-    "id": "cordova-plugin-firebase-messaging",
+    "id": "@spoonconsulting/cordova-plugin-firebase-messaging",
     "platforms": [
       "ios",
       "android"
     ]
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/chemerisuk/cordova-plugin-firebase-messaging.git"
+    "url": "git+https://github.com/spoonconsulting/cordova-plugin-firebase-messaging.git"
   },
-  "author": "Maksim Chemerisuk <[email protected]> (https://github.com/chemerisuk)",
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": "Maksim Chemerisuk <[email protected]> (https://github.com/chemerisuk) & Hashir Rajah",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/chemerisuk/cordova-plugin-firebase-messaging/issues"
+    "url": "https://github.com/spoonconsulting/cordova-plugin-firebase-messaging/issues"
   },
-  "homepage": "https://github.com/chemerisuk/cordova-plugin-firebase-messaging#readme",
-  "funding": "https://github.com/chemerisuk/cordova-plugin-firebase-messaging?sponsor=1",
+  "homepage": "https://github.com/spoonconsulting/cordova-plugin-firebase-messaging#readme",
   "keywords": [
     "cordova",
     "firebase",
@@ -32,16 +34,5 @@
     "cordova-android",
     "cordova-ios"
   ],
-  "scripts": {
-    "preversion": "npm run docs && rm -rf docs",
-    "version": "perl -i -pe 's/(version=)\"\\d+\\.\\d+\\.\\d+\"/$1\"'$npm_package_version'\"$2/' plugin.xml && git add .",
-    "postversion": "git push && git push --tags",
-    "predocs": "tsc www/* --declaration --allowJs --checkJs --lib es2015,dom --emitDeclarationOnly --outDir types",
-    "docs": "typedoc && perl -i -pe 's/README.md#/#/g' ./docs/README.md",
-    "postdocs": "perl -i -0pe 's/(<!-- TypedocGenerated -->).*/$1\n\n/gms' README.md && cat ./docs/README.md >> README.md"
-  },
-  "devDependencies": {
-    "typedoc": "^0.23.9",
-    "typedoc-plugin-markdown": "^3.13.4"
-  }
+  "scripts": {}
 }

package.json

@@ -1,14 +1,14 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android"
-           id="cordova-plugin-firebase-messaging"
-      version="8.0.1">
+           id="@spoonconsulting/cordova-plugin-firebase-messaging"
+      version="1.0.0">
 
     <name>FirebaseMessagingPlugin</name>
     <description>Cordova plugin for Firebase Cloud Messaging</description>
     <license>MIT</license>
     <keywords>cordova</keywords>
-    <repo>https://github.com/chemerisuk/cordova-plugin-firebase-messaging</repo>
-    <issue>https://github.com/chemerisuk/cordova-plugin-firebase-messaging/issues</issue>
+    <repo>https://github.com/spoonconsulting/cordova-plugin-firebase-messaging</repo>
+    <issue>https://github.com/spoonconsulting/cordova-plugin-firebase-messaging/issues</issue>
 
     <js-module src="www/FirebaseMessaging.js" name="FirebaseMessaging">
         <merges target="cordova.plugins.firebase.messaging" />
@@ -62,7 +62,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
 
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="FirebaseMessaging">
-                <param name="android-package" value="by.chemerisuk.cordova.firebase.FirebaseMessagingPlugin" />
+                <param name="android-package" value="com.spoon.cordova.firebase.FirebaseMessagingPlugin" />
                 <param name="onload" value="true" />
             </feature>
         </config-file>
@@ -74,7 +74,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
-            <service android:name="by.chemerisuk.cordova.firebase.FirebaseMessagingPluginService" android:exported="false">
+            <service android:name="com.spoon.cordova.firebase.FirebaseMessagingPluginService" android:exported="false">
                 <intent-filter>
                     <action android:name="com.google.firebase.MESSAGING_EVENT"/>
                 </intent-filter>
@@ -89,9 +89,9 @@ xmlns:android="http://schemas.android.com/apk/res/android"
         <framework src="me.leolin:ShortcutBadger:1.1.22@aar"/>
 
         <source-file src="src/android/FirebaseMessagingPlugin.java"
-            target-dir="src/by/chemerisuk/cordova/firebase/" />
+            target-dir="src/com/spoon/cordova/firebase/" />
         <source-file src="src/android/FirebaseMessagingPluginService.java"
-            target-dir="src/by/chemerisuk/cordova/firebase" />
+            target-dir="src/com/spoon/cordova/firebase" />
     </platform>
 
 </plugin>

plugin.xml

@@ -1,5 +1,5 @@
 
-package by.chemerisuk.cordova.firebase;
+package com.spoon.cordova.firebase;
 
 import android.Manifest;
 import android.app.NotificationManager;

src/android/FirebaseMessagingPlugin.java

@@ -1,4 +1,4 @@
-package by.chemerisuk.cordova.firebase;
+package com.spoon.cordova.firebase;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -26,10 +26,10 @@
 public class FirebaseMessagingPluginService extends FirebaseMessagingService {
     private static final String TAG = "FCMPluginService";
 
-    public static final String ACTION_FCM_MESSAGE = "by.chemerisuk.cordova.firebase.ACTION_FCM_MESSAGE";
-    public static final String EXTRA_FCM_MESSAGE = "by.chemerisuk.cordova.firebase.EXTRA_FCM_MESSAGE";
-    public static final String ACTION_FCM_TOKEN = "by.chemerisuk.cordova.firebase.ACTION_FCM_TOKEN";
-    public static final String EXTRA_FCM_TOKEN = "by.chemerisuk.cordova.firebase.EXTRA_FCM_TOKEN";
+    public static final String ACTION_FCM_MESSAGE = "com.spoon.cordova.firebase.ACTION_FCM_MESSAGE";
+    public static final String EXTRA_FCM_MESSAGE = "com.spoon.cordova.firebase.EXTRA_FCM_MESSAGE";
+    public static final String ACTION_FCM_TOKEN = "com.spoon.cordova.firebase.ACTION_FCM_TOKEN";
+    public static final String EXTRA_FCM_TOKEN = "com.spoon.cordova.firebase.EXTRA_FCM_TOKEN";
     public final static String NOTIFICATION_ICON_KEY = "com.google.firebase.messaging.default_notification_icon";
     public final static String NOTIFICATION_COLOR_KEY = "com.google.firebase.messaging.default_notification_color";
     public final static String NOTIFICATION_CHANNEL_KEY = "com.google.firebase.messaging.default_notification_channel_id";

src/android/FirebaseMessagingPluginService.java

@@ -2,6 +2,8 @@
 #import "FirebaseMessagingPlugin.h"
 #import <objc/runtime.h>
 
+@import FirebaseCore;
+
 @implementation AppDelegate (FirebaseMessagingPlugin)
 
 // Borrowed from http://nshipster.com/method-swizzling/
@@ -36,8 +38,21 @@ + (void)load {
 - (BOOL)identity_application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // always call original method implementation first
     BOOL handled = [self identity_application:application didFinishLaunchingWithOptions:launchOptions];
+    if(![FIRApp defaultApp]) {
+        [FIRApp configure];
+    }
 
+    [FIRMessaging messaging].delegate = self;
     [UNUserNotificationCenter currentNotificationCenter].delegate = self;
+    UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert |
+        UNAuthorizationOptionSound | UNAuthorizationOptionBadge;
+    [[UNUserNotificationCenter currentNotificationCenter]
+        requestAuthorizationWithOptions:authOptions
+        completionHandler:^(BOOL granted, NSError * _Nullable error) {
+          // ...
+        }];
+
+    [application registerForRemoteNotifications];
 
 //    if (launchOptions) {
 //        NSDictionary *userInfo = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];

src/ios/AppDelegate+FirebaseMessagingPlugin.m

@@ -9,10 +9,6 @@ @implementation FirebaseMessagingPlugin
 
 - (void)pluginInitialize {
     NSLog(@"Starting Firebase Messaging plugin");
-
-    if(![FIRApp defaultApp]) {
-        [FIRApp configure];
-    }
 }
 
 - (void)requestPermission:(CDVInvokedUrlCommand *)command {