Solve conflict with accounts_hooks

Author: Ville Jyrkkä

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at conduct@apinf.io. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -50,4 +50,6 @@ See the [high definition video (with music) of Apinf Development Activity up to
 You can preview our latest version at [nightly.apinf.io](http://nightly.apinf.io). Feel free to register an account and test things out.
 
 # Contributing
-Please review our [Contributor Guide](https://github.com/apinf/docs/blob/master/docs/develop/contributing.md) for details on how to get involved with the project.
+Please review our [Contributor Guide](https://github.com/apinf/platform/blob/develop/CONTRIBUTING.md) for details on how to get involved with the project.
+
+Please follow guidelines for community involvement in our [Code of Conduct](https://github.com/apinf/platform/blob/develop/CODE_OF_CONDUCT.md)

apis/client/view/details/details.html

@@ -60,7 +60,7 @@ <h4>
             <!-- Proxy Backend is completed, "Disable api key" is false, user has got an api key -->
             <li>
               {{_ "apiDetails_usageInstructions_urlParameters_text" }}
-              <i>{{ proxyUrl }}&lt;optional_path&gt;api_key={{ apiKey }}</i>
+              <i>{{ proxyUrl }}&lt;optional_path&gt;?api_key={{ apiKey }}</i>
             </li>
             <li>
               {{_ "apiDetails_usageInstructions_requestHeaders_text" }}

apis/client/view/view.js

@@ -32,6 +32,9 @@ Template.viewApi.onCreated(function () {
 
   // Subscribe to authorized user public details
   instance.subscribe('apiAuthorizedUsersPublicDetails', instance.apiId);
+
+  // Subscribe to all users, returns only usernames
+  instance.subscribe('allUsers');
 });
 
 Template.viewApi.helpers({

users/server/accounts_hooks.js

@@ -5,32 +5,35 @@ Accounts.onCreateUser((options, user) => {
   // Create empty user profile if none exists
   user.profile = user.profile || {};
 
-  // Check for Github authentication
-  if (user.services && user.services.github) {
-    // Set user email address from Github email
-    user.emails = [
-      {
-        address: user.services.github.email,
-        verified: true,
-      },
-    ];
-
-    // Search 'githubUsername' from database.
-    const githubUsername = user.services.github.username;
-    const existingUser = Meteor.users.findOne({ 'username': githubUsername });
-    if (existingUser === undefined) {
-      // Username available, set username to Github username.
-      user.username = githubUsername;
-    } else {
-      // Username clashes with existing username, add prefix
-      user.username = `gh-${githubUsername}`;
+  // Check services object exists
+  if (user.services) {
+    // Case 1: Register with Github
+    if (user.services.github) {
+      // Set user email address from Github email
+      user.emails = [
+        {
+          address: user.services.github.email,
+          verified: true,
+        },
+      ];
+      // Search 'githubUsername' from database.
+      const githubUsername = user.services.github.username;
+      const existingUser = Meteor.users.findOne({ 'username': githubUsername });
+      if (existingUser === undefined) {
+        // Username available, set username to Github username.
+        user.username = githubUsername;
+      } else {
+        // Username clashes with existing username, add prefix
+        user.username = `gh-${githubUsername}`;
+      }
+    // Case 2: Register with local account, email verification required
+    } else if (user.services.password) {
+      // we wait for Meteor to create the user before sending an email
+      Meteor.setTimeout(() => {
+        Meteor.call('sendRegistrationEmailVerification', user._id);
+      }, 2 * 1000);
     }
   }
 
-  // we wait for Meteor to create the user before sending an email
-  Meteor.setTimeout(() => {
-    Meteor.call('sendRegistrationEmailVerification', user._id);
-  }, 2 * 1000);
-
   return user;
 });

users/server/startup.js

@@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor';
 import { loginAttemptVerifier } from './login_verify';
 
 Meteor.startup(() => {
+  // In case of server restart, we need to set MAIL_URL
+  Meteor.call('configureSmtpSettings');
   // Toggle attach login attempt verifier function to account login
   Accounts.validateLoginAttempt(loginAttemptVerifier);
 });