@or-sdk/authorizer 0.24.14-beta.937.0 → 0.24.14-beta.944.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.
- package/dist/cjs/OAuth/OAuth.js +31 -24
- package/dist/cjs/OAuth/OAuth.js.map +1 -1
- package/dist/esm/OAuth/OAuth.js +19 -12
- package/dist/esm/OAuth/OAuth.js.map +1 -1
- package/dist/types/OAuth/OAuth.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/Basic/BasicAuth.ts +1 -0
- package/src/OAuth/OAuth.ts +33 -18
package/dist/cjs/OAuth/OAuth.js
CHANGED
|
@@ -50,6 +50,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
50
50
|
exports.OAuth = void 0;
|
|
51
51
|
var key_value_storage_1 = require("@or-sdk/key-value-storage");
|
|
52
52
|
var providers_1 = require("@or-sdk/providers");
|
|
53
|
+
var event_manager_1 = require("@or-sdk/event-manager");
|
|
54
|
+
var discovery_1 = require("@or-sdk/discovery");
|
|
53
55
|
var base_1 = require("@or-sdk/base");
|
|
54
56
|
var uuid_1 = require("uuid");
|
|
55
57
|
var constants_1 = require("../constants");
|
|
@@ -60,7 +62,7 @@ var createAuthKey_1 = require("./utils/createAuthKey");
|
|
|
60
62
|
var OAuth = (function () {
|
|
61
63
|
function OAuth(params) {
|
|
62
64
|
this.status = constants_1.AuthStatus.READY;
|
|
63
|
-
var
|
|
65
|
+
var authKey = params.authKey, discoveryUrl = params.discoveryUrl, eventManagerUrl = params.eventManagerUrl, keyValueCollection = params.keyValueCollection, providersAccountId = params.providersAccountId, serviceName = params.serviceName, token = params.token;
|
|
64
66
|
if (!(authKey && serviceName && authKey)) {
|
|
65
67
|
throw new Error('Invalit OAuth params passed.');
|
|
66
68
|
}
|
|
@@ -83,7 +85,7 @@ var OAuth = (function () {
|
|
|
83
85
|
}
|
|
84
86
|
OAuth.create = function (params) {
|
|
85
87
|
return __awaiter(this, void 0, void 0, function () {
|
|
86
|
-
var appId, authName, discoveryUrl, scope, serviceName, token, accountId, eventManagerUrl, providersAccountId, keyValueCollection, keyValueStorage, providers, services, currentServiceData, apps, currentApp, serviceDefinition, id, authKey, additionalBodyData, additionalHeaders,
|
|
88
|
+
var appId, authName, discoveryUrl, scope, serviceName, token, accountId, eventManagerUrl, providersAccountId, discovery, keyValueCollection, keyValueStorage, providers, services, currentServiceData, apps, currentApp, serviceDefinition, id, authKey, additionalBodyData, additionalHeaders, redirectProviderUrl, authConfigs, formattedScope, configs, tempAuthData, authDataExpire, authUrl, additionalParams, formattedScope, authorizeUrl, newOAuth;
|
|
87
89
|
var _a;
|
|
88
90
|
return __generator(this, function (_b) {
|
|
89
91
|
switch (_b.label) {
|
|
@@ -99,6 +101,29 @@ var OAuth = (function () {
|
|
|
99
101
|
}
|
|
100
102
|
appId = params.appId, authName = params.authName, discoveryUrl = params.discoveryUrl, scope = params.scope, serviceName = params.serviceName, token = params.token;
|
|
101
103
|
accountId = params.accountId, eventManagerUrl = params.eventManagerUrl, providersAccountId = params.providersAccountId;
|
|
104
|
+
if (!(discoveryUrl && !(accountId && eventManagerUrl && providersAccountId))) return [3, 6];
|
|
105
|
+
discovery = new discovery_1.Discovery({
|
|
106
|
+
token: token,
|
|
107
|
+
discoveryUrl: discoveryUrl,
|
|
108
|
+
});
|
|
109
|
+
if (!!accountId) return [3, 2];
|
|
110
|
+
return [4, discovery.getCurrentAccountId()];
|
|
111
|
+
case 1:
|
|
112
|
+
accountId = _b.sent();
|
|
113
|
+
_b.label = 2;
|
|
114
|
+
case 2:
|
|
115
|
+
if (!!eventManagerUrl) return [3, 4];
|
|
116
|
+
return [4, discovery.getServiceUrl(event_manager_1.EVENT_MANAGER_SERVICE_KEY)];
|
|
117
|
+
case 3:
|
|
118
|
+
eventManagerUrl = _b.sent();
|
|
119
|
+
_b.label = 4;
|
|
120
|
+
case 4:
|
|
121
|
+
if (!!providersAccountId) return [3, 6];
|
|
122
|
+
return [4, discovery.getProvidersAccountId()];
|
|
123
|
+
case 5:
|
|
124
|
+
providersAccountId = _b.sent();
|
|
125
|
+
_b.label = 6;
|
|
126
|
+
case 6:
|
|
102
127
|
keyValueCollection = params.keyValueCollection || serviceName;
|
|
103
128
|
keyValueStorage = new key_value_storage_1.KeyValueStorage({
|
|
104
129
|
token: token,
|
|
@@ -117,26 +142,11 @@ var OAuth = (function () {
|
|
|
117
142
|
type: 'list',
|
|
118
143
|
},
|
|
119
144
|
})];
|
|
120
|
-
case
|
|
145
|
+
case 7:
|
|
121
146
|
services = _b.sent();
|
|
122
|
-
if (!(!eventManagerUrl && discoveryUrl)) return [3, 3];
|
|
123
|
-
return [4, providers.getServiceUrl()];
|
|
124
|
-
case 2:
|
|
125
|
-
eventManagerUrl = _b.sent();
|
|
126
|
-
_b.label = 3;
|
|
127
|
-
case 3:
|
|
128
|
-
if (!(!accountId && discoveryUrl)) return [3, 5];
|
|
129
|
-
return [4, providers.getCurrentAccountId()];
|
|
130
|
-
case 4:
|
|
131
|
-
accountId = _b.sent();
|
|
132
|
-
_b.label = 5;
|
|
133
|
-
case 5:
|
|
134
|
-
if (!providersAccountId && discoveryUrl) {
|
|
135
|
-
providersAccountId = providers.providersAccountId;
|
|
136
|
-
}
|
|
137
147
|
currentServiceData = services[serviceName];
|
|
138
148
|
return [4, keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps')];
|
|
139
|
-
case
|
|
149
|
+
case 8:
|
|
140
150
|
apps = _b.sent();
|
|
141
151
|
currentApp = apps.value.find(function (app) { return app.value.appId === appId; }).value;
|
|
142
152
|
serviceDefinition = new ServiceDefinition_1.ServiceDefinition(currentServiceData, currentApp.authLinkParams, currentApp.environment);
|
|
@@ -144,10 +154,7 @@ var OAuth = (function () {
|
|
|
144
154
|
authKey = (0, createAuthKey_1.createAuthKey)(id, authName, keyValueCollection, accountId || null);
|
|
145
155
|
additionalBodyData = {};
|
|
146
156
|
additionalHeaders = {};
|
|
147
|
-
|
|
148
|
-
case 7:
|
|
149
|
-
emUrl = _b.sent();
|
|
150
|
-
redirectProviderUrl = "".concat(emUrl, "/http/").concat(providers.providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
|
|
157
|
+
redirectProviderUrl = "".concat(eventManagerUrl, "/http/").concat(providersAccountId).concat(constants_1.OAUTH_REDIRECT_PROVIDER_PATH);
|
|
151
158
|
authConfigs = __assign(__assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId: appId });
|
|
152
159
|
if (scope) {
|
|
153
160
|
formattedScope = (0, formatScope_1.formatScope)(scope, serviceDefinition.scopeType);
|
|
@@ -172,7 +179,7 @@ var OAuth = (function () {
|
|
|
172
179
|
};
|
|
173
180
|
authDataExpire = Date.now() + constants_1.TEMPORARY_DATA_EXPIRATION_TIME;
|
|
174
181
|
return [4, keyValueStorage.setValueByKey('__authorizer_temp-uuid', id, tempAuthData, authDataExpire)];
|
|
175
|
-
case
|
|
182
|
+
case 9:
|
|
176
183
|
_b.sent();
|
|
177
184
|
authUrl = new URL(serviceDefinition.authorizeUri);
|
|
178
185
|
additionalParams = JSON.parse(serviceDefinition.authRequestAdditionalParams);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA4D;AAC5D,+CAA8C;AAC9C,qCAAuC;AAEvC,6BAAoC;AAWpC,0CAMsB;AAEtB,mDAAkD;AAClD,+CAA8C;AAC9C,+DAA8D;AAC9D,uDAAsD;AAEtD;IASE,eAAY,MAAmB;QARvB,WAAM,GAAG,sBAAU,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/OAuth/OAuth.js
CHANGED
|
@@ -9,6 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { KeyValueStorage } from '@or-sdk/key-value-storage';
|
|
11
11
|
import { Providers } from '@or-sdk/providers';
|
|
12
|
+
import { EVENT_MANAGER_SERVICE_KEY } from '@or-sdk/event-manager';
|
|
13
|
+
import { Discovery } from '@or-sdk/discovery';
|
|
12
14
|
import { timeout } from '@or-sdk/base';
|
|
13
15
|
import { v4 as uuidv4 } from 'uuid';
|
|
14
16
|
import { SERVICE_PROVIDER_PATH, OAUTH_REDIRECT_PROVIDER_PATH, PREDEFINED_APP, TEMPORARY_DATA_EXPIRATION_TIME, AuthStatus, } from '../constants';
|
|
@@ -19,7 +21,7 @@ import { createAuthKey } from './utils/createAuthKey';
|
|
|
19
21
|
export class OAuth {
|
|
20
22
|
constructor(params) {
|
|
21
23
|
this.status = AuthStatus.READY;
|
|
22
|
-
const {
|
|
24
|
+
const { authKey, discoveryUrl, eventManagerUrl, keyValueCollection, providersAccountId, serviceName, token, } = params;
|
|
23
25
|
if (!(authKey && serviceName && authKey)) {
|
|
24
26
|
throw new Error('Invalit OAuth params passed.');
|
|
25
27
|
}
|
|
@@ -53,6 +55,21 @@ export class OAuth {
|
|
|
53
55
|
}
|
|
54
56
|
const { appId, authName, discoveryUrl, scope, serviceName, token, } = params;
|
|
55
57
|
let { accountId, eventManagerUrl, providersAccountId, } = params;
|
|
58
|
+
if (discoveryUrl && !(accountId && eventManagerUrl && providersAccountId)) {
|
|
59
|
+
const discovery = new Discovery({
|
|
60
|
+
token,
|
|
61
|
+
discoveryUrl,
|
|
62
|
+
});
|
|
63
|
+
if (!accountId) {
|
|
64
|
+
accountId = yield discovery.getCurrentAccountId();
|
|
65
|
+
}
|
|
66
|
+
if (!eventManagerUrl) {
|
|
67
|
+
eventManagerUrl = yield discovery.getServiceUrl(EVENT_MANAGER_SERVICE_KEY);
|
|
68
|
+
}
|
|
69
|
+
if (!providersAccountId) {
|
|
70
|
+
providersAccountId = yield discovery.getProvidersAccountId();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
56
73
|
const keyValueCollection = params.keyValueCollection || serviceName;
|
|
57
74
|
const keyValueStorage = new KeyValueStorage({
|
|
58
75
|
token,
|
|
@@ -71,15 +88,6 @@ export class OAuth {
|
|
|
71
88
|
type: 'list',
|
|
72
89
|
},
|
|
73
90
|
});
|
|
74
|
-
if (!eventManagerUrl && discoveryUrl) {
|
|
75
|
-
eventManagerUrl = yield providers.getServiceUrl();
|
|
76
|
-
}
|
|
77
|
-
if (!accountId && discoveryUrl) {
|
|
78
|
-
accountId = yield providers.getCurrentAccountId();
|
|
79
|
-
}
|
|
80
|
-
if (!providersAccountId && discoveryUrl) {
|
|
81
|
-
providersAccountId = providers.providersAccountId;
|
|
82
|
-
}
|
|
83
91
|
const currentServiceData = services[serviceName];
|
|
84
92
|
const apps = yield keyValueStorage.getValueByKey(keyValueCollection, '__authorizer_apps');
|
|
85
93
|
const currentApp = apps.value.find((app) => app.value.appId === appId).value;
|
|
@@ -88,8 +96,7 @@ export class OAuth {
|
|
|
88
96
|
const authKey = createAuthKey(id, authName, keyValueCollection, accountId || null);
|
|
89
97
|
const additionalBodyData = {};
|
|
90
98
|
const additionalHeaders = {};
|
|
91
|
-
const
|
|
92
|
-
const redirectProviderUrl = `${emUrl}/http/${providers.providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
|
|
99
|
+
const redirectProviderUrl = `${eventManagerUrl}/http/${providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
|
|
93
100
|
const authConfigs = Object.assign(Object.assign({}, additionalBodyData), { grant_type: 'authorization_code', redirect_uri: redirectProviderUrl, appId });
|
|
94
101
|
if (scope) {
|
|
95
102
|
const formattedScope = formatScope(scope, serviceDefinition.scopeType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAWpC,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC5B,cAAc,EACd,8BAA8B,EAC9B,UAAU,GACX,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,OAAO,KAAK;IAShB,YAAY,MAAmB;QARvB,WAAM,GAAG,UAAU,CAAC,KAAK,CAAC;QAShC,MAAM,
|
|
1
|
+
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuth.d.ts","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OAuth.d.ts","sourceRoot":"","sources":["../../../src/OAuth/OAuth.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,WAAW,EACX,SAAS,EACT,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,SAAS,CAAC;AAejB,qBAAa,KAAK;IAChB,OAAO,CAAC,MAAM,CAAoB;IAElC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,MAAM,EAAE,WAAW;WAiElB,MAAM,CACjB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,iBAAiB,CAAC;YAsLf,eAAe;YAuBf,oBAAoB;IAkCrB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAoCjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CxB,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAoChC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAQrC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@or-sdk/authorizer",
|
|
3
|
-
"version": "0.24.14-beta.
|
|
3
|
+
"version": "0.24.14-beta.944.0",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -18,9 +18,10 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@or-sdk/base": "^0.28.0",
|
|
21
|
+
"@or-sdk/discovery": "^1.6.1",
|
|
21
22
|
"@or-sdk/event-manager": "^0.24.8",
|
|
22
23
|
"@or-sdk/key-value-storage": "^0.25.8",
|
|
23
|
-
"@or-sdk/providers": "^0.2.2-beta.
|
|
24
|
+
"@or-sdk/providers": "^0.2.2-beta.944.0",
|
|
24
25
|
"uuid": "^8.3.2"
|
|
25
26
|
},
|
|
26
27
|
"devDependencies": {
|
package/src/Basic/BasicAuth.ts
CHANGED
package/src/OAuth/OAuth.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { KeyValueStorage } from '@or-sdk/key-value-storage';
|
|
2
2
|
import { Providers } from '@or-sdk/providers';
|
|
3
|
+
import { EVENT_MANAGER_SERVICE_KEY } from '@or-sdk/event-manager';
|
|
4
|
+
import { Discovery } from '@or-sdk/discovery';
|
|
3
5
|
import { timeout } from '@or-sdk/base';
|
|
4
6
|
|
|
5
7
|
import { v4 as uuidv4 } from 'uuid';
|
|
@@ -36,8 +38,15 @@ export class OAuth {
|
|
|
36
38
|
private readonly providers: Providers;
|
|
37
39
|
|
|
38
40
|
constructor(params: OAuthConfig) {
|
|
39
|
-
const {
|
|
40
|
-
|
|
41
|
+
const {
|
|
42
|
+
authKey,
|
|
43
|
+
discoveryUrl,
|
|
44
|
+
eventManagerUrl,
|
|
45
|
+
keyValueCollection,
|
|
46
|
+
providersAccountId,
|
|
47
|
+
serviceName,
|
|
48
|
+
token,
|
|
49
|
+
} = params;
|
|
41
50
|
|
|
42
51
|
if (!(authKey && serviceName && authKey)) {
|
|
43
52
|
throw new Error('Invalit OAuth params passed.');
|
|
@@ -128,6 +137,27 @@ export class OAuth {
|
|
|
128
137
|
providersAccountId,
|
|
129
138
|
} = params;
|
|
130
139
|
|
|
140
|
+
|
|
141
|
+
// If AccountID, EventManagerURL or Providers Account ID are not available, fetch them from Discovery
|
|
142
|
+
if (discoveryUrl && !(accountId && eventManagerUrl && providersAccountId)) {
|
|
143
|
+
const discovery = new Discovery({
|
|
144
|
+
token,
|
|
145
|
+
discoveryUrl,
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
if (!accountId) {
|
|
149
|
+
accountId = await discovery.getCurrentAccountId();
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
if (!eventManagerUrl) {
|
|
153
|
+
eventManagerUrl = await discovery.getServiceUrl(EVENT_MANAGER_SERVICE_KEY);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
if (!providersAccountId) {
|
|
157
|
+
providersAccountId = await discovery.getProvidersAccountId();
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
131
161
|
const keyValueCollection = params.keyValueCollection || serviceName;
|
|
132
162
|
|
|
133
163
|
const keyValueStorage = new KeyValueStorage({
|
|
@@ -153,20 +183,6 @@ export class OAuth {
|
|
|
153
183
|
});
|
|
154
184
|
|
|
155
185
|
|
|
156
|
-
// Fetch discovery params, if needed
|
|
157
|
-
if (!eventManagerUrl && discoveryUrl) {
|
|
158
|
-
eventManagerUrl = await providers.getServiceUrl();
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
if (!accountId && discoveryUrl) {
|
|
162
|
-
accountId = await providers.getCurrentAccountId();
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
if (!providersAccountId && discoveryUrl) {
|
|
166
|
-
providersAccountId = providers.providersAccountId;
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
|
|
170
186
|
const currentServiceData = services[serviceName];
|
|
171
187
|
|
|
172
188
|
const apps = await keyValueStorage.getValueByKey(
|
|
@@ -191,8 +207,7 @@ export class OAuth {
|
|
|
191
207
|
const additionalBodyData = {};
|
|
192
208
|
const additionalHeaders = {};
|
|
193
209
|
|
|
194
|
-
const
|
|
195
|
-
const redirectProviderUrl = `${emUrl}/http/${providers.providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
|
|
210
|
+
const redirectProviderUrl = `${eventManagerUrl}/http/${providersAccountId}${OAUTH_REDIRECT_PROVIDER_PATH}`;
|
|
196
211
|
|
|
197
212
|
// eslint-disable-next-line
|
|
198
213
|
const authConfigs: any = {
|