@dynamic-labs/utils 3.0.0-alpha.26 → 3.0.0-alpha.28

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 (5) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/package.json +3 -3
  3. package/src/errors/ExternalAuthError.d.ts +0 -4
  4. package/src/services/Oauth2Service/createWindowOauth2Service/createWindowOauth2Service.cjs +40 -18
  5. package/src/services/Oauth2Service/createWindowOauth2Service/createWindowOauth2Service.js +40 -18
package/CHANGELOG.md CHANGED
@@ -1,4 +1,13 @@
1
1
 
2
+ ## [3.0.0-alpha.28](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.27...v3.0.0-alpha.28) (2024-07-25)
3
+
4
+ ## [3.0.0-alpha.27](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.26...v3.0.0-alpha.27) (2024-07-24)
5
+
6
+
7
+ ### Features
8
+
9
+ * add ability to use a different ecdsa validator ([#6407](https://github.com/dynamic-labs/DynamicAuth/issues/6407)) ([a3e99e1](https://github.com/dynamic-labs/DynamicAuth/commit/a3e99e1b2cdcadbce35ff0cacfb8fb82778c0216))
10
+
2
11
  ## [3.0.0-alpha.26](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.25...v3.0.0-alpha.26) (2024-07-24)
3
12
 
4
13
  ## [3.0.0-alpha.25](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.24...v3.0.0-alpha.25) (2024-07-24)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dynamic-labs/utils",
3
- "version": "3.0.0-alpha.26",
3
+ "version": "3.0.0-alpha.28",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -28,8 +28,8 @@
28
28
  "dependencies": {
29
29
  "@dynamic-labs/sdk-api-core": "0.0.497",
30
30
  "tldts": "6.0.16",
31
- "@dynamic-labs/logger": "3.0.0-alpha.26",
32
- "@dynamic-labs/types": "3.0.0-alpha.26",
31
+ "@dynamic-labs/logger": "3.0.0-alpha.28",
32
+ "@dynamic-labs/types": "3.0.0-alpha.28",
33
33
  "buffer": "6.0.3",
34
34
  "stream": "0.0.2"
35
35
  },
package/src/errors/ExternalAuthError.d.ts CHANGED
@@ -1,4 +0,0 @@
1
- import { DynamicError } from './DynamicError';
2
- export declare class ExternalAuthError extends DynamicError {
3
- constructor(code: string);
4
- }
package/src/services/Oauth2Service/createWindowOauth2Service/createWindowOauth2Service.cjs CHANGED
@@ -26,22 +26,10 @@ const createWindowOauth2Service = () => ({
26
26
  };
27
27
  const handleWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
28
28
  const message = event.data;
29
- if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
29
+ const expectedOrigin = getExpectedOrigin(apiProvider, provider);
30
+ if (!expectedOrigin) {
30
31
  return;
31
32
  }
32
- let expectedOrigin = window.location.origin;
33
- if (!providersWithoutWindowOpenerReference.includes(provider)) {
34
- try {
35
- const redirectUri = new URL(apiProvider.redirectUrl);
36
- expectedOrigin = redirectUri.origin;
37
- }
38
- catch (e) {
39
- logger.logger.error('Failed to parse social provider redirect url', {
40
- error: e,
41
- });
42
- return;
43
- }
44
- }
45
33
  if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
46
34
  logger.logger.debug('Origin check message received. Sending response now.', {
47
35
  data: message,
@@ -50,13 +38,14 @@ const createWindowOauth2Service = () => ({
50
38
  authWindow.postMessage('origin_check_response', expectedOrigin);
51
39
  return;
52
40
  }
41
+ const isTelegramCompletedMessage = (message === null || message === void 0 ? void 0 : message.type) === 'telegram_completed';
53
42
  const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
54
- if (isAuthorizationMessage) {
43
+ if (isAuthorizationMessage || isTelegramCompletedMessage) {
55
44
  logger.logger.debug('Message received', { data: message });
56
45
  }
57
46
  const isExpectedOrigin = event.origin === expectedOrigin;
58
- const isValidMessage = isAuthorizationMessage &&
59
- (message === null || message === void 0 ? void 0 : message.provider) === provider &&
47
+ const isValidMessage = ((isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider) ||
48
+ isTelegramCompletedMessage) &&
60
49
  isExpectedOrigin;
61
50
  // don't process invalid messages for provider
62
51
  if (!isValidMessage) {
@@ -71,6 +60,39 @@ const createWindowOauth2Service = () => ({
71
60
  return;
72
61
  }
73
62
  clearListeners();
63
+ if (isTelegramCompletedMessage) {
64
+ handleTelegramCompletionMessage(message);
65
+ return;
66
+ }
67
+ handleAuthorizationMessage(message, provider, state);
68
+ });
69
+ const getExpectedOrigin = (apiProvider, provider) => {
70
+ if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
71
+ return;
72
+ }
73
+ let expectedOrigin = window.location.origin;
74
+ if (!providersWithoutWindowOpenerReference.includes(provider)) {
75
+ try {
76
+ const redirectUri = new URL(apiProvider.redirectUrl);
77
+ expectedOrigin = redirectUri.origin;
78
+ }
79
+ catch (e) {
80
+ logger.logger.error('Failed to parse social provider redirect url', {
81
+ error: e,
82
+ });
83
+ return;
84
+ }
85
+ }
86
+ return expectedOrigin;
87
+ };
88
+ const handleTelegramCompletionMessage = (message) => {
89
+ logger.logger.debug('Telegram completion message received', {
90
+ data: message,
91
+ });
92
+ resolve('telegram_completed');
93
+ setIsProcessing(false);
94
+ };
95
+ const handleAuthorizationMessage = (message, provider, state) => {
74
96
  const { code, error, state: authState } = message;
75
97
  if (error && error !== 'undefined') {
76
98
  typedReject({
@@ -99,7 +121,7 @@ const createWindowOauth2Service = () => ({
99
121
  }
100
122
  resolve(code);
101
123
  setIsProcessing(false);
102
- });
124
+ };
103
125
  if (!providersWaitingOauthMessage[provider]) {
104
126
  window.addEventListener('message', handleWindowMessage);
105
127
  providersWaitingOauthMessage[provider] = true;
package/src/services/Oauth2Service/createWindowOauth2Service/createWindowOauth2Service.js CHANGED
@@ -22,22 +22,10 @@ const createWindowOauth2Service = () => ({
22
22
  };
23
23
  const handleWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
24
24
  const message = event.data;
25
- if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
25
+ const expectedOrigin = getExpectedOrigin(apiProvider, provider);
26
+ if (!expectedOrigin) {
26
27
  return;
27
28
  }
28
- let expectedOrigin = window.location.origin;
29
- if (!providersWithoutWindowOpenerReference.includes(provider)) {
30
- try {
31
- const redirectUri = new URL(apiProvider.redirectUrl);
32
- expectedOrigin = redirectUri.origin;
33
- }
34
- catch (e) {
35
- logger.error('Failed to parse social provider redirect url', {
36
- error: e,
37
- });
38
- return;
39
- }
40
- }
41
29
  if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
42
30
  logger.debug('Origin check message received. Sending response now.', {
43
31
  data: message,
@@ -46,13 +34,14 @@ const createWindowOauth2Service = () => ({
46
34
  authWindow.postMessage('origin_check_response', expectedOrigin);
47
35
  return;
48
36
  }
37
+ const isTelegramCompletedMessage = (message === null || message === void 0 ? void 0 : message.type) === 'telegram_completed';
49
38
  const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
50
- if (isAuthorizationMessage) {
39
+ if (isAuthorizationMessage || isTelegramCompletedMessage) {
51
40
  logger.debug('Message received', { data: message });
52
41
  }
53
42
  const isExpectedOrigin = event.origin === expectedOrigin;
54
- const isValidMessage = isAuthorizationMessage &&
55
- (message === null || message === void 0 ? void 0 : message.provider) === provider &&
43
+ const isValidMessage = ((isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider) ||
44
+ isTelegramCompletedMessage) &&
56
45
  isExpectedOrigin;
57
46
  // don't process invalid messages for provider
58
47
  if (!isValidMessage) {
@@ -67,6 +56,39 @@ const createWindowOauth2Service = () => ({
67
56
  return;
68
57
  }
69
58
  clearListeners();
59
+ if (isTelegramCompletedMessage) {
60
+ handleTelegramCompletionMessage(message);
61
+ return;
62
+ }
63
+ handleAuthorizationMessage(message, provider, state);
64
+ });
65
+ const getExpectedOrigin = (apiProvider, provider) => {
66
+ if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
67
+ return;
68
+ }
69
+ let expectedOrigin = window.location.origin;
70
+ if (!providersWithoutWindowOpenerReference.includes(provider)) {
71
+ try {
72
+ const redirectUri = new URL(apiProvider.redirectUrl);
73
+ expectedOrigin = redirectUri.origin;
74
+ }
75
+ catch (e) {
76
+ logger.error('Failed to parse social provider redirect url', {
77
+ error: e,
78
+ });
79
+ return;
80
+ }
81
+ }
82
+ return expectedOrigin;
83
+ };
84
+ const handleTelegramCompletionMessage = (message) => {
85
+ logger.debug('Telegram completion message received', {
86
+ data: message,
87
+ });
88
+ resolve('telegram_completed');
89
+ setIsProcessing(false);
90
+ };
91
+ const handleAuthorizationMessage = (message, provider, state) => {
70
92
  const { code, error, state: authState } = message;
71
93
  if (error && error !== 'undefined') {
72
94
  typedReject({
@@ -95,7 +117,7 @@ const createWindowOauth2Service = () => ({
95
117
  }
96
118
  resolve(code);
97
119
  setIsProcessing(false);
98
- });
120
+ };
99
121
  if (!providersWaitingOauthMessage[provider]) {
100
122
  window.addEventListener('message', handleWindowMessage);
101
123
  providersWaitingOauthMessage[provider] = true;