feat(SSR): withSSRContext

package.json

@@ -12,6 +12,7 @@
 		"coverage": "codecov || exit 0",
 		"docs": "typedoc packages/**/src --name amplify-js --hideGenerator --excludePrivate --ignoreCompilerErrors --mode file --out docs/api --theme docs/amplify-theme/typedoc/ --readme README.md",
 		"build": "lerna run build --stream",
+		"build:watch": "concurrently 'lerna run build:cjs:watch --parallel' 'lerna run build:esm:watch --parallel' --raw",
 		"build:esm:watch": "lerna run build:esm:watch --parallel",
 		"build:cjs:watch": "lerna run build:cjs:watch --parallel",
 		"clean": "lerna run clean --parallel",

packages/amazon-cognito-identity-js/package.json

@@ -64,6 +64,7 @@
   "dependencies": {
     "buffer": "4.9.1",
     "crypto-js": "^3.3.0",
+    "isomorphic-unfetch": "^3.0.0",
     "js-cookie": "^2.1.4"
   },
   "devDependencies": {

packages/amazon-cognito-identity-js/src/Client.js

@@ -1,3 +1,5 @@
+import 'isomorphic-unfetch';
+
 import UserAgent from './UserAgent';
 
 class CognitoError extends Error {

packages/analytics/src/Analytics.ts

@@ -75,7 +75,6 @@ export class AnalyticsClass {
 		Hub.listen('auth', listener);
 		Hub.listen('storage', listener);
 		Hub.listen('analytics', listener);
-		Amplify.register(this);
 	}
 
 	public getModuleName() {
@@ -402,3 +401,4 @@ const sendEvents = () => {
 };
 
 export const Analytics = new AnalyticsClass();
+Amplify.register(Analytics);

packages/api-graphql/src/GraphQLAPI.ts

@@ -46,13 +46,14 @@ export class GraphQLAPIClass {
 	private _options;
 	private _api = null;
 
+	Credentials = Credentials;
+
 	/**
 	 * Initialize GraphQL API with AWS configuration
 	 * @param {Object} options - Configuration object for API
 	 */
 	constructor(options) {
 		this._options = options;
-		Amplify.register(this);
 		logger.debug('API Options', this._options);
 	}
 
@@ -70,6 +71,10 @@ export class GraphQLAPIClass {
 		let opt = { ...otherOptions, ...API };
 		logger.debug('configure GraphQL API', { opt });
 
+		if (opt['Credentials']) {
+			this.Credentials = opt['Credentials'];
+		}
+
 		if (opt['aws_project_region']) {
 			opt = Object.assign({}, opt, {
 				region: opt['aws_project_region'],
@@ -355,10 +360,10 @@ export class GraphQLAPIClass {
 	 * @private
 	 */
 	_ensureCredentials() {
-		return Credentials.get()
+		return this.Credentials.get()
 			.then(credentials => {
 				if (!credentials) return false;
-				const cred = Credentials.shear(credentials);
+				const cred = this.Credentials.shear(credentials);
 				logger.debug('set credentials for api', cred);
 
 				return true;
@@ -371,3 +376,4 @@ export class GraphQLAPIClass {
 }
 
 export const GraphQLAPI = new GraphQLAPIClass(null);
+Amplify.register(GraphQLAPI);

packages/api-rest/src/RestAPI.ts

@@ -31,7 +31,6 @@ export class RestAPIClass {
 	 */
 	constructor(options) {
 		this._options = options;
-		Amplify.register(this);
 		logger.debug('API Options', this._options);
 	}
 
@@ -49,6 +48,10 @@ export class RestAPIClass {
 		let opt = { ...otherOptions, ...API };
 		logger.debug('configure Rest API', { opt });
 
+		if (opt['Credentials']) {
+			this._api.Credentials = opt['Credentials'];
+		}
+
 		if (opt['aws_project_region']) {
 			if (opt['aws_cloud_logic_custom']) {
 				const custom = opt['aws_cloud_logic_custom'];
@@ -245,3 +248,4 @@ export class RestAPIClass {
 }
 
 export const RestAPI = new RestAPIClass(null);
+Amplify.register(RestAPI);

packages/api-rest/src/RestClient.ts

@@ -13,6 +13,7 @@
 
 import {
 	ConsoleLogger as Logger,
+	CredentialsClass,
 	DateUtils,
 	Signer,
 	Platform,
@@ -60,15 +61,21 @@ export class RestClient {
 	 */
 	private _cancelTokenMap: WeakMap<any, CancelTokenSource> = null;
 
+	Credentials = Credentials;
+
 	/**
 	 * @param {RestClientOptions} [options] - Instance options
 	 */
-	constructor(options: apiOptions) {
+	constructor(options: apiOptions & { Credentials?: CredentialsClass }) {
 		this._options = options;
 		logger.debug('API Options', this._options);
 		if (this._cancelTokenMap == null) {
 			this._cancelTokenMap = new WeakMap();
 		}
+
+		if (options.Credentials) {
+			this.Credentials = options.Credentials;
+		}
 	}
 
 	/**
@@ -168,7 +175,7 @@ export class RestClient {
 		}
 
 		// Signing the request in case there credentials are available
-		return Credentials.get().then(
+		return this.Credentials.get().then(
 			credentials => {
 				return this._signed({ ...params }, credentials, isAllResponse).catch(
 					error => {

packages/api/src/API.ts

@@ -42,7 +42,6 @@ export class APIClass {
 		this._options = options;
 		this._restApi = new RestAPIClass(options);
 		this._graphqlApi = new GraphQLAPIClass(options);
-		Amplify.register(this);
 		logger.debug('API Options', this._options);
 	}
 
@@ -179,3 +178,4 @@ export class APIClass {
 }
 
 export const API = new APIClass(null);
+Amplify.register(API);

packages/auth/src/Auth.ts

@@ -100,6 +100,8 @@ export class AuthClass {
 	private _storageSync;
 	private oAuthFlowInProgress: boolean = false;
 
+	Credentials = Credentials;
+
 	/**
 	 * Initialize Auth with AWS configurations
 	 * @param {Object} config - Configuration of the Auth
@@ -122,7 +124,6 @@ export class AuthClass {
 					break;
 			}
 		});
-		Amplify.register(this);
 	}
 
 	public getModuleName() {
@@ -181,7 +182,7 @@ export class AuthClass {
 			this.userPool = new CognitoUserPool(userPoolData);
 		}
 
-		Credentials.configure({
+		this.Credentials.configure({
 			mandatorySignIn,
 			region: identityPoolRegion || region,
 			userPoolId,
@@ -480,8 +481,8 @@ export class AuthClass {
 				delete user['challengeName'];
 				delete user['challengeParam'];
 				try {
-					await Credentials.clear();
-					const cred = await Credentials.set(session, 'session');
+					await this.Credentials.clear();
+					const cred = await this.Credentials.set(session, 'session');
 					logger.debug('succeed to get cognito credentials', cred);
 				} catch (e) {
 					logger.debug('cannot get cognito credentials', e);
@@ -701,7 +702,9 @@ export class AuthClass {
 		user: CognitoUser | any,
 		mfaMethod: 'TOTP' | 'SMS' | 'NOMFA'
 	): Promise<string> {
-		const userData = await this._getUserData(user, { bypassCache: true });
+		const userData = await this._getUserData(user, {
+			bypassCache: true,
+		});
 		let smsMfaSettings = null;
 		let totpMfaSettings = null;
 
@@ -903,8 +906,8 @@ export class AuthClass {
 					onSuccess: async session => {
 						logger.debug(session);
 						try {
-							await Credentials.clear();
-							const cred = await Credentials.set(session, 'session');
+							await this.Credentials.clear();
+							const cred = await this.Credentials.set(session, 'session');
 							logger.debug('succeed to get cognito credentials', cred);
 						} catch (e) {
 							logger.debug('cannot get cognito credentials', e);
@@ -945,8 +948,8 @@ export class AuthClass {
 					onSuccess: async session => {
 						logger.debug(session);
 						try {
-							await Credentials.clear();
-							const cred = await Credentials.set(session, 'session');
+							await this.Credentials.clear();
+							const cred = await this.Credentials.set(session, 'session');
 							logger.debug('succeed to get cognito credentials', cred);
 						} catch (e) {
 							logger.debug('cannot get cognito credentials', e);
@@ -1356,23 +1359,23 @@ export class AuthClass {
 
 		if (federatedInfo) {
 			// refresh the jwt token here if necessary
-			return Credentials.refreshFederatedToken(federatedInfo);
+			return this.Credentials.refreshFederatedToken(federatedInfo);
 		} else {
 			return this.currentSession()
 				.then(session => {
 					logger.debug('getting session success', session);
-					return Credentials.set(session, 'session');
+					return this.Credentials.set(session, 'session');
 				})
 				.catch(error => {
 					logger.debug('getting session failed', error);
-					return Credentials.set(null, 'guest');
+					return this.Credentials.set(null, 'guest');
 				});
 		}
 	}
 
 	public currentCredentials(): Promise<ICredentials> {
 		logger.debug('getting current credentials');
-		return Credentials.get();
+		return this.Credentials.get();
 	}
 
 	/**
@@ -1539,7 +1542,7 @@ export class AuthClass {
 
 	private async cleanCachedItems() {
 		// clear cognito cached item
-		await Credentials.clear();
+		await this.Credentials.clear();
 	}
 
 	/**
@@ -1685,7 +1688,7 @@ export class AuthClass {
 	 * @return {Object }- current User's information
 	 */
 	public async currentUserInfo() {
-		const source = Credentials.getCredSource();
+		const source = this.Credentials.getCredSource();
 
 		if (!source || source === 'aws' || source === 'userPool') {
 			const user = await this.currentUserPoolUser().catch(err =>
@@ -1808,9 +1811,9 @@ export class AuthClass {
 			} catch (e) {}
 
 			const { token, identity_id, expires_at } = response;
-			// Because Credentials.set would update the user info with identity id
+			// Because this.Credentials.set would update the user info with identity id
 			// So we need to retrieve the user again.
-			const credentials = await Credentials.set(
+			const credentials = await this.Credentials.set(
 				{ provider, token, identity_id, user, expires_at },
 				'federation'
 			);
@@ -1877,13 +1880,15 @@ export class AuthClass {
 						RefreshToken: new CognitoRefreshToken({
 							RefreshToken: refreshToken,
 						}),
-						AccessToken: new CognitoAccessToken({ AccessToken: accessToken }),
+						AccessToken: new CognitoAccessToken({
+							AccessToken: accessToken,
+						}),
 					});
 
 					let credentials;
 					// Get AWS Credentials & store if Identity Pool is defined
 					if (this._config.identityPoolId) {
-						credentials = await Credentials.set(session, 'session');
+						credentials = await this.Credentials.set(session, 'session');
 						logger.debug('AWS credentials', credentials);
 					}
 
@@ -2044,3 +2049,5 @@ export class AuthClass {
 }
 
 export const Auth = new AuthClass(null);
+
+Amplify.register(Auth);

packages/auth/src/index.ts

@@ -11,11 +11,18 @@
  * and limitations under the License.
  */
 
-import { Auth, CognitoHostedUIIdentityProvider } from './Auth';
-import { CognitoUser, CookieStorage, appendToCognitoUserAgent } from 'amazon-cognito-identity-js';
+export {
+	CognitoUser,
+	CookieStorage,
+	appendToCognitoUserAgent,
+} from 'amazon-cognito-identity-js';
 
-/**
- * @deprecated use named import
- */
-export default Auth;
-export { Auth, CognitoUser, CookieStorage, CognitoHostedUIIdentityProvider, appendToCognitoUserAgent };
+export {
+	/**
+	 * @deprecated use named import
+	 */
+	Auth as default,
+	Auth,
+	AuthClass,
+	CognitoHostedUIIdentityProvider,
+} from './Auth';

packages/aws-amplify/__tests__/exports-test.ts

@@ -88,6 +88,7 @@ describe('aws-amplify', () => {
 			  "Signer",
 			  "I18n",
 			  "ServiceWorker",
+			  "withSSRContext",
 			  "default",
 			]
 		`);