Merge branch 'master' into auth-services

pradel · pradel · commit e47a93401d94 · 2018-02-23T14:59:00.000+01:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,2 @@
+<!-- Love accounts-js? Please consider supporting our collective:
+👉  https://opencollective.com/accounts-js/donate -->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,3 +51,41 @@ Alternatively, prepend your PR title with `[discuss]` to have a conversation aro
 * Should still submit a PR for changes (i.e. no work should be done on a branch directly; all work should be done in it's own separate feature branch), which should be okayed by one other team member before merging.
 
 * Should squash merged PRs whenever possible (via GitHub options).
+
+
+## Financial contributions
+
+We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/accounts-js).
+Anyone can file an expense. If the expense makes sense for the development of the community, it will be "merged" in the ledger of our open collective by the core contributors and the person who filed the expense will be reimbursed.
+
+
+## Credits
+
+
+### Contributors
+
+Thank you to all the people who have already contributed to accounts-js!
+<a href="graphs/contributors"><img src="https://opencollective.com/accounts-js/contributors.svg?width=890" /></a>
+
+
+### Backers
+
+Thank you to all our backers! [[Become a backer](https://opencollective.com/accounts-js#backer)]
+
+<a href="https://opencollective.com/accounts-js#backers" target="_blank"><img src="https://opencollective.com/accounts-js/backers.svg?width=890"></a>
+
+
+### Sponsors
+
+Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/accounts-js#sponsor))
+
+<a href="https://opencollective.com/accounts-js/sponsor/0/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/1/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/2/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/3/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/4/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/5/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/6/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/7/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/8/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/9/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/9/avatar.svg"></a>
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 *Fullstack authentication and accounts-management for GraphQL and REST*
 
-[![npm](https://img.shields.io/npm/v/@accounts/server.svg?maxAge=2592000)](https://www.npmjs.com/package/@accounts/accounts) [![CircleCI](https://circleci.com/gh/accounts-js/accounts.svg?style=svg)](https://circleci.com/gh/accounts-js/accounts) [![Coverage Status](https://coveralls.io/repos/github/accounts-js/accounts/badge.svg?branch=master)](https://coveralls.io/github/accounts-js/accounts?branch=master) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)
+[![Backers on Open Collective](https://opencollective.com/accounts-js/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/accounts-js/sponsors/badge.svg)](#sponsors) [![npm](https://img.shields.io/npm/v/@accounts/server.svg?maxAge=2592000)](https://www.npmjs.com/package/@accounts/accounts) [![CircleCI](https://circleci.com/gh/accounts-js/accounts.svg?style=svg)](https://circleci.com/gh/accounts-js/accounts) [![Coverage Status](https://coveralls.io/repos/github/accounts-js/accounts/badge.svg?branch=master)](https://coveralls.io/github/accounts-js/accounts?branch=master) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)
 
 ## Community
 
@@ -87,3 +87,33 @@ The following hooks are available:
 * `onRefreshTokensError`: the callback will call with the `AccountsError` object.
 * `onImpersonationSuccess`: will call with: `(originalUser, impersonationResult: { authorized, user, tokens: { refreshToken, accessToken }})`
 * `onImpersonationError`: the callback will call with the `AccountsError` object.
+
+## Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="graphs/contributors"><img src="https://opencollective.com/accounts-js/contributors.svg?width=890" /></a>
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/accounts-js#backer)]
+
+<a href="https://opencollective.com/accounts-js#backers" target="_blank"><img src="https://opencollective.com/accounts-js/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/accounts-js#sponsor)]
+
+<a href="https://opencollective.com/accounts-js/sponsor/0/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/1/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/2/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/3/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/4/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/5/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/6/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/7/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/8/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/accounts-js/sponsor/9/website" target="_blank"><img src="https://opencollective.com/accounts-js/sponsor/9/avatar.svg"></a>
+
+
diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
     "clean": "lerna run clean",
     "compile": "lerna run compile",
     "lint": "tslint packages/*/{src,__tests__}/**/*.ts",
-    "prebootstrap": "yarn install",
-    "postinstall": "lerna bootstrap",
+    "prebootstrap": "npm install",
+    "postinstall": "lerna bootstrap && opencollective postinstall",
     "publish": "lerna publish",
     "publish:canary": "yarn run publish -- --canary",
     "test": "yarn lint && yarn compile && yarn coverage",
@@ -34,5 +34,13 @@
     "ts-jest": "^21.1.4",
     "tslint": "^5.8.0",
     "typescript": "^2.4.1"
+  },
+  "dependencies": {
+    "opencollective": "^1.0.3"
+  },
+  "collective": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/accounts-js",
+    "logo": "https://opencollective.com/accounts-js/logo.txt"
   }
-}
+}
diff --git a/packages/client/src/accounts-client.ts b/packages/client/src/accounts-client.ts
@@ -50,7 +50,7 @@ export class AccountsClient {
     options: AccountsClientConfiguration,
     transport: TransportInterface
   ) {
-    this.options = options;
+    this.options = { ...config, ...options };
     this.storage = options.tokenStorage || config.tokenStorage;
     if (!transport) {
       throw new AccountsError('A REST or GraphQL transport is required');
diff --git a/packages/server/src/config.ts b/packages/server/src/config.ts
@@ -6,7 +6,7 @@ import {
   config as sharedConfig,
   PasswordSignupFields,
 } from '@accounts/common';
-import { EmailTemplateType } from './email';
+import { EmailTemplatesType, EmailTemplateType } from './email';
 
 // export type PasswordAuthenticator = (
 //   user: PasswordLoginUserType,
@@ -53,6 +53,7 @@ export type AccountsServerConfiguration = AccountsCommonConfiguration & {
   tokenConfigs?: TokenConfig;
   // passwordAuthenticator?: PasswordAuthenticator;
   resumeSessionValidator?: ResumeSessionValidator;
+  emailTemplates?: EmailTemplatesType;
   prepareMail?: PrepareMailFunction;
   sendMail?: SendMailFunction;
   // https://github.com/eleith/emailjs#emailserverconnectoptions
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!-- Love accounts-js? Please consider supporting our collective:`
	`2`	`+👉 https://opencollective.com/accounts-js/donate -->`