github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11708 from meteor/feature/accounts-ui-config-via-settings

Browse Source 
Accounts UI config via settings
This commit is contained in:
Denilson
2022-02-04 10:27:04 -04:00
committed by GitHub
parent 3be36a6b76 5c510e22b1
commit 25ab366b3c
4 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/history.md
View File

@@ -20,6 +20,9 @@
* `typescript@4.5.4`
- Upgrade TypeScript to `4.5.4` [PR](https://github.com/meteor/meteor/pull/11846)
* `accounts-ui-unstyled@1.6.0`
- `Accounts.ui.config` can now be set via `Meteor.settings.public.packages.accounts-ui-unstyled`.
#### Independent Releases
`email@2.2.1`

5
docs/source/api/accounts.md
View File

@@ -242,7 +242,7 @@ ServiceConfiguration.configurations.upsert(
);
```
Since Meteor 2.5 you no longer need to manually set the configuration and instead can use Meteor settings by setting your services under `Meteor.settings.packages.service-configuration.<service>`. All the properties can be set under the service and will be added to the database as is, so make sure that they are correct. For the example above, the settings would look like:
Since Meteor 2.6.1 you no longer need to manually set the configuration and instead can use Meteor settings by setting your services under `Meteor.settings.packages.service-configuration.<service>`. All the properties can be set under the service and will be added to the database as is, so make sure that they are correct. For the example above, the settings would look like:
```json
{
"packages": {
@@ -334,3 +334,6 @@ Accounts.ui.config({
passwordSignupFields: 'USERNAME_AND_OPTIONAL_EMAIL'
});
```
Since Meteor 2.6.1 you can configure these in your Meteor settings under `Meteor.settings.public.packages.accounts-ui-unstyled`.

69
packages/accounts-ui-unstyled/accounts_ui.js
View File

@@ -20,18 +20,18 @@ const VALID_OPTIONS = new Set()
.add('passwordlessSignupFields');
const VALID_PASSWORD_SIGNUP_FIELDS = new Set()
.add("USERNAME_AND_EMAIL")
.add("USERNAME_AND_OPTIONAL_EMAIL")
.add("USERNAME_ONLY")
.add("EMAIL_ONLY");
.add('USERNAME_AND_EMAIL')
.add('USERNAME_AND_OPTIONAL_EMAIL')
.add('USERNAME_ONLY')
.add('EMAIL_ONLY');
function isValidPasswordSignupField(field) {
return VALID_PASSWORD_SIGNUP_FIELDS.has(field);
}
const VALID_PASSWORDLESS_SIGNUP_FIELDS = new Set()
.add("USERNAME_AND_EMAIL")
.add("EMAIL_ONLY")
.add('USERNAME_AND_EMAIL')
.add('EMAIL_ONLY');
function isValidPasswordlessSignupField(field) {
return VALID_PASSWORDLESS_SIGNUP_FIELDS.has(field);
@@ -62,15 +62,25 @@ Accounts.ui.config = options => {
handleForceApprovalPrompt(options);
};
Meteor.startup(function() {
const settings = Meteor.settings.public?.packages?.['accounts-ui-unstyled'];
if (settings) {
Accounts.ui.config(settings);
}
});
function handlePasswordlessSignupFields(options) {
let { passwordlessSignupFields } = options;
if (passwordlessSignupFields) {
const reportInvalid = () => {
throw new Error(`Accounts.ui.config: Invalid option for \`passwordlessSignupFields\`: ${passwordlessSignupFields}`);
throw new Error(
`Accounts.ui.config: Invalid option for \`passwordlessSignupFields\`: ${passwordlessSignupFields}`
);
};
if (typeof passwordlessSignupFields === "string") {
if (typeof passwordlessSignupFields === 'string') {
passwordlessSignupFields = [passwordlessSignupFields];
} else if (!Array.isArray(passwordlessSignupFields)) {
reportInvalid();
@@ -78,7 +88,9 @@ function handlePasswordlessSignupFields(options) {
if (passwordlessSignupFields.every(isValidPasswordlessSignupField)) {
if (Accounts.ui._options.passwordlessSignupFields) {
throw new Error("Accounts.ui.config: Can't set `passwordlessSignupFields` more than once");
throw new Error(
"Accounts.ui.config: Can't set `passwordlessSignupFields` more than once"
);
}
Object.assign(Accounts.ui._options, { passwordlessSignupFields });
return;
@@ -93,10 +105,12 @@ function handlePasswordSignupFields(options) {
if (passwordSignupFields) {
const reportInvalid = () => {
throw new Error(`Accounts.ui.config: Invalid option for \`passwordSignupFields\`: ${passwordSignupFields}`);
throw new Error(
`Accounts.ui.config: Invalid option for \`passwordSignupFields\`: ${passwordSignupFields}`
);
};
if (typeof passwordSignupFields === "string") {
if (typeof passwordSignupFields === 'string') {
passwordSignupFields = [passwordSignupFields];
} else if (!Array.isArray(passwordSignupFields)) {
reportInvalid();
@@ -104,7 +118,9 @@ function handlePasswordSignupFields(options) {
if (passwordSignupFields.every(isValidPasswordSignupField)) {
if (Accounts.ui._options.passwordSignupFields) {
throw new Error("Accounts.ui.config: Can't set `passwordSignupFields` more than once");
throw new Error(
"Accounts.ui.config: Can't set `passwordSignupFields` more than once"
);
}
Object.assign(Accounts.ui._options, { passwordSignupFields });
return;
@@ -125,7 +141,7 @@ export function passwordSignupFields() {
return [passwordSignupFields];
}
return ["EMAIL_ONLY"];
return ['EMAIL_ONLY'];
}
export function passwordlessSignupFields() {
@@ -139,21 +155,24 @@ export function passwordlessSignupFields() {
return [passwordlessSignupFields];
}
return ["EMAIL_ONLY"];
return ['EMAIL_ONLY'];
}
function handleRequestPermissions({ requestPermissions }) {
if (requestPermissions) {
Object.keys(requestPermissions).forEach(service => {
if (Accounts.ui._options.requestPermissions[service]) {
throw new Error(`Accounts.ui.config: Can't set \`requestPermissions\` more than once for ${service}`);
throw new Error(
`Accounts.ui.config: Can't set \`requestPermissions\` more than once for ${service}`
);
}
const scope = requestPermissions[service];
if (!Array.isArray(scope)) {
throw new Error("Accounts.ui.config: Value for `requestPermissions` must be an array");
throw new Error(
'Accounts.ui.config: Value for `requestPermissions` must be an array'
);
}
Accounts.ui._options.requestPermissions[service] = scope;
@@ -165,11 +184,15 @@ function handleRequestOfflineToken({ requestOfflineToken }) {
if (requestOfflineToken) {
Object.keys(requestOfflineToken).forEach(service => {
if (service !== 'google') {
throw new Error("Accounts.ui.config: `requestOfflineToken` only supported for Google login at the moment.");
throw new Error(
'Accounts.ui.config: `requestOfflineToken` only supported for Google login at the moment.'
);
}
if (Accounts.ui._options.requestOfflineToken[service]) {
throw new Error(`Accounts.ui.config: Can't set \`requestOfflineToken\` more than once for ${service}`);
throw new Error(
`Accounts.ui.config: Can't set \`requestOfflineToken\` more than once for ${service}`
);
}
Accounts.ui._options.requestOfflineToken[service] =
@@ -182,11 +205,15 @@ function handleForceApprovalPrompt({ forceApprovalPrompt }) {
if (forceApprovalPrompt) {
Object.keys(forceApprovalPrompt).forEach(service => {
if (service !== 'google') {
throw new Error("Accounts.ui.config: `forceApprovalPrompt` only supported for Google login at the moment.");
throw new Error(
'Accounts.ui.config: `forceApprovalPrompt` only supported for Google login at the moment.'
);
}
if (Accounts.ui._options.forceApprovalPrompt[service]) {
throw new Error(`Accounts.ui.config: Can't set \`forceApprovalPrompt\` more than once for ${service}`);
throw new Error(
`Accounts.ui.config: Can't set \`forceApprovalPrompt\` more than once for ${service}`
);
}
Accounts.ui._options.forceApprovalPrompt[service] =

2
packages/accounts-ui-unstyled/package.js
View File

@@ -1,6 +1,6 @@
Package.describe({
summary: 'Unstyled version of login widgets',
version: '1.6.0',
version: '1.7.0',
});
Package.onUse(function(api) {