acebase-server 1.10.0 → 1.12.0

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.
Files changed (250) hide show
  1. package/dist/cjs/index.js +16 -0
  2. package/dist/cjs/index.js.map +1 -1
  3. package/dist/cjs/logger.js +74 -0
  4. package/dist/cjs/logger.js.map +1 -0
  5. package/dist/cjs/middleware/admin-only.js +29 -0
  6. package/dist/cjs/middleware/admin-only.js.map +1 -0
  7. package/dist/cjs/middleware/user.js +4 -4
  8. package/dist/cjs/middleware/user.js.map +1 -1
  9. package/dist/cjs/oauth-providers/dropbox.js +3 -2
  10. package/dist/cjs/oauth-providers/dropbox.js.map +1 -1
  11. package/dist/cjs/oauth-providers/facebook.js +3 -2
  12. package/dist/cjs/oauth-providers/facebook.js.map +1 -1
  13. package/dist/cjs/oauth-providers/google.js +3 -2
  14. package/dist/cjs/oauth-providers/google.js.map +1 -1
  15. package/dist/cjs/oauth-providers/index.js.map +1 -1
  16. package/dist/cjs/oauth-providers/instagram.js +3 -2
  17. package/dist/cjs/oauth-providers/instagram.js.map +1 -1
  18. package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
  19. package/dist/cjs/oauth-providers/oauth-provider.js.map +1 -1
  20. package/dist/cjs/oauth-providers/spotify.js +3 -2
  21. package/dist/cjs/oauth-providers/spotify.js.map +1 -1
  22. package/dist/cjs/routes/auth-change-password.js +7 -4
  23. package/dist/cjs/routes/auth-change-password.js.map +1 -1
  24. package/dist/cjs/routes/auth-delete.js +9 -7
  25. package/dist/cjs/routes/auth-delete.js.map +1 -1
  26. package/dist/cjs/routes/auth-forgot-password.js +9 -6
  27. package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
  28. package/dist/cjs/routes/auth-reset-password.js +5 -3
  29. package/dist/cjs/routes/auth-reset-password.js.map +1 -1
  30. package/dist/cjs/routes/auth-signout.js +6 -4
  31. package/dist/cjs/routes/auth-signout.js.map +1 -1
  32. package/dist/cjs/routes/auth-signup.js +17 -15
  33. package/dist/cjs/routes/auth-signup.js.map +1 -1
  34. package/dist/cjs/routes/auth-update.js +9 -6
  35. package/dist/cjs/routes/auth-update.js.map +1 -1
  36. package/dist/cjs/routes/auth-verify-email.js +6 -3
  37. package/dist/cjs/routes/auth-verify-email.js.map +1 -1
  38. package/dist/cjs/routes/data-index-create.js +3 -5
  39. package/dist/cjs/routes/data-index-create.js.map +1 -1
  40. package/dist/cjs/routes/data-index-delete.js +2 -4
  41. package/dist/cjs/routes/data-index-delete.js.map +1 -1
  42. package/dist/cjs/routes/data-index-list.js +2 -4
  43. package/dist/cjs/routes/data-index-list.js.map +1 -1
  44. package/dist/cjs/routes/data-reflect.js +2 -4
  45. package/dist/cjs/routes/data-reflect.js.map +1 -1
  46. package/dist/cjs/routes/data-schema-get.js +2 -4
  47. package/dist/cjs/routes/data-schema-get.js.map +1 -1
  48. package/dist/cjs/routes/data-schema-set.js +2 -4
  49. package/dist/cjs/routes/data-schema-set.js.map +1 -1
  50. package/dist/cjs/routes/data-schema-test.js +2 -4
  51. package/dist/cjs/routes/data-schema-test.js.map +1 -1
  52. package/dist/cjs/routes/data-schemas-list.js +2 -4
  53. package/dist/cjs/routes/data-schemas-list.js.map +1 -1
  54. package/dist/cjs/routes/data-set.js +11 -7
  55. package/dist/cjs/routes/data-set.js.map +1 -1
  56. package/dist/cjs/routes/data-sync-changes.js.map +1 -1
  57. package/dist/cjs/routes/data-sync-mutations.js.map +1 -1
  58. package/dist/cjs/routes/data-transaction.js +30 -10
  59. package/dist/cjs/routes/data-transaction.js.map +1 -1
  60. package/dist/cjs/routes/data-update.js +11 -6
  61. package/dist/cjs/routes/data-update.js.map +1 -1
  62. package/dist/cjs/routes/meta-info.js.map +1 -1
  63. package/dist/cjs/routes/meta-logs.js +50 -0
  64. package/dist/cjs/routes/meta-logs.js.map +1 -0
  65. package/dist/cjs/routes/meta.js +3 -0
  66. package/dist/cjs/routes/meta.js.map +1 -1
  67. package/dist/cjs/routes/oauth2-signin.js +15 -11
  68. package/dist/cjs/routes/oauth2-signin.js.map +1 -1
  69. package/dist/cjs/rules.js +5 -5
  70. package/dist/cjs/rules.js.map +1 -1
  71. package/dist/cjs/server.js +6 -4
  72. package/dist/cjs/server.js.map +1 -1
  73. package/dist/cjs/settings/index.js +6 -7
  74. package/dist/cjs/settings/index.js.map +1 -1
  75. package/dist/cjs/shared/clients.js.map +1 -1
  76. package/dist/cjs/shared/env.js.map +1 -1
  77. package/dist/cjs/shared/http.js.map +1 -1
  78. package/dist/cjs/shared/signin.js +8 -3
  79. package/dist/cjs/shared/signin.js.map +1 -1
  80. package/dist/cjs/start.js +3 -0
  81. package/dist/cjs/start.js.map +1 -1
  82. package/dist/cjs/websocket/index.js +43 -24
  83. package/dist/cjs/websocket/index.js.map +1 -1
  84. package/dist/cjs/websocket/socket.io.js +8 -11
  85. package/dist/cjs/websocket/socket.io.js.map +1 -1
  86. package/dist/esm/index.js +2 -0
  87. package/dist/esm/index.js.map +1 -1
  88. package/dist/esm/logger.js +52 -0
  89. package/dist/esm/logger.js.map +1 -0
  90. package/dist/esm/middleware/admin-only.js +25 -0
  91. package/dist/esm/middleware/admin-only.js.map +1 -0
  92. package/dist/esm/middleware/user.js +4 -4
  93. package/dist/esm/middleware/user.js.map +1 -1
  94. package/dist/esm/oauth-providers/dropbox.js +3 -2
  95. package/dist/esm/oauth-providers/dropbox.js.map +1 -1
  96. package/dist/esm/oauth-providers/facebook.js +3 -2
  97. package/dist/esm/oauth-providers/facebook.js.map +1 -1
  98. package/dist/esm/oauth-providers/google.js +3 -2
  99. package/dist/esm/oauth-providers/google.js.map +1 -1
  100. package/dist/esm/oauth-providers/index.js.map +1 -1
  101. package/dist/esm/oauth-providers/instagram.js +3 -2
  102. package/dist/esm/oauth-providers/instagram.js.map +1 -1
  103. package/dist/esm/oauth-providers/oauth-provider.js +21 -1
  104. package/dist/esm/oauth-providers/oauth-provider.js.map +1 -1
  105. package/dist/esm/oauth-providers/spotify.js +3 -2
  106. package/dist/esm/oauth-providers/spotify.js.map +1 -1
  107. package/dist/esm/routes/auth-change-password.js +6 -3
  108. package/dist/esm/routes/auth-change-password.js.map +1 -1
  109. package/dist/esm/routes/auth-delete.js +7 -5
  110. package/dist/esm/routes/auth-delete.js.map +1 -1
  111. package/dist/esm/routes/auth-forgot-password.js +8 -6
  112. package/dist/esm/routes/auth-forgot-password.js.map +1 -1
  113. package/dist/esm/routes/auth-reset-password.js +4 -2
  114. package/dist/esm/routes/auth-reset-password.js.map +1 -1
  115. package/dist/esm/routes/auth-signout.js +4 -2
  116. package/dist/esm/routes/auth-signout.js.map +1 -1
  117. package/dist/esm/routes/auth-signup.js +12 -10
  118. package/dist/esm/routes/auth-signup.js.map +1 -1
  119. package/dist/esm/routes/auth-update.js +8 -6
  120. package/dist/esm/routes/auth-update.js.map +1 -1
  121. package/dist/esm/routes/auth-verify-email.js +6 -2
  122. package/dist/esm/routes/auth-verify-email.js.map +1 -1
  123. package/dist/esm/routes/data-index-create.js +4 -6
  124. package/dist/esm/routes/data-index-create.js.map +1 -1
  125. package/dist/esm/routes/data-index-delete.js +3 -5
  126. package/dist/esm/routes/data-index-delete.js.map +1 -1
  127. package/dist/esm/routes/data-index-list.js +3 -5
  128. package/dist/esm/routes/data-index-list.js.map +1 -1
  129. package/dist/esm/routes/data-reflect.js +1 -4
  130. package/dist/esm/routes/data-reflect.js.map +1 -1
  131. package/dist/esm/routes/data-schema-get.js +3 -5
  132. package/dist/esm/routes/data-schema-get.js.map +1 -1
  133. package/dist/esm/routes/data-schema-set.js +3 -5
  134. package/dist/esm/routes/data-schema-set.js.map +1 -1
  135. package/dist/esm/routes/data-schema-test.js +3 -5
  136. package/dist/esm/routes/data-schema-test.js.map +1 -1
  137. package/dist/esm/routes/data-schemas-list.js +3 -5
  138. package/dist/esm/routes/data-schemas-list.js.map +1 -1
  139. package/dist/esm/routes/data-set.js +9 -5
  140. package/dist/esm/routes/data-set.js.map +1 -1
  141. package/dist/esm/routes/data-sync-changes.js.map +1 -1
  142. package/dist/esm/routes/data-sync-mutations.js.map +1 -1
  143. package/dist/esm/routes/data-transaction.js +28 -8
  144. package/dist/esm/routes/data-transaction.js.map +1 -1
  145. package/dist/esm/routes/data-update.js +9 -4
  146. package/dist/esm/routes/data-update.js.map +1 -1
  147. package/dist/esm/routes/meta-info.js.map +1 -1
  148. package/dist/esm/routes/meta-logs.js +36 -0
  149. package/dist/esm/routes/meta-logs.js.map +1 -0
  150. package/dist/esm/routes/meta.js +3 -0
  151. package/dist/esm/routes/meta.js.map +1 -1
  152. package/dist/esm/routes/oauth2-signin.js +14 -10
  153. package/dist/esm/routes/oauth2-signin.js.map +1 -1
  154. package/dist/esm/rules.js +5 -5
  155. package/dist/esm/rules.js.map +1 -1
  156. package/dist/esm/server.js +6 -4
  157. package/dist/esm/server.js.map +1 -1
  158. package/dist/esm/settings/index.js +5 -6
  159. package/dist/esm/settings/index.js.map +1 -1
  160. package/dist/esm/shared/clients.js.map +1 -1
  161. package/dist/esm/shared/env.js.map +1 -1
  162. package/dist/esm/shared/http.js.map +1 -1
  163. package/dist/esm/shared/signin.js +7 -3
  164. package/dist/esm/shared/signin.js.map +1 -1
  165. package/dist/esm/start.js +3 -0
  166. package/dist/esm/start.js.map +1 -1
  167. package/dist/esm/websocket/index.js +38 -23
  168. package/dist/esm/websocket/index.js.map +1 -1
  169. package/dist/esm/websocket/socket.io.js +9 -11
  170. package/dist/esm/websocket/socket.io.js.map +1 -1
  171. package/dist/types/index.d.ts +2 -0
  172. package/dist/types/logger.d.ts +35 -0
  173. package/dist/types/middleware/admin-only.d.ts +19 -0
  174. package/dist/types/oauth-providers/dropbox.d.ts +3 -14
  175. package/dist/types/oauth-providers/facebook.d.ts +3 -7
  176. package/dist/types/oauth-providers/google.d.ts +3 -7
  177. package/dist/types/oauth-providers/index.d.ts +2 -10
  178. package/dist/types/oauth-providers/instagram.d.ts +3 -7
  179. package/dist/types/oauth-providers/oauth-provider.d.ts +25 -21
  180. package/dist/types/oauth-providers/spotify.d.ts +3 -7
  181. package/dist/types/routes/data-query.d.ts +1 -1
  182. package/dist/types/routes/meta-logs.d.ts +20 -0
  183. package/dist/types/rules.d.ts +4 -4
  184. package/dist/types/server.d.ts +9 -7
  185. package/dist/types/settings/email.d.ts +1 -1
  186. package/dist/types/settings/index.d.ts +5 -6
  187. package/dist/types/shared/clients.d.ts +3 -1
  188. package/dist/types/shared/env.d.ts +6 -4
  189. package/dist/types/shared/http.d.ts +2 -0
  190. package/dist/types/shared/signin.d.ts +1 -1
  191. package/dist/types/websocket/index.d.ts +4 -0
  192. package/dist/types/websocket/manager.d.ts +1 -1
  193. package/package.json +12 -11
  194. package/src/index.ts +3 -1
  195. package/src/logger.ts +56 -0
  196. package/src/middleware/admin-only.ts +29 -0
  197. package/src/middleware/user.ts +4 -4
  198. package/src/oauth-providers/dropbox.ts +5 -4
  199. package/src/oauth-providers/facebook.ts +5 -4
  200. package/src/oauth-providers/google.ts +5 -4
  201. package/src/oauth-providers/index.ts +2 -1
  202. package/src/oauth-providers/instagram.ts +5 -4
  203. package/src/oauth-providers/oauth-provider.ts +14 -4
  204. package/src/oauth-providers/spotify.ts +5 -4
  205. package/src/placeholder.d.ts +12 -0
  206. package/src/routes/auth-change-password.ts +6 -3
  207. package/src/routes/auth-delete.ts +7 -5
  208. package/src/routes/auth-forgot-password.ts +10 -6
  209. package/src/routes/auth-reset-password.ts +5 -2
  210. package/src/routes/auth-signout.ts +5 -2
  211. package/src/routes/auth-signup.ts +13 -10
  212. package/src/routes/auth-update.ts +8 -6
  213. package/src/routes/auth-verify-email.ts +11 -3
  214. package/src/routes/data-index-create.ts +4 -7
  215. package/src/routes/data-index-delete.ts +3 -6
  216. package/src/routes/data-index-list.ts +3 -6
  217. package/src/routes/data-query.ts +1 -1
  218. package/src/routes/data-reflect.ts +1 -4
  219. package/src/routes/data-schema-get.ts +3 -5
  220. package/src/routes/data-schema-set.ts +3 -6
  221. package/src/routes/data-schema-test.ts +3 -6
  222. package/src/routes/data-schemas-list.ts +3 -5
  223. package/src/routes/data-set.ts +14 -6
  224. package/src/routes/data-set.yaml +7 -1
  225. package/src/routes/data-sync-changes.ts +1 -1
  226. package/src/routes/data-sync-mutations.ts +1 -1
  227. package/src/routes/data-transaction-finish.yaml +6 -0
  228. package/src/routes/data-transaction.ts +35 -11
  229. package/src/routes/data-update.ts +12 -4
  230. package/src/routes/data-update.yaml +7 -1
  231. package/src/routes/meta-info.ts +1 -1
  232. package/src/routes/meta-logs.ts +57 -0
  233. package/src/routes/meta.ts +4 -0
  234. package/src/routes/oauth2-signin.ts +17 -12
  235. package/src/rules.ts +8 -8
  236. package/src/server.ts +13 -9
  237. package/src/settings/email.ts +1 -1
  238. package/src/settings/index.ts +7 -7
  239. package/src/shared/clients.ts +1 -1
  240. package/src/shared/env.ts +5 -4
  241. package/src/shared/http.ts +2 -0
  242. package/src/shared/signin.ts +10 -4
  243. package/src/start.ts +3 -0
  244. package/src/websocket/index.ts +41 -24
  245. package/src/websocket/manager.ts +1 -1
  246. package/src/websocket/socket.io.ts +9 -10
  247. package/webmanager/acebase-client-browser.min.js +16 -0
  248. package/webmanager/index.html +2 -2
  249. package/webmanager/index.js +3 -6
  250. package/.vscode/launch.json +0 -24
@@ -1 +1 @@
1
- {"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/shared/http.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,MAAM,aAAa,GAAI,OAAe,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,kCAAkC;AAK7F;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAyD,EAAE,EAAE;IACnF,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,wFAAwF;IACxF,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5C,4BAA4B;IAC5B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,qBAAqB;IAEhF,OAAO,GAAc,CAAC;AAC1B,CAAC,CAAA"}
1
+ {"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/shared/http.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,MAAM,aAAa,GAAI,OAAe,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,kCAAkC;AAO7F;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAyD,EAAE,EAAE;IACnF,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,wFAAwF;IACxF,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5C,4BAA4B;IAC5B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,qBAAqB;IAEhF,OAAO,GAAc,CAAC;AAC1B,CAAC,CAAA"}
@@ -17,6 +17,8 @@ export class SignInError extends Error {
17
17
  * @returns
18
18
  */
19
19
  export const signIn = async (credentials, env, req) => {
20
+ const LOG_ACTION = 'auth.signin';
21
+ const LOG_DETAILS = { ip: req.ip, method: credentials.method };
20
22
  try {
21
23
  const query = env.authRef.query();
22
24
  let tokenDetails;
@@ -34,7 +36,7 @@ export const signIn = async (credentials, env, req) => {
34
36
  }
35
37
  break;
36
38
  }
37
- case 'private_token': {
39
+ case 'internal': {
38
40
  // Method used internally: uses the access token extracted from a public access token (see tokenDetails.access_token in above 'token' case)
39
41
  if (typeof credentials.access_token !== 'string') {
40
42
  throw new SignInError('invalid_details', 'sign in request has invalid arguments');
@@ -109,7 +111,9 @@ export const signIn = async (credentials, env, req) => {
109
111
  // Update db
110
112
  await snap.ref.update(updates);
111
113
  // Log history item
112
- env.logRef.push({ action: `signin`, type: credentials.method, [credentials.method]: credentials[credentials.method], ip: req.ip, date: new Date(), success: true });
114
+ if (credentials.method !== 'internal') {
115
+ env.log.event(LOG_ACTION, LOG_DETAILS);
116
+ }
113
117
  // Add to cache
114
118
  env.authCache.set(user.uid, user);
115
119
  // Bind user to current request
@@ -118,7 +122,7 @@ export const signIn = async (credentials, env, req) => {
118
122
  }
119
123
  catch (err) {
120
124
  // Log error
121
- env.logRef.push({ action: 'signin', type: credentials.method, [credentials.method]: credentials[credentials.method], success: false, code: err.code || 'unexpected', message: err.code ? null : err.message, ip: req.ip, date: new Date(), ...err.details });
125
+ env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS, typeof err.code === 'undefined' ? err : null);
122
126
  throw err;
123
127
  }
124
128
  };
@@ -1 +1 @@
1
- {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../../src/shared/signin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../../src/shared/signin.ts"],"names":[],"mappings":"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"}
package/dist/esm/start.js CHANGED
@@ -40,6 +40,9 @@ if (+getVariable('TXLOG', 0) === 1) {
40
40
  maxAge: +getVariable('TXDAYS', 30)
41
41
  };
42
42
  }
43
+ if (+getVariable('AUTH', 1) === 0) {
44
+ options.authentication = { enabled: false };
45
+ }
43
46
  const server = new AceBaseServer(dbname, options);
44
47
  server.once("ready", () => {
45
48
  server.debug.log(`AceBase server running`);
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAY,EAAE,YAAkB;IACjD,mDAAmD;IACnD,wDAAwD;IACxD,wCAAwC;IACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;IAC/E,IAAI,GAAG,EAAE;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE;IACtC,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAAE;IAC3E,OAAO,YAAY,CAAC;AACxB,CAAC;AAAA,CAAC;AAEF,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxC,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAChD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY;AAC3D,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5C,MAAM,OAAO,GAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC5D,IAAI,OAAO,GAAG,CAAC,EAAE;IACb,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACnE;IACD,OAAO,CAAC,GAAG,GAAG;QACV,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,OAAO;QACb,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC;QACrC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;QAC/B,IAAI;KACP,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAChC,OAAO,CAAC,YAAY,GAAG;QACnB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;KACrC,CAAC;CACL;AACD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,kHAAkH;AAC/I,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAY,EAAE,YAAkB;IACjD,mDAAmD;IACnD,wDAAwD;IACxD,wCAAwC;IACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;IAC/E,IAAI,GAAG,EAAE;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE;IACtC,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAAE;IAC3E,OAAO,YAAY,CAAC;AACxB,CAAC;AAAA,CAAC;AAEF,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxC,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAChD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY;AAC3D,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5C,MAAM,OAAO,GAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC5D,IAAI,OAAO,GAAG,CAAC,EAAE;IACb,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACnE;IACD,OAAO,CAAC,GAAG,GAAG;QACV,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,OAAO;QACb,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC;QACrC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;QAC/B,IAAI;KACP,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAChC,OAAO,CAAC,YAAY,GAAG;QACnB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;KACrC,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAC/B,OAAO,CAAC,cAAc,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;CAC/C;AACD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,kHAAkH;AAC/I,CAAC,CAAC,CAAC"}
@@ -2,6 +2,12 @@ import { ColorStyle, Transport } from "acebase-core";
2
2
  import { ConnectedClient } from "../shared/clients.js";
3
3
  import { decodePublicAccessToken } from "../shared/tokens.js";
4
4
  import { createServer } from "./socket.io.js";
5
+ export class SocketRequestError extends Error {
6
+ constructor(code, message) {
7
+ super(message);
8
+ this.code = code;
9
+ }
10
+ }
5
11
  export const addWebsocketServer = (env) => {
6
12
  // TODO: Allow using uWebSockets.js server instead of Socket.IO
7
13
  const serverManager = createServer(env);
@@ -94,7 +100,7 @@ export const addWebsocketServer = (env) => {
94
100
  serverManager.send(event.socket, 'oauth2-signin', { error: err.message });
95
101
  }
96
102
  });
97
- const acknowlegdeRequest = (socket, requestId) => {
103
+ const acknowledgeRequest = (socket, requestId) => {
98
104
  // Send acknowledgement
99
105
  serverManager.send(socket, 'result', {
100
106
  success: true,
@@ -119,12 +125,12 @@ export const addWebsocketServer = (env) => {
119
125
  const subscriptionPath = event.data.path;
120
126
  const isSubscribed = () => subscriptionPath in client.subscriptions && client.subscriptions[subscriptionPath].some(s => s.event === event.data.event);
121
127
  if (isSubscribed()) {
122
- return acknowlegdeRequest(event.socket, event.data.req_id);
128
+ return acknowledgeRequest(event.socket, event.data.req_id);
123
129
  }
124
130
  // Get client
125
131
  // const client = clients.get(socket.id);
126
132
  if (!env.rules.userHasAccess(client.user, subscriptionPath, false)) {
127
- env.logRef.push({ action: 'subscribe', success: false, code: 'access_denied', uid: client.user ? client.user.uid : '-', path: subscriptionPath });
133
+ env.log.error('event.subscribe', 'access_denied', { uid: client.user?.uid ?? 'anonymous', path: subscriptionPath });
128
134
  return failRequest(event.socket, event.data.req_id, 'access_denied');
129
135
  }
130
136
  const callback = (err, path, currentValue, previousValue, context) => {
@@ -165,7 +171,7 @@ export const addWebsocketServer = (env) => {
165
171
  let subscr = { path: subscriptionPath, event: event.data.event, callback };
166
172
  pathSubs.push(subscr);
167
173
  env.db.api.subscribe(subscriptionPath, event.data.event, callback);
168
- acknowlegdeRequest(event.socket, event.data.req_id);
174
+ acknowledgeRequest(event.socket, event.data.req_id);
169
175
  });
170
176
  serverManager.on('unsubscribe', event => {
171
177
  // Client unsubscribes from events on a node
@@ -178,7 +184,7 @@ export const addWebsocketServer = (env) => {
178
184
  let pathSubs = client.subscriptions[event.data.path];
179
185
  if (!pathSubs) {
180
186
  // We have no knowledge of any active subscriptions on this path
181
- return acknowlegdeRequest(event.socket, event.data.req_id);
187
+ return acknowledgeRequest(event.socket, event.data.req_id);
182
188
  }
183
189
  let remove = pathSubs;
184
190
  if (event.data.event) {
@@ -195,7 +201,7 @@ export const addWebsocketServer = (env) => {
195
201
  // No subscriptions left on this path, remove the path entry
196
202
  delete client.subscriptions[event.data.path];
197
203
  }
198
- return acknowlegdeRequest(event.socket, event.data.req_id);
204
+ return acknowledgeRequest(event.socket, event.data.req_id);
199
205
  });
200
206
  serverManager.on('query-unsubscribe', event => {
201
207
  // Client unsubscribing from realtime query events
@@ -206,15 +212,17 @@ export const addWebsocketServer = (env) => {
206
212
  env.debug.verbose(`Client ${event.socket_id} is unsubscribing from realtime query "${event.data.query_id}"`);
207
213
  // const client = clients.get(socket.id);
208
214
  delete client.realtimeQueries[event.data.query_id];
209
- acknowlegdeRequest(event.socket, event.data.req_id);
215
+ acknowledgeRequest(event.socket, event.data.req_id);
210
216
  });
211
217
  const TRANSACTION_TIMEOUT_MS = 10000; // 10s to finish a started transaction
212
218
  serverManager.on('transaction-start', event => {
213
219
  // Start transaction
214
220
  const client = getClientBySocketId(event.socket_id, 'transaction-start');
215
- if (!client) {
221
+ if (!client || !event.data) {
216
222
  return;
217
223
  }
224
+ const LOG_ACTION = 'socket.transaction.start';
225
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
218
226
  env.debug.verbose(`Client ${event.socket_id} is sending transaction start request on path "${event.data.path}"`);
219
227
  const data = event.data;
220
228
  const tx = {
@@ -226,11 +234,14 @@ export const addWebsocketServer = (env) => {
226
234
  timeout: setTimeout(() => {
227
235
  delete client.transactions[tx.id];
228
236
  tx.finish(); // Finish without value cancels the transaction
237
+ env.log.error(LOG_ACTION, 'timeout', LOG_DETAILS);
229
238
  serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'timeout' });
230
239
  }, TRANSACTION_TIMEOUT_MS)
231
240
  };
232
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
241
+ const access = env.rules.userHasAccess(client.user, data.path, true);
242
+ if (!access.allow) {
233
243
  // throw new AccessDeniedError(`access_denied`);
244
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
234
245
  return serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'access_denied' });
235
246
  }
236
247
  // Bind to client
@@ -254,32 +265,36 @@ export const addWebsocketServer = (env) => {
254
265
  serverManager.on('transaction-finish', async (event) => {
255
266
  // Finish transaction
256
267
  const client = getClientBySocketId(event.socket_id, 'transaction-finish');
257
- if (!client) {
268
+ if (!client || !event.data) {
258
269
  return;
259
270
  }
271
+ const LOG_ACTION = 'socket.transaction.finish';
272
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
260
273
  const data = event.data;
261
274
  const tx = client.transactions[data.id];
262
275
  try {
263
276
  if (!tx || data.path !== tx.path) {
264
- throw new Error('transaction_not_found');
277
+ env.log.error(LOG_ACTION, tx ? 'wrong_path' : 'not_found', { ...LOG_DETAILS, id: data.id, tx_path: tx?.path ?? null });
278
+ throw new SocketRequestError('transaction_not_found', 'Transaction not found');
265
279
  }
266
280
  clearTimeout(tx.timeout);
267
281
  delete client.transactions[data.id];
268
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
269
- throw new Error('access_denied');
270
- }
271
- const newValue = Transport.deserialize(data.value);
272
- try {
273
- await tx.finish(newValue);
274
- env.debug.verbose(`Transaction ${tx.id} finished`);
275
- serverManager.send(event.socket, 'tx_completed', { id: tx.id });
276
- }
277
- catch (err) {
278
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message });
282
+ const access = env.rules.userHasAccess(client.user, data.path, true);
283
+ if (!access.allow) {
284
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
285
+ throw new SocketRequestError('access_denied', 'Access denied');
279
286
  }
287
+ const newValue = 'val' in data.value ? Transport.deserialize(data.value) : undefined;
288
+ const { cursor } = await tx.finish(newValue);
289
+ env.debug.verbose(`Transaction ${tx.id} finished`);
290
+ serverManager.send(event.socket, 'tx_completed', { id: tx.id, context: { cursor } });
280
291
  }
281
292
  catch (err) {
282
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message, data });
293
+ if (!(err instanceof SocketRequestError)) {
294
+ // Other errors have been logged already
295
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
296
+ }
297
+ serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.code ?? err.message, data });
283
298
  tx.finish(); // Finish with undefined, canceling the transaction
284
299
  }
285
300
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
- import * as socketIO from 'socket.io';
2
- const createSocketIOServer = socketIO.default ?? socketIO; // ESM and CJS compatible approach
1
+ import { Server as SocketIOServer } from 'socket.io';
2
+ const createSocketIOServer = (httpServer, options) => {
3
+ return new SocketIOServer(httpServer, options);
4
+ };
3
5
  import { WebSocketManager } from './manager.js';
4
- import { getCorsHeaders } from '../middleware/cors.js';
6
+ import { getCorsOptions } from '../middleware/cors.js';
5
7
  export class SocketIOManager extends WebSocketManager {
6
8
  constructor() {
7
9
  super('Socket.IO');
@@ -31,14 +33,10 @@ export const createServer = (env) => {
31
33
  pingInterval: 5000,
32
34
  pingTimeout: 5000,
33
35
  maxHttpBufferSize: maxPayloadBytes,
34
- // socket.io 2.x:
35
- handlePreflightRequest: (req, res) => {
36
- const headers = getCorsHeaders(env.config.allowOrigin, req.headers.origin);
37
- res.writeHead(200, headers);
38
- res.end();
39
- }
36
+ // Allow socket.io 2.x clients (using engine.io 3.x):
37
+ allowEIO3: true,
40
38
  // socket.io 3+ uses cors package:
41
- // cors: getCorsOptions(env.config.allowOrigin)
39
+ cors: getCorsOptions(env.config.allowOrigin)
42
40
  });
43
41
  // Setup event emitter for communication with consuming server
44
42
  const manager = new SocketIOManager();
@@ -47,7 +45,7 @@ export const createServer = (env) => {
47
45
  // Notify manager of new connection
48
46
  manager.emit('connect', { socket, socket_id: socket.id });
49
47
  // Pass any events to manager
50
- socket.on('disconnect', data => manager.emit('disconnect', { socket, socket_id: socket.id, data }));
48
+ socket.on('disconnect', reason => manager.emit('disconnect', { socket, socket_id: socket.id, data: reason }));
51
49
  socket.on('reconnect', data => manager.emit('connect', { socket, socket_id: socket.id, data }));
52
50
  socket.on('signin', accessToken => manager.emit('signin', { socket, socket_id: socket.id, data: { accessToken } }));
53
51
  socket.on('signout', data => manager.emit('signout', { socket, socket_id: socket.id, data }));
@@ -1 +1 @@
1
- {"version":3,"file":"socket.io.js","sourceRoot":"","sources":["../../../src/websocket/socket.io.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"socket.io.js","sourceRoot":"","sources":["../../../src/websocket/socket.io.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,4 @@
1
1
  export { AceBaseServer } from './server';
2
2
  export { AceBaseServerSettings, AceBaseServerHttpsSettings, AceBaseServerTransactionSettings, AceBaseServerAuthenticationSettings } from './settings';
3
+ export * from './shared/email';
4
+ export * from './oauth-providers';
@@ -0,0 +1,35 @@
1
+ import { DataReference } from "acebase-core";
2
+ export declare class DatabaseLog {
3
+ private logRef;
4
+ constructor(logRef: DataReference);
5
+ /**
6
+ * Logs an action initiated by a client/user with a positive or negative outcome. Used by `success` and `failure`
7
+ * @param action action identifier
8
+ * @param success whether the action was successful
9
+ * @param details any additional details to be logged
10
+ */
11
+ event(action: string, details: any): Promise<void>;
12
+ /**
13
+ * Logs a system warning
14
+ * @param action action identifier
15
+ * @param code warning code
16
+ * @param details any additional details to be logged
17
+ */
18
+ warning(action: string, code: string, details: any): Promise<void>;
19
+ /**
20
+ * Logs a system or client/user error
21
+ * @param action action identifier
22
+ * @param code error code
23
+ * @param details any additional details to be logged
24
+ */
25
+ error(action: string, code: string, details: any, unexpectedError?: any): Promise<void>;
26
+ /**
27
+ * Query the logs
28
+ * @returns
29
+ */
30
+ query(): import("acebase-core").DataReferenceQuery;
31
+ /**
32
+ * Reference to the logs database collection
33
+ */
34
+ get ref(): DataReference;
35
+ }
@@ -0,0 +1,19 @@
1
+ import { NextFunction } from "express";
2
+ import { RouteInitEnvironment, RouteRequest } from "../shared/env";
3
+ import type { Response } from "../shared/http";
4
+ /**
5
+ * Middleware function that checks if the current user is `admin`. An 403 Forbidden error will be sent in the response if
6
+ * authentication is enabled on the server and the user is not signed in as admin.
7
+ *
8
+ * Can be applied to any route by adding it in the router chain.
9
+ * @example
10
+ * app.get('/endpoint', adminOnly(env), (req, res) => {
11
+ * // If we get here we are either an admin,
12
+ * // or the server doesn't have authentication enabled.
13
+ * })
14
+ * @param env Middle
15
+ * @param errorMessage
16
+ * @returns
17
+ */
18
+ export declare const adminOnly: (env: RouteInitEnvironment, errorMessage?: string) => (req: RouteRequest, res: Response, next: NextFunction) => void;
19
+ export default adminOnly;
@@ -1,4 +1,4 @@
1
- import { IOAuth2Provider, IOAuth2ProviderSettings, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams } from "./oauth-provider";
1
+ import { IOAuth2ProviderSettings, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams, OAuth2Provider, OAuth2ProviderInitInfo } from "./oauth-provider";
2
2
  /**
3
3
  * Details of your app to access the Dropbox API
4
4
  */
@@ -16,8 +16,7 @@ interface IDropboxAuthToken {
16
16
  account_id: string;
17
17
  uid: string;
18
18
  }
19
- export declare class DropboxAuthProvider implements IOAuth2Provider {
20
- private settings;
19
+ export declare class DropboxAuthProvider extends OAuth2Provider {
21
20
  constructor(settings: IDropboxAuthSettings);
22
21
  /**
23
22
  * Starts auth flow by getting the url the user should be redirected to
@@ -30,17 +29,7 @@ export declare class DropboxAuthProvider implements IOAuth2Provider {
30
29
  * @param info.options.locale If the locale specified is a supported language, Dropbox will direct users to a translated version of the authorization website. Locale tags should be IETF language tags.
31
30
  * @param info.options.force_reauthentication When true (default is false) users will be signed out if they are currently signed in. This will make sure the user is brought to a page where they can create a new account or sign in to another account. This should only be used when there is a definite reason to believe that the user needs to sign in to a new or different account.
32
31
  */
33
- init(info: {
34
- redirect_url: string;
35
- state?: string;
36
- options?: {
37
- locale?: string;
38
- require_role?: string;
39
- disable_signup?: boolean;
40
- force_reapprove?: boolean;
41
- force_reauthentication?: boolean;
42
- };
43
- }): Promise<string>;
32
+ init(info: OAuth2ProviderInitInfo): Promise<string>;
44
33
  getAccessToken(params: IOAuth2AuthCodeParams | IOAuth2RefreshTokenParams): Promise<IDropboxAuthToken>;
45
34
  getUserInfo(access_token: string): Promise<{
46
35
  id: string;
@@ -1,4 +1,4 @@
1
- import { IOAuth2Provider, IOAuth2ProviderSettings, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams } from "./oauth-provider";
1
+ import { IOAuth2ProviderSettings, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams, OAuth2Provider, OAuth2ProviderInitInfo } from "./oauth-provider";
2
2
  /**
3
3
  * Details of your app to access the Facebook Graph API
4
4
  */
@@ -14,18 +14,14 @@ interface IFacebookAuthToken {
14
14
  scope: string;
15
15
  token_type: string;
16
16
  }
17
- export declare class FacebookAuthProvider implements IOAuth2Provider {
18
- private settings;
17
+ export declare class FacebookAuthProvider extends OAuth2Provider {
19
18
  constructor(settings: IFacebookAuthSettings);
20
19
  /**
21
20
  * Starts auth flow by getting the url the user should be redirected to
22
21
  * @param info.redirectUrl Url spotify will redirect to after authorizing, should be the url
23
22
  * @param info.state Optional state that will be passed to redirectUri by spotify
24
23
  */
25
- init(info: {
26
- redirect_url: string;
27
- state?: string;
28
- }): Promise<string>;
24
+ init(info: OAuth2ProviderInitInfo): Promise<string>;
29
25
  getAccessToken(params: IOAuth2AuthCodeParams | IOAuth2RefreshTokenParams): Promise<IFacebookAuthToken>;
30
26
  getUserInfo(access_token: string): Promise<{
31
27
  id: string;
@@ -1,4 +1,4 @@
1
- import { IOAuth2Provider, IOAuth2ProviderSettings, IOpenIDToken, IOpenIDConfiguration, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams } from "./oauth-provider";
1
+ import { IOAuth2ProviderSettings, IOpenIDToken, IOpenIDConfiguration, IOAuth2AuthCodeParams, IOAuth2RefreshTokenParams, OAuth2ProviderInitInfo, OAuth2Provider } from "./oauth-provider";
2
2
  /**
3
3
  * Details of your app to access the Google API. See https://developers.google.com/identity/protocols/oauth2/scopes
4
4
  */
@@ -15,8 +15,7 @@ interface IGoogleAuthToken {
15
15
  scope: string;
16
16
  token_type: string;
17
17
  }
18
- export declare class GoogleAuthProvider implements IOAuth2Provider {
19
- private settings;
18
+ export declare class GoogleAuthProvider extends OAuth2Provider {
20
19
  _config: IOpenIDConfiguration;
21
20
  constructor(settings: IGoogleAuthSettings);
22
21
  getOpenIDConfig(): Promise<IOpenIDConfiguration>;
@@ -25,10 +24,7 @@ export declare class GoogleAuthProvider implements IOAuth2Provider {
25
24
  * @param info.redirectUrl Url spotify will redirect to after authorizing, should be the url
26
25
  * @param info.state Optional state that will be passed to redirectUri by spotify
27
26
  */
28
- init(info: {
29
- redirect_url: string;
30
- state?: string;
31
- }): Promise<string>;
27
+ init(info: OAuth2ProviderInitInfo): Promise<string>;
32
28
  getAccessToken(params: IOAuth2AuthCodeParams | IOAuth2RefreshTokenParams): Promise<IGoogleAuthToken>;
33
29
  revokeAccess(access_token: string): Promise<void>;
34
30
  getUserInfo(access_token: string): Promise<{
@@ -1,18 +1,10 @@
1
- import { DropboxAuthProvider } from './dropbox';
2
- import { FacebookAuthProvider } from './facebook';
3
- import { GoogleAuthProvider } from './google';
4
- import { InstagramAuthProvider } from './instagram';
5
- import { SpotifyAuthProvider } from './spotify';
1
+ import { OAuth2Provider } from './oauth-provider';
6
2
  export { DropboxAuthProvider, IDropboxAuthSettings } from './dropbox';
7
3
  export { FacebookAuthProvider, IFacebookAuthSettings } from './facebook';
8
4
  export { GoogleAuthProvider, IGoogleAuthSettings } from './google';
9
5
  export { InstagramAuthProvider, IInstagramAuthSettings } from './instagram';
10
6
  export { SpotifyAuthProvider, ISpotifyAuthSettings } from './spotify';
11
7
  declare const oAuth2Providers: {
12
- dropbox: typeof DropboxAuthProvider;
13
- facebook: typeof FacebookAuthProvider;
14
- google: typeof GoogleAuthProvider;
15
- instagram: typeof InstagramAuthProvider;
16
- spotify: typeof SpotifyAuthProvider;
8
+ [key: string]: typeof OAuth2Provider;
17
9
  };
18
10
  export default oAuth2Providers;
@@ -1,4 +1,4 @@
1
- import { IOAuth2Provider, IOAuth2ProviderSettings, IOAuth2AuthCodeParams } from "./oauth-provider";
1
+ import { IOAuth2ProviderSettings, IOAuth2AuthCodeParams, OAuth2Provider, OAuth2ProviderInitInfo } from "./oauth-provider";
2
2
  /**
3
3
  * Details of your app to access the Legacy Instagram API.
4
4
  */
@@ -24,18 +24,14 @@ interface IInstagramUser {
24
24
  followed_by: number;
25
25
  };
26
26
  }
27
- export declare class InstagramAuthProvider implements IOAuth2Provider {
28
- private settings;
27
+ export declare class InstagramAuthProvider extends OAuth2Provider {
29
28
  constructor(settings: IInstagramAuthSettings);
30
29
  /**
31
30
  * Starts auth flow by getting the url the user should be redirected to
32
31
  * @param info.redirectUrl Url spotify will redirect to after authorizing, should be the url
33
32
  * @param info.state Optional state that will be passed to redirectUri by spotify
34
33
  */
35
- init(info: {
36
- redirect_url: string;
37
- state?: string;
38
- }): Promise<string>;
34
+ init(info: OAuth2ProviderInitInfo): Promise<string>;
39
35
  _userInfo: IInstagramUser;
40
36
  getAccessToken(params: IOAuth2AuthCodeParams): Promise<IInstagramAuthToken>;
41
37
  getUserInfo(access_token: string): Promise<{
@@ -18,28 +18,32 @@ export interface IOAuth2TokenResult {
18
18
  expires_in?: number;
19
19
  refresh_token?: string;
20
20
  }
21
- export interface IOAuth2Provider {
22
- init(info: {
23
- redirect_url: string;
24
- state?: string;
25
- options?: any;
26
- }): Promise<string>;
27
- getAccessToken(params: IOAuth2AuthCodeParams | IOAuth2RefreshTokenParams): Promise<IOAuth2TokenResult>;
28
- getUserInfo(access_token: string): Promise<{
29
- id: string;
30
- name: string;
31
- display_name: string;
32
- picture?: Array<{
33
- width?: number;
34
- height?: number;
35
- url: string;
36
- }>;
37
- email: string;
38
- email_verified: boolean;
39
- other?: {
40
- [key: string]: string | number | boolean;
41
- };
21
+ export declare type OAuth2ProviderInitInfo = {
22
+ redirect_url: string;
23
+ state?: string;
24
+ options?: any;
25
+ };
26
+ export declare type OAuth2ProviderUserInfo = {
27
+ id: string;
28
+ name: string;
29
+ display_name: string;
30
+ picture?: Array<{
31
+ width?: number;
32
+ height?: number;
33
+ url: string;
42
34
  }>;
35
+ email: string;
36
+ email_verified: boolean;
37
+ other?: {
38
+ [key: string]: string | number | boolean;
39
+ };
40
+ };
41
+ export declare class OAuth2Provider {
42
+ protected settings: IOAuth2ProviderSettings;
43
+ constructor(settings: IOAuth2ProviderSettings);
44
+ init(info: OAuth2ProviderInitInfo): Promise<string>;
45
+ getAccessToken(param: IOAuth2AuthCodeParams | IOAuth2RefreshTokenParams): Promise<IOAuth2TokenResult>;
46
+ getUserInfo(access_token: string): Promise<OAuth2ProviderUserInfo>;
43
47
  }
44
48
  export interface IOpenIDToken {
45
49
  email: string;