deprecate gcm (2600hz#6221)

* google deprecated gcm in favour of firebase
copelandd · Dec 26, 2019 · e22975c · e22975c
1 parent fb41988
commit e22975c
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 662 deletions.
diff --git a/applications/crossbar/priv/api/swagger.json b/applications/crossbar/priv/api/swagger.json
@@ -34756,30 +34756,6 @@
                         }
                     },
                     "type": "object"
-                },
-                "google": {
-                    "default": {},
-                    "description": "pusher google",
-                    "properties": {
-                        "api_key": {
-                            "description": "API Key for gcm",
-                            "type": "string"
-                        },
-                        "headers": {
-                            "default": {},
-                            "description": "pusher google headers",
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                },
-                "modules": {
-                    "default": [],
-                    "description": "pusher modules",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "type": "object"

diff --git a/applications/crossbar/priv/couchdb/schemas/system_config.pusher.json b/applications/crossbar/priv/couchdb/schemas/system_config.pusher.json
@@ -48,30 +48,6 @@
                 }
             },
             "type": "object"
-        },
-        "google": {
-            "default": {},
-            "description": "pusher google",
-            "properties": {
-                "api_key": {
-                    "description": "API Key for gcm",
-                    "type": "string"
-                },
-                "headers": {
-                    "default": {},
-                    "description": "pusher google headers",
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "modules": {
-            "default": [],
-            "description": "pusher modules",
-            "items": {
-                "type": "string"
-            },
-            "type": "array"
         }
     },
     "type": "object"

diff --git a/applications/crossbar/priv/oas3/oas3-schemas.yml b/applications/crossbar/priv/oas3/oas3-schemas.yml
@@ -12749,24 +12749,6 @@
           'description': pusher firebase headers
           'type': object
       'type': object
-    'google':
-      'default': {}
-      'description': pusher google
-      'properties':
-        'api_key':
-          'description': API Key for gcm
-          'type': string
-        'headers':
-          'default': {}
-          'description': pusher google headers
-          'type': object
-      'type': object
-    'modules':
-      'default': []
-      'description': pusher modules
-      'items':
-        'type': string
-      'type': array
   'type': object
 'system_config.qubicle':
   'description': Schema for qubicle system_config

diff --git a/applications/pusher/src/modules/pm_google.erl b/applications/pusher/src/modules/pm_google.erl
diff --git a/applications/pusher/src/pusher.app.src b/applications/pusher/src/pusher.app.src
@@ -1,11 +1,10 @@
 {application,pusher,
-             [{applications,[apns,fcm,gcm,kazoo,kazoo_amqp,kazoo_apps,
+             [{applications,[apns,fcm,kazoo,kazoo_amqp,kazoo_apps,
                              kazoo_data,kazoo_sip,kazoo_stdlib,kazoo_web,
                              kernel,lager,public_key,stdlib]},
               {description,"pusher - wake the dead"},
               {env,[{is_kazoo_app,true}]},
               {mod,{pusher_app,[]}},
               {modules,[]},
-              {registered,[pusher_cache,pm_google,pm_apple,pusher_sup,
-                           pusher_module_sup]},
+              {registered,[pm_apple,pm_firebase,pusher_sup,pusher_module_sup]},
               {vsn,"4.0.0"}]}.
diff --git a/applications/pusher/src/pusher.hrl b/applications/pusher/src/pusher.hrl
@@ -15,6 +15,8 @@
 -define(TOKEN_KEY, <<"Token-ID">>).
 -define(TOKEN_PROXY_KEY, <<"Proxy-Path">>).
 
+-define(MODULES, ['pm_apple', 'pm_firebase']).
+
 -type push_app() :: {kz_term:api_pid(), map()} | 'undefined'.
 
 -define(PUSHER_HRL, 'true').

diff --git a/applications/pusher/src/pusher_listener.erl b/applications/pusher/src/pusher_listener.erl
@@ -65,14 +65,28 @@
 -spec handle_push(kz_json:object(), kz_term:proplist()) -> 'ok'.
 handle_push(JObj, _Props) ->
     Token = kz_json:get_value(<<"Token-ID">>, JObj),
-    TokenType = kz_json:get_value(<<"Token-Type">>, JObj),
+    TokenType = pm_module(kz_json:get_value(<<"Token-Type">>, JObj)),
     Module = kz_term:to_atom(<<"pm_",TokenType/binary>> , 'true'),
-    lager:debug("pushing for token ~s(~s) to module ~s", [Token, TokenType, Module]),
-    JObj1 = kz_json:insert_value([<<"Payload">>, <<"utc_unix_timestamp_ms">>]
-                                ,kz_term:to_binary(os:system_time(millisecond))
-                                ,JObj
-                                ),
-    gen_server:cast(Module, {'push', JObj1}).
+    case lists:member(Module, ?MODULES)
+        andalso whereis(Module)
+    of
+        'false' ->
+            lager:error("module ~s not available for token ~s(~s)", [Module, Token, TokenType]);
+        'undefined' ->
+            lager:error("module ~s not available for token ~s(~s)", [Module, Token, TokenType]);
+        Pid ->
+            lager:debug("pushing for token ~s(~s) to module ~s", [Token, TokenType, Module]),
+            gen_server:cast(Pid, {'push', add_timestamp_to_payload(JObj)})
+    end.
+
+pm_module(<<"google">>) -> <<"firebase">>;
+pm_module(<<"android">>) -> <<"firebase">>;
+pm_module(Any) -> Any.
+
+add_timestamp_to_payload(JObj) ->
+    kz_json:insert_value([<<"Payload">>, <<"utc_unix_timestamp_ms">>]
+                        ,kz_term:to_binary(os:system_time(millisecond))
+                        ,JObj).
 
 -spec handle_reg_success(kz_json:object(), kz_term:proplist()) -> 'ok'.
 handle_reg_success(JObj, _Props) ->

diff --git a/applications/pusher/src/pusher_module_sup.erl b/applications/pusher/src/pusher_module_sup.erl
@@ -23,9 +23,7 @@
 
 -define(SERVER, ?MODULE).
 
--define(CHILDREN, [ ?WORKER(kz_term:to_atom(Mod, 'true'))
-                    || Mod <- kapps_config:get_ne_binaries(?CONFIG_CAT, <<"modules">>, [])
-                  ]).
+-define(CHILDREN, [?WORKER(Mod) || Mod <- ?MODULES]).
 
 %%%=============================================================================
 %%% API functions

diff --git a/core/gcm/.travis.yml b/core/gcm/.travis.yml
diff --git a/core/gcm/LICENSE b/core/gcm/LICENSE
diff --git a/core/gcm/Makefile b/core/gcm/Makefile