@aws-amplify/auth 4.6.2-next.13 → 4.6.2-next.32
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 +43 -0
- package/lib/.tsbuildinfo +3 -0
- package/lib/Auth.js +65 -129
- package/lib/Auth.js.map +1 -1
- package/lib/Errors.js +3 -15
- package/lib/Errors.js.map +1 -1
- package/lib/OAuth/OAuth.js +34 -106
- package/lib/OAuth/OAuth.js.map +1 -1
- package/lib/types/index.js +2 -4
- package/lib/types/index.js.map +1 -1
- package/lib/urlListener.native.js +7 -64
- package/lib/urlListener.native.js.map +1 -1
- package/lib-esm/.tsbuildinfo +3 -0
- package/lib-esm/Auth.d.ts +2 -1
- package/lib-esm/Auth.js +5 -66
- package/lib-esm/Auth.js.map +1 -1
- package/lib-esm/Errors.js +1 -13
- package/lib-esm/Errors.js.map +1 -1
- package/lib-esm/OAuth/OAuth.js +11 -73
- package/lib-esm/OAuth/OAuth.js.map +1 -1
- package/lib-esm/urlListener.native.js +1 -58
- package/lib-esm/urlListener.native.js.map +1 -1
- package/package.json +12 -6
- package/src/Auth.ts +4 -3
- package/src/OAuth/OAuth.ts +25 -25
- package/build.js +0 -5
- package/dist/aws-amplify-auth.js +0 -16358
- package/dist/aws-amplify-auth.js.map +0 -1
- package/dist/aws-amplify-auth.min.js +0 -44
- package/dist/aws-amplify-auth.min.js.map +0 -1
- package/index.js +0 -7
- package/lib/Auth.d.ts +0 -300
- package/lib/Errors.d.ts +0 -9
- package/lib/OAuth/OAuth.d.ts +0 -29
- package/lib/OAuth/oauthStorage.d.ts +0 -5
- package/lib/OAuth/oauthStorage.native.d.ts +0 -5
- package/lib/OAuth/urlOpener.d.ts +0 -1
- package/lib/OAuth/urlOpener.native.d.ts +0 -1
- package/lib/common/AuthErrorStrings.d.ts +0 -17
- package/lib/index.d.ts +0 -9
- package/lib/types/Auth.d.ts +0 -170
- package/lib/types/index.d.ts +0 -1
- package/lib/urlListener.d.ts +0 -2
- package/lib/urlListener.native.d.ts +0 -2
- package/testSequencer.js +0 -24
- package/webpack.config.dev.js +0 -6
package/lib-esm/OAuth/OAuth.js
CHANGED
|
@@ -10,78 +10,15 @@
|
|
|
10
10
|
* CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
|
|
11
11
|
* and limitations under the License.
|
|
12
12
|
*/
|
|
13
|
-
|
|
14
|
-
__assign = Object.assign || function(t) {
|
|
15
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
16
|
-
s = arguments[i];
|
|
17
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
18
|
-
t[p] = s[p];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
21
|
-
};
|
|
22
|
-
return __assign.apply(this, arguments);
|
|
23
|
-
};
|
|
24
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
25
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
26
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
27
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
28
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
29
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
30
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
31
|
-
});
|
|
32
|
-
};
|
|
33
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
34
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
35
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
36
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
37
|
-
function step(op) {
|
|
38
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
39
|
-
while (_) try {
|
|
40
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
41
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
42
|
-
switch (op[0]) {
|
|
43
|
-
case 0: case 1: t = op; break;
|
|
44
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
45
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
46
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
47
|
-
default:
|
|
48
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
49
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
50
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
51
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
52
|
-
if (t[2]) _.ops.pop();
|
|
53
|
-
_.trys.pop(); continue;
|
|
54
|
-
}
|
|
55
|
-
op = body.call(thisArg, _);
|
|
56
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
57
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
58
|
-
}
|
|
59
|
-
};
|
|
60
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
61
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
62
|
-
if (!m) return o;
|
|
63
|
-
var i = m.call(o), r, ar = [], e;
|
|
64
|
-
try {
|
|
65
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
66
|
-
}
|
|
67
|
-
catch (error) { e = { error: error }; }
|
|
68
|
-
finally {
|
|
69
|
-
try {
|
|
70
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
71
|
-
}
|
|
72
|
-
finally { if (e) throw e.error; }
|
|
73
|
-
}
|
|
74
|
-
return ar;
|
|
75
|
-
};
|
|
13
|
+
import { __assign, __awaiter, __generator, __read } from "tslib";
|
|
76
14
|
import { parse } from 'url'; // Used for OAuth parsing of Cognito Hosted UI
|
|
77
15
|
import { launchUri } from './urlOpener';
|
|
78
16
|
import * as oAuthStorage from './oauthStorage';
|
|
17
|
+
import { Buffer } from 'buffer';
|
|
79
18
|
import { isCognitoHostedOpts, CognitoHostedUIIdentityProvider, } from '../types/Auth';
|
|
80
19
|
import { ConsoleLogger as Logger, Hub, urlSafeEncode } from '@aws-amplify/core';
|
|
81
|
-
import
|
|
82
|
-
|
|
83
|
-
var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' &&
|
|
84
|
-
typeof Symbol.for === 'function'
|
|
20
|
+
import { Sha256 } from '@aws-crypto/sha256-js';
|
|
21
|
+
var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
|
|
85
22
|
? Symbol.for('amplify_default')
|
|
86
23
|
: '@@amplify_default');
|
|
87
24
|
var dispatchAuthEvent = function (event, data, message) {
|
|
@@ -310,14 +247,15 @@ var OAuth = /** @class */ (function () {
|
|
|
310
247
|
return result;
|
|
311
248
|
};
|
|
312
249
|
OAuth.prototype._generateChallenge = function (code) {
|
|
313
|
-
|
|
250
|
+
var awsCryptoHash = new Sha256();
|
|
251
|
+
awsCryptoHash.update(code);
|
|
252
|
+
var resultFromAWSCrypto = awsCryptoHash.digestSync();
|
|
253
|
+
var b64 = Buffer.from(resultFromAWSCrypto).toString('base64');
|
|
254
|
+
var base64URLFromAWSCrypto = this._base64URL(b64);
|
|
255
|
+
return base64URLFromAWSCrypto;
|
|
314
256
|
};
|
|
315
257
|
OAuth.prototype._base64URL = function (string) {
|
|
316
|
-
return string
|
|
317
|
-
.toString(Base64)
|
|
318
|
-
.replace(/=/g, '')
|
|
319
|
-
.replace(/\+/g, '-')
|
|
320
|
-
.replace(/\//g, '_');
|
|
258
|
+
return string.replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
321
259
|
};
|
|
322
260
|
OAuth.prototype._generateRandom = function (size) {
|
|
323
261
|
var CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../src/OAuth/OAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG
|
|
1
|
+
{"version":3,"file":"OAuth.js","sourceRoot":"","sources":["../../src/OAuth/OAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,61 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
__assign = Object.assign || function(t) {
|
|
3
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
-
s = arguments[i];
|
|
5
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
-
t[p] = s[p];
|
|
7
|
-
}
|
|
8
|
-
return t;
|
|
9
|
-
};
|
|
10
|
-
return __assign.apply(this, arguments);
|
|
11
|
-
};
|
|
12
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
13
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
14
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
15
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
16
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
17
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
18
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
19
|
-
});
|
|
20
|
-
};
|
|
21
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
22
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
23
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
24
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
25
|
-
function step(op) {
|
|
26
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
27
|
-
while (_) try {
|
|
28
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
29
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
30
|
-
switch (op[0]) {
|
|
31
|
-
case 0: case 1: t = op; break;
|
|
32
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
33
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
34
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
35
|
-
default:
|
|
36
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
37
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
38
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
39
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
40
|
-
if (t[2]) _.ops.pop();
|
|
41
|
-
_.trys.pop(); continue;
|
|
42
|
-
}
|
|
43
|
-
op = body.call(thisArg, _);
|
|
44
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
45
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
46
|
-
}
|
|
47
|
-
};
|
|
48
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
49
|
-
var t = {};
|
|
50
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
51
|
-
t[p] = s[p];
|
|
52
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
53
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
54
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
55
|
-
t[p[i]] = s[p[i]];
|
|
56
|
-
}
|
|
57
|
-
return t;
|
|
58
|
-
};
|
|
1
|
+
import { __assign, __awaiter, __generator, __rest } from "tslib";
|
|
59
2
|
/*
|
|
60
3
|
* Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
61
4
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlListener.native.js","sourceRoot":"","sources":["../src/urlListener.native.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"urlListener.native.js","sourceRoot":"","sources":["../src/urlListener.native.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzC,IAAI,OAAO,CAAC;AAEZ,gBAAe,UAAM,QAAQ;;;;;QAC5B,IAAI,OAAO,EAAE;YACZ,sBAAO;SACP;QAKD,IAAI;YACH,CAAC,4BAA+C,EAA7C,oBAAO,EAAE,sBAAQ,CAA6B,CAAC;SAClD;QAAC,OAAO,KAAK,EAAE;YACf,wBAAwB;SACxB;QAED,OAAO;YACN,OAAO;gBACP,CAAC,UAAC,EAAiC;oBAA/B,IAAA,YAAG,EAAE,0BAAO;oBACf,MAAM,CAAC,KAAK,CAAC,aAAa,aAAI,GAAG,KAAA,IAAK,IAAI,EAAG,CAAC;oBAC9C,QAAQ,CAAC,EAAE,GAAG,KAAA,EAAE,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;QAEJ,oGAAoG;QACpG,IAAI,OAAO,CAAC,mBAAmB,KAAK,OAAO,UAAU,EAAE;YACtD,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC5C,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACzC;aAAM;YACN,kDAAkD;YAClD,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,+CAApB,YAAY,EAAa;YACzB,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACxD;QACD,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAM,WAAW;;;;;6BAChD,CAAA,WAAW,KAAK,QAAQ,CAAA,EAAxB,wBAAwB;wBACR,qBAAM,OAAO,CAAC,aAAa,EAAE,EAAA;;wBAA1C,UAAU,GAAG,SAA6B;wBAChD,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;;;;;aAE9B,CAAC,CAAC;;;KACH,EAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/auth",
|
|
3
|
-
"version": "4.6.2-next.
|
|
3
|
+
"version": "4.6.2-next.32+4137aa79c",
|
|
4
4
|
"description": "Auth category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -40,11 +40,17 @@
|
|
|
40
40
|
"url": "https://github.com/aws/aws-amplify/issues"
|
|
41
41
|
},
|
|
42
42
|
"homepage": "https://aws-amplify.github.io/",
|
|
43
|
+
"files": [
|
|
44
|
+
"lib",
|
|
45
|
+
"lib-esm",
|
|
46
|
+
"src"
|
|
47
|
+
],
|
|
43
48
|
"dependencies": {
|
|
44
|
-
"@aws-amplify/cache": "4.0.51-next.
|
|
45
|
-
"@aws-amplify/core": "4.6.2-next.
|
|
46
|
-
"amazon-cognito-identity-js": "5.2.11-next.
|
|
47
|
-
"crypto-js": "^4.1.1"
|
|
49
|
+
"@aws-amplify/cache": "4.0.51-next.32+4137aa79c",
|
|
50
|
+
"@aws-amplify/core": "4.6.2-next.32+4137aa79c",
|
|
51
|
+
"amazon-cognito-identity-js": "5.2.11-next.56+4137aa79c",
|
|
52
|
+
"crypto-js": "^4.1.1",
|
|
53
|
+
"tslib": "^2.0.0"
|
|
48
54
|
},
|
|
49
55
|
"devDependencies": {
|
|
50
56
|
"@jest/test-sequencer": "^24.9.0"
|
|
@@ -95,5 +101,5 @@
|
|
|
95
101
|
],
|
|
96
102
|
"testSequencer": "./testSequencer.js"
|
|
97
103
|
},
|
|
98
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "4137aa79c6c2362afc581d3915d77f5067ea6700"
|
|
99
105
|
}
|
package/src/Auth.ts
CHANGED
|
@@ -40,8 +40,8 @@ import {
|
|
|
40
40
|
Hub,
|
|
41
41
|
StorageHelper,
|
|
42
42
|
ICredentials,
|
|
43
|
-
Parser,
|
|
44
43
|
browserOrNode,
|
|
44
|
+
parseAWSExports,
|
|
45
45
|
UniversalStorage,
|
|
46
46
|
urlSafeDecode,
|
|
47
47
|
HubCallback,
|
|
@@ -150,7 +150,7 @@ export class AuthClass {
|
|
|
150
150
|
const conf = Object.assign(
|
|
151
151
|
{},
|
|
152
152
|
this._config,
|
|
153
|
-
|
|
153
|
+
parseAWSExports(config).Auth,
|
|
154
154
|
config
|
|
155
155
|
);
|
|
156
156
|
this._config = conf;
|
|
@@ -621,7 +621,8 @@ export class AuthClass {
|
|
|
621
621
|
/**
|
|
622
622
|
* Sign in
|
|
623
623
|
* @param {String | SignInOpts} usernameOrSignInOpts - The username to be signed in or the sign in options
|
|
624
|
-
* @param {String}
|
|
624
|
+
* @param {String} pw - The password of the username
|
|
625
|
+
* @param {ClientMetaData} clientMetadata - Client metadata for custom workflows
|
|
625
626
|
* @return - A promise resolves the CognitoUser
|
|
626
627
|
*/
|
|
627
628
|
public signIn(
|
package/src/OAuth/OAuth.ts
CHANGED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
import { parse } from 'url'; // Used for OAuth parsing of Cognito Hosted UI
|
|
15
15
|
import { launchUri } from './urlOpener';
|
|
16
16
|
import * as oAuthStorage from './oauthStorage';
|
|
17
|
+
import { Buffer } from 'buffer';
|
|
17
18
|
|
|
18
19
|
import {
|
|
19
20
|
OAuthOpts,
|
|
@@ -23,13 +24,12 @@ import {
|
|
|
23
24
|
|
|
24
25
|
import { ConsoleLogger as Logger, Hub, urlSafeEncode } from '@aws-amplify/core';
|
|
25
26
|
|
|
26
|
-
import
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
: '@@amplify_default') as Symbol;
|
|
27
|
+
import { Sha256 } from '@aws-crypto/sha256-js';
|
|
28
|
+
const AMPLIFY_SYMBOL = (
|
|
29
|
+
typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
|
|
30
|
+
? Symbol.for('amplify_default')
|
|
31
|
+
: '@@amplify_default'
|
|
32
|
+
) as Symbol;
|
|
33
33
|
|
|
34
34
|
const dispatchAuthEvent = (event: string, data: any, message: string) => {
|
|
35
35
|
Hub.dispatch('auth', { event, data, message }, 'Auth', AMPLIFY_SYMBOL);
|
|
@@ -169,18 +169,15 @@ export default class OAuth {
|
|
|
169
169
|
.map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
|
|
170
170
|
.join('&');
|
|
171
171
|
|
|
172
|
-
const {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
},
|
|
182
|
-
body,
|
|
183
|
-
})) as any).json();
|
|
172
|
+
const { access_token, refresh_token, id_token, error } = await (
|
|
173
|
+
(await fetch(oAuthTokenEndpoint, {
|
|
174
|
+
method: 'POST',
|
|
175
|
+
headers: {
|
|
176
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
177
|
+
},
|
|
178
|
+
body,
|
|
179
|
+
})) as any
|
|
180
|
+
).json();
|
|
184
181
|
|
|
185
182
|
if (error) {
|
|
186
183
|
throw new Error(error);
|
|
@@ -305,15 +302,18 @@ export default class OAuth {
|
|
|
305
302
|
}
|
|
306
303
|
|
|
307
304
|
private _generateChallenge(code: string) {
|
|
308
|
-
|
|
305
|
+
const awsCryptoHash = new Sha256();
|
|
306
|
+
awsCryptoHash.update(code);
|
|
307
|
+
|
|
308
|
+
const resultFromAWSCrypto = awsCryptoHash.digestSync();
|
|
309
|
+
const b64 = Buffer.from(resultFromAWSCrypto).toString('base64');
|
|
310
|
+
const base64URLFromAWSCrypto = this._base64URL(b64);
|
|
311
|
+
|
|
312
|
+
return base64URLFromAWSCrypto;
|
|
309
313
|
}
|
|
310
314
|
|
|
311
315
|
private _base64URL(string) {
|
|
312
|
-
return string
|
|
313
|
-
.toString(Base64)
|
|
314
|
-
.replace(/=/g, '')
|
|
315
|
-
.replace(/\+/g, '-')
|
|
316
|
-
.replace(/\//g, '_');
|
|
316
|
+
return string.replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
317
317
|
}
|
|
318
318
|
|
|
319
319
|
private _generateRandom(size: number) {
|