@aws-amplify/core 6.0.1-console-preview.e8aa063.0 → 6.0.1-console-preview.096eee3.0

package/lib-esm/singleton/Auth/index.js

@@ -34,9 +34,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { Observable } from 'rxjs';
 import { asserts } from '../../Util/errors/AssertError';
 import { AUTH_CONFING_EXCEPTION } from '../../Util/Constants';
 export function isTokenExpired(_a) {
@@ -46,7 +43,6 @@ export function isTokenExpired(_a) {
 }
 var AuthClass = /** @class */ (function () {
     function AuthClass() {
-        this.authSessionObservers = new Set();
     }
     /**
      * Configure Auth category
@@ -63,12 +59,12 @@ var AuthClass = /** @class */ (function () {
         this.authOptions = authOptions;
     };
     AuthClass.prototype.fetchAuthSession = function (options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var tokens, credentialsAndIdentityId;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var tokens, credentialsAndIdentityId, userSub;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         asserts(!!this.authConfig, {
                             name: AUTH_CONFING_EXCEPTION,
@@ -79,9 +75,10 @@ var AuthClass = /** @class */ (function () {
                     case 1:
                         // Get tokens will throw if session cannot be refreshed (network or service error) or return null if not available
                         tokens =
-                            (_c = (_h.sent())) !== null && _c !== void 0 ? _c : undefined;
+                            (_c = (_k.sent())) !== null && _c !== void 0 ? _c : undefined;
                         if (!tokens) return [3 /*break*/, 3];
-                        return [4 /*yield*/, ((_e = (_d = this.authOptions) === null || _d === void 0 ? void 0 : _d.credentialsProvider) === null || _e === void 0 ? void 0 : _e.getCredentialsAndIdentityId({
+                        userSub = (_e = (_d = tokens.accessToken) === null || _d === void 0 ? void 0 : _d.payload) === null || _e === void 0 ? void 0 : _e.sub;
+                        return [4 /*yield*/, ((_g = (_f = this.authOptions) === null || _f === void 0 ? void 0 : _f.credentialsProvider) === null || _g === void 0 ? void 0 : _g.getCredentialsAndIdentityId({
                                 authConfig: this.authConfig,
                                 tokens: tokens,
                                 authenticated: true,
@@ -90,11 +87,11 @@ var AuthClass = /** @class */ (function () {
                     case 2:
                         // getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
                         credentialsAndIdentityId =
-                            _h.sent();
+                            _k.sent();
                         return [3 /*break*/, 5];
                     case 3:
                         if (!!this.authConfig.isMandatorySignInEnabled) return [3 /*break*/, 5];
-                        return [4 /*yield*/, ((_g = (_f = this.authOptions) === null || _f === void 0 ? void 0 : _f.credentialsProvider) === null || _g === void 0 ? void 0 : _g.getCredentialsAndIdentityId({
+                        return [4 /*yield*/, ((_j = (_h = this.authOptions) === null || _h === void 0 ? void 0 : _h.credentialsProvider) === null || _j === void 0 ? void 0 : _j.getCredentialsAndIdentityId({
                                 authConfig: this.authConfig,
                                 authenticated: false,
                                 forceRefresh: options.forceRefresh,
@@ -102,29 +99,30 @@ var AuthClass = /** @class */ (function () {
                     case 4:
                         // getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
                         credentialsAndIdentityId =
-                            _h.sent();
-                        _h.label = 5;
+                            _k.sent();
+                        _k.label = 5;
                     case 5: return [2 /*return*/, {
                             tokens: tokens,
                             credentials: credentialsAndIdentityId === null || credentialsAndIdentityId === void 0 ? void 0 : credentialsAndIdentityId.credentials,
                             identityId: credentialsAndIdentityId === null || credentialsAndIdentityId === void 0 ? void 0 : credentialsAndIdentityId.identityId,
+                            userSub: userSub,
                         }];
                 }
             });
         });
     };
-    /**
-     * Obtain an Observable that notifies on session changes
-     *
-     * @returns Observable<AmplifyUserSession>
-     */
-    AuthClass.prototype.listenSessionChanges = function () {
-        var _this = this;
-        return new Observable(function (observer) {
-            _this.authSessionObservers.add(observer);
-            return function () {
-                _this.authSessionObservers.delete(observer);
-            };
+    AuthClass.prototype.clearCredentials = function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!((_a = this.authOptions) === null || _a === void 0 ? void 0 : _a.credentialsProvider)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.authOptions.credentialsProvider.clearCredentials()];
+                    case 1: return [2 /*return*/, _b.sent()];
+                    case 2: return [2 /*return*/];
+                }
+            });
         });
     };
     return AuthClass;

package/lib-esm/singleton/Auth/types.d.ts

@@ -6,6 +6,7 @@ interface JwtPayloadStandardFields {
     iat?: number;
     scope?: string;
     jti?: string;
+    sub?: string;
 }
 /** JSON type */
 type Json = null | string | number | boolean | Json[] | JsonObject;
@@ -23,6 +24,7 @@ export type AuthSession = {
     tokens?: AuthTokens;
     credentials?: AWSCredentials;
     identityId?: string;
+    userSub?: string;
 };
 export type LibraryAuthOptions = {
     tokenProvider?: TokenProvider;

package/lib-esm/singleton/Auth/utils/index.js

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Buffer } from 'buffer';
 import { asserts } from '../../../Util/errors/AssertError';
 export function assertTokenProviderConfig(authConfig) {
     var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolWebClientId);
@@ -44,9 +43,11 @@ export function decodeJWT(token) {
     if (tokenSplitted.length !== 3) {
         throw new Error('Invalid token');
     }
-    var payloadString = tokenSplitted[1];
-    var payload = JSON.parse(Buffer.from(payloadString, 'base64').toString('utf8'));
     try {
+        var payloadStringb64 = tokenSplitted[1];
+        var payloadArrayBuffer = base64ToBytes(payloadStringb64);
+        var decodeString = new TextDecoder().decode(payloadArrayBuffer);
+        var payload = JSON.parse(decodeString);
         return {
             toString: function () { return token; },
             payload: payload,
@@ -56,3 +57,7 @@ export function decodeJWT(token) {
         throw new Error('Invalid token payload');
     }
 }
+function base64ToBytes(base64) {
+    var binString = atob(base64);
+    return Uint8Array.from(binString, function (m) { return m.codePointAt(0) || 0; });
+}

package/lib-esm/singleton/apis/clearCredentials.d.ts

@@ -0,0 +1 @@
+export declare function clearCredentials(): Promise<void>;

package/lib-esm/singleton/apis/clearCredentials.js

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { Amplify } from '../Amplify';
+export function clearCredentials() {
+    return Amplify.Auth.clearCredentials();
+}

package/lib-esm/singleton/index.d.ts

@@ -1,2 +1,3 @@
 export { AmplifyClass, Amplify } from './Amplify';
 export { fetchAuthSession } from './apis/fetchAuthSession';
+export { clearCredentials } from './apis/clearCredentials';

package/lib-esm/singleton/index.js

@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 export { AmplifyClass, Amplify } from './Amplify';
 export { fetchAuthSession } from './apis/fetchAuthSession';
+export { clearCredentials } from './apis/clearCredentials';