use SimpleMethodPostJson to send the GCM

Yavsc/Controllers/CommandController.cs

@@ -148,11 +148,13 @@ namespace Yavsc.Controllers
                 if (pro.AcceptNotifications
                 && pro.AcceptPublicContact)
                 {
-                    if (pro.Performer.Devices.Count > 0)
+                    if (pro.Performer.Devices.Count > 0) {
-                        grep = await _GCMSender.NotifyAsync(_googleSettings,
+                        var regids = command.PerformerProfile.Performer
-                         command.PerformerProfile.Performer.Devices.Select(d => d.GCMRegistrationId),
+                        .Devices.Select(d => d.GCMRegistrationId);
-                         yaev
+                        var sregids = string.Join(",",regids);
-                          );
+                        _logger.LogWarning($"ApiKey: {_googleSettings.ApiKey} {sregids}");
+                        grep = await _GCMSender.NotifyAsync(_googleSettings,regids,yaev);
+                    }
                     // TODO setup a profile choice to allow notifications
                     // both on mailbox and mobile
                     // if (grep==null || grep.success<=0 || grep.failure>0)

Yavsc/Helpers/GoogleHelpers.cs

@@ -44,7 +44,8 @@ namespace Yavsc.Helpers
         /// <returns>The event.</returns>
         /// <param name="evpub">Evpub.</param>
         public static async Task<MessageWithPayloadResponse> NotifyEvent
-        (this HttpClient channel, GoogleAuthSettings googleSettings, CircleEvent evpub) {
+        (this HttpClient channel, GoogleAuthSettings googleSettings, CircleEvent evpub)
+        {
             // ASSERT ModelState.IsValid implies evpub.Circles != null
             //send a  MessageWithPayload<YaEvent> to circle members
             // receive MessageWithPayloadResponse
@@ -52,37 +53,46 @@ namespace Yavsc.Helpers
 
             var regids = new List<string>();
             foreach (var c in evpub.Circles)
-            foreach (var u in c.Members) {
+                foreach (var u in c.Members)
+                {
                     regids.AddRange(u.Member.Devices.Select(d => d.GCMRegistrationId));
                 }
             if (regids.Count > 0) return null;
             var request = new HttpRequestMessage(HttpMethod.Get, Constants.GCMNotificationUrl);
-            request.Headers.Authorization = new AuthenticationHeaderValue("Key", googleSettings.ApiKey);
+            request.Headers.Authorization = new AuthenticationHeaderValue("key", googleSettings.ApiKey);
-            var msg = new MessageWithPayload<YaEvent> () {
+            var msg = new MessageWithPayload<YaEvent>()
+            {
                 notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "event" },
-                data = evpub , registration_ids = regids.ToArray() };
+                data = evpub,
+                registration_ids = regids.ToArray()
+            };
             var response = await channel.SendAsync(request);
             var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
             return payload.Value<MessageWithPayloadResponse>();
         }
 
-        public static async Task<MessageWithPayloadResponse> NotifyEvent<Event>
+        public static MessageWithPayloadResponse NotifyEvent<Event>
-         (this HttpClient channel, GoogleAuthSettings googleSettings, IEnumerable<string> regids, Event ev)
+         (this GoogleAuthSettings googleSettings, IEnumerable<string> regids, Event ev)
            where Event : YaEvent
         {
-            if (regids == null)
+            var msg = new MessageWithPayload<Event>()
-                throw new NotImplementedException ("Notify & No GCM reg ids");
+            {
-			var request = new HttpRequestMessage(HttpMethod.Get, Constants.GCMNotificationUrl);
+                notification = new Notification()
-            request.Headers.Authorization = new AuthenticationHeaderValue("Key", googleSettings.ApiKey);
+                {
-            var msg = new MessageWithPayload<Event> () {
+                    title = ev.Title,
-                notification = new Notification() { title = ev.Title,
                     body = ev.Description + ev.Comment == null ?
-                        "":"("+ev.Comment+")", icon = "icon" },
+                        "" : "(" + ev.Comment + ")",
-                data = ev, registration_ids = regids.ToArray()  };
+                    icon = "icon"
+                },
+                data = ev,
+                registration_ids = regids.ToArray()
+            };
 
-            var response = await channel.SendAsync(request);
+            if (regids == null)
-            var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
+                throw new NotImplementedException("Notify & No GCM reg ids");
-            return  payload.Value<MessageWithPayloadResponse>();
+            using (var m = new SimpleJsonPostMethod("https://gcm-http.googleapis.com/gcm/send",$"key={googleSettings.ApiKey}")) {
+                return m.Invoke<MessageWithPayloadResponse>(msg);
+            }
         }
         public static async Task<UserCredential> GetCredentialForGoogleApiAsync(this UserManager<ApplicationUser> userManager, ApplicationDbContext context, string uid)
         {