@mathrunet/masamune 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## [0.1.3](https://github.com/mathrunet/node_masamune/compare/v0.1.2...v0.1.3) (2023-02-09)
2
+
3
+
4
+ ### fix
5
+
6
+ * Fixed a bug that Topic and Token could not be found. ([530a991](https://github.com/mathrunet/node_masamune/commit/530a991eeb5946d4ac82c5f9c7bc3a667605d783))
7
+
8
+
9
+
1
10
  ## [0.1.2](https://github.com/mathrunet/node_masamune/compare/v0.1.1...v0.1.2) (2023-02-08)
2
11
 
3
12
 
@@ -77,31 +77,55 @@ module.exports = (regions) => functions.region(...regions).https.onCall((query)
77
77
  const data = query.data;
78
78
  const token = query.token;
79
79
  const topic = query.topic;
80
- if (token === undefined || topic === undefined) {
80
+ if (token === undefined && topic === undefined) {
81
81
  throw new functions.https.HttpsError("invalid-argument", "Either [token] or [topic] must be specified.");
82
82
  }
83
- const res = yield admin.messaging().send({
84
- notification: {
85
- title: title,
86
- body: body,
87
- },
88
- android: {
89
- priority: "high",
83
+ if (token !== undefined) {
84
+ const res = yield admin.messaging().send({
90
85
  notification: {
91
86
  title: title,
92
87
  body: body,
93
- clickAction: "FLUTTER_NOTIFICATION_CLICK",
94
- channelId: channelId,
95
88
  },
96
- },
97
- data: data,
98
- token: token,
99
- topic: topic,
100
- });
101
- return {
102
- success: true,
103
- message_id: res,
104
- };
89
+ android: {
90
+ priority: "high",
91
+ notification: {
92
+ title: title,
93
+ body: body,
94
+ clickAction: "FLUTTER_NOTIFICATION_CLICK",
95
+ channelId: channelId,
96
+ },
97
+ },
98
+ data: data,
99
+ token: token,
100
+ });
101
+ return {
102
+ success: true,
103
+ message_id: res,
104
+ };
105
+ }
106
+ else if (topic !== undefined) {
107
+ const res = yield admin.messaging().send({
108
+ notification: {
109
+ title: title,
110
+ body: body,
111
+ },
112
+ android: {
113
+ priority: "high",
114
+ notification: {
115
+ title: title,
116
+ body: body,
117
+ clickAction: "FLUTTER_NOTIFICATION_CLICK",
118
+ channelId: channelId,
119
+ },
120
+ },
121
+ data: data,
122
+ topic: topic,
123
+ });
124
+ return {
125
+ success: true,
126
+ message_id: res,
127
+ };
128
+ }
105
129
  }
106
130
  catch (err) {
107
131
  console.log(err);
@@ -1 +1 @@
1
- {"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAC7E,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAgC,CAAC;QACzD,MAAM,IAAI,GAAG,KAAK,CAAC,IAA6C,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,KAA2B,CAAC;QAChD,MAAM,KAAK,GAAG,KAAK,CAAC,KAA2B,CAAC;QAChD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE;YAC5C,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,8CAA8C,CAAC,CAAC;SAC5G;QACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CACpC;YACI,YAAY,EAAE;gBACV,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,IAAI;aACb;YACD,OAAO,EAAE;gBACL,QAAQ,EAAE,MAAM;gBAChB,YAAY,EAAE;oBACV,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,4BAA4B;oBACzC,SAAS,EAAE,SAAS;iBACvB;aACJ;YACD,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACf,CACJ,CAAC;QACF,OAAO;YACH,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;SAClB,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
1
+ {"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAC7E,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAgC,CAAC;QACzD,MAAM,IAAI,GAAG,KAAK,CAAC,IAA6C,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,KAA2B,CAAC;QAChD,MAAM,KAAK,GAAG,KAAK,CAAC,KAA2B,CAAC;QAChD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE;YAC5C,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,8CAA8C,CAAC,CAAC;SAC5G;QAED,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CACpC;gBACI,YAAY,EAAE;oBACV,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;iBACb;gBACD,OAAO,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,YAAY,EAAE;wBACV,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,IAAI;wBACV,WAAW,EAAE,4BAA4B;wBACzC,SAAS,EAAE,SAAS;qBACvB;iBACJ;gBACD,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf,CACJ,CAAC;YACF,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,GAAG;aAClB,CAAC;SACL;aAAM,IAAI,KAAK,KAAK,SAAS,EAAG;YAC7B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CACpC;gBACI,YAAY,EAAE;oBACV,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,IAAI;iBACb;gBACD,OAAO,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,YAAY,EAAE;wBACV,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,IAAI;wBACV,WAAW,EAAE,4BAA4B;wBACzC,SAAS,EAAE,SAAS;qBACvB;iBACJ;gBACD,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACf,CACJ,CAAC;YACF,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,GAAG;aAClB,CAAC;SACL;KACJ;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mathrunet/masamune",
3
- "version": "0.1.2",
3
+ "version": "0.1.3",
4
4
  "description": "Manages packages for the server portion (NodeJS) of the Masamune framework.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",