@mathrunet/masamune 2.4.3 → 2.4.4

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
+ ## [2.4.4](https://github.com/mathrunet/node_masamune/compare/v2.4.3...v2.4.4) (2024-06-03)
2
+
3
+
4
+ ### fix
5
+
6
+ * Account name support. ([63f9ce7](https://github.com/mathrunet/node_masamune/commit/63f9ce7e64477bdd00f5d177cf5032898cad4af3))
7
+
8
+
9
+
1
10
  ## [2.4.3](https://github.com/mathrunet/node_masamune/compare/v2.4.2...v2.4.3) (2024-05-24)
2
11
 
3
12
 
@@ -65,9 +65,14 @@ const agora_token_1 = require("agora-token");
65
65
  * チャンネル名。
66
66
  *
67
67
  * @param uid
68
- * User ID. Default is 0.
68
+ * User ID. either `acount` or one will be used.
69
69
  *
70
- * ユーザーID。デフォルトは0です。
70
+ * ユーザーID。`acount`とどちらかが利用されます。
71
+ *
72
+ * @param account
73
+ * Account name. Either `acount` or one of the two will be used.
74
+ *
75
+ * アカウント名。`acount`とどちらかが利用されます。
71
76
  *
72
77
  * @param role
73
78
  * Role. You can specify either "audience" or "broadcaster".
@@ -94,18 +99,28 @@ module.exports = (regions, options, data) => {
94
99
  role = agora_token_1.RtcRole.SUBSCRIBER;
95
100
  }
96
101
  const channelName = query.data.name;
97
- let uid = 0;
98
- if (query.data.uid) {
99
- uid = query.data.uid;
100
- }
102
+ const uid = query.data.uid;
103
+ const account = query.data.account;
101
104
  if (!channelName) {
102
105
  throw new functions.https.HttpsError("invalid-argument", "Channel is invalid.");
103
106
  }
104
- const token = agora_token_1.RtcTokenBuilder.buildTokenWithUid(appId, appCertificate, channelName, uid, role, expirationTimeInSeconds, expirationTimeInSeconds);
105
- return {
106
- channel: channelName,
107
- token: token,
108
- };
107
+ if (uid) {
108
+ const token = agora_token_1.RtcTokenBuilder.buildTokenWithUid(appId, appCertificate, channelName, uid, role, expirationTimeInSeconds, expirationTimeInSeconds);
109
+ return {
110
+ channel: channelName,
111
+ token: token,
112
+ };
113
+ }
114
+ else if (account) {
115
+ const token = agora_token_1.RtcTokenBuilder.buildTokenWithUserAccount(appId, appCertificate, channelName, account, role, expirationTimeInSeconds, expirationTimeInSeconds);
116
+ return {
117
+ channel: channelName,
118
+ token: token,
119
+ };
120
+ }
121
+ else {
122
+ throw new functions.https.HttpsError("invalid-argument", "uid or account is required.");
123
+ }
109
124
  }
110
125
  catch (err) {
111
126
  console.error(err);
@@ -1 +1 @@
1
- {"version":3,"file":"agora_token.js","sourceRoot":"","sources":["../../src/functions/agora_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,6CAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAA6B,EAC7B,IAA+B,EACjC,EAAE;;IAAC,OAAA,SAAS,CAAC,KAAK,CAAC,MAAM,CACvB;QACI,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,OAAO;QACjC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;KACrC,EACD,CAAO,KAAK,EAAE,EAAE;;QACZ,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,YAAY,mCAAI,EAAE,CAAC;YAC7C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,qBAAqB,mCAAI,EAAE,CAAC;YAC/D,MAAM,uBAAuB,GAAG,IAAI,CAAC;YACrC,IAAI,IAAI,GAAG,qBAAO,CAAC,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACjC,IAAI,GAAG,qBAAO,CAAC,UAAU,CAAC;YAC9B,CAAC;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACpC,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACjB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,CAAC;YACD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;YACpF,CAAC;YACD,MAAM,KAAK,GAAG,6BAAe,CAAC,iBAAiB,CAC3C,KAAK,EACL,cAAc,EACd,WAAW,EACX,GAAG,EACH,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,CAC1B,CAAC;YACF,OAAO;gBACH,OAAO,EAAE,WAAW;gBACpB,KAAK,EAAE,KAAK;aACf,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}
1
+ {"version":3,"file":"agora_token.js","sourceRoot":"","sources":["../../src/functions/agora_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,6CAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAA6B,EAC7B,IAA+B,EACjC,EAAE;;IAAC,OAAA,SAAS,CAAC,KAAK,CAAC,MAAM,CACvB;QACI,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,OAAO;QACjC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;KACrC,EACD,CAAO,KAAK,EAAE,EAAE;;QACZ,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,YAAY,mCAAI,EAAE,CAAC;YAC7C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,qBAAqB,mCAAI,EAAE,CAAC;YAC/D,MAAM,uBAAuB,GAAG,IAAI,CAAC;YACrC,IAAI,IAAI,GAAG,qBAAO,CAAC,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACjC,IAAI,GAAG,qBAAO,CAAC,UAAU,CAAC;YAC9B,CAAC;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACpC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAgC,CAAC;YACxD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAoC,CAAC;YAChE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;YACpF,CAAC;YACD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,KAAK,GAAG,6BAAe,CAAC,iBAAiB,CAC3C,KAAK,EACL,cAAc,EACd,WAAW,EACX,GAAG,EACH,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,CAC1B,CAAC;gBACF,OAAO;oBACH,OAAO,EAAE,WAAW;oBACpB,KAAK,EAAE,KAAK;iBACf,CAAC;YACN,CAAC;iBAAM,IAAI,OAAO,EAAE,CAAC;gBACjB,MAAM,KAAK,GAAG,6BAAe,CAAC,yBAAyB,CACnD,KAAK,EACL,cAAc,EACd,WAAW,EACX,OAAO,EACP,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,CAC1B,CAAC;gBACF,OAAO;oBACH,OAAO,EAAE,WAAW;oBACpB,KAAK,EAAE,KAAK;iBACf,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mathrunet/masamune",
3
- "version": "2.4.3",
3
+ "version": "2.4.4",
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",