Rename packages to Meteor Developer Accounts

Author: Emily Stark

packages/accounts-meteorid/.gitignore packages/accounts-meteor-developer/.gitignore

@@ -0,0 +1,20 @@
+Accounts.oauth.registerService("meteor-developer");
+
+if (Meteor.isClient) {
+  Meteor.loginWithMeteorDeveloperAccounts = function (options, callback) {
+    var credentialRequestCompleteCallback =
+          Accounts.oauth.credentialRequestCompleteHandler(callback);
+    MeteorDeveloperAccounts.requestCredential(credentialRequestCompleteCallback);
+  };
+} else {
+  Accounts.addAutopublishFields({
+    // publish all fields including access token, which can legitimately be used
+    // from the client (if transmitted over ssl or on localhost).
+    forLoggedInUser: ['services.meteor-developer'],
+    forOtherUsers: [
+      'services.meteor-developer.username',
+      'services.meteor-developer.profile',
+      'services.meteor-developer.id'
+    ]
+  });
+}

packages/accounts-meteorid/meteorid_login_button.css packages/accounts-meteor-developer/meteor-developer-login-button.css

@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Login service for MeteorId accounts",
+  summary: "Login service for Meteor Developer Accounts",
   internal: true // XXX for now
 });
 
@@ -9,8 +9,8 @@ Package.on_use(function (api) {
   // Export Accounts (etc) to packages using this one.
   api.imply('accounts-base', ['client', 'server']);
   api.use('accounts-oauth', ['client', 'server']);
-  api.use('meteorid', ['client', 'server']);
+  api.use('meteor-developer', ['client', 'server']);
 
-  api.add_files("meteorid.js");
-  api.add_files("meteorid_login_button.css", "client");
+  api.add_files("meteor-developer.js");
+  api.add_files("meteor-developer-login-button.css", "client");
 });

packages/accounts-meteor-developer/meteor-developer.js

@@ -208,7 +208,12 @@ var updateSaveDisabled = function () {
 // template should be defined in the service's package
 var configureLoginServiceDialogTemplateForService = function () {
   var serviceName = loginButtonsSession.get('configureLoginServiceDialogServiceName');
-  return Template['configureLoginServiceDialogFor' + capitalize(serviceName)];
+  // XXX Service providers should be able to specify their configuration
+  // template name.
+  return Template['configureLoginServiceDialogFor' +
+                  (serviceName === 'meteor-developer' ?
+                   'MeteorDeveloper' :
+                   capitalize(serviceName))];
 };
 
 var configurationFields = function () {

packages/accounts-meteorid/package.js packages/accounts-meteor-developer/package.js

@@ -17,7 +17,12 @@ Template._loginButtonsLoggedOutSingleLoginButton.events({
       }
     };
 
-    var loginWithService = Meteor["loginWith" + capitalize(serviceName)];
+    // XXX Service providers should be able to specify their
+    // `Meteor.loginWithX` method name.
+    var loginWithService = Meteor["loginWith" +
+                                  (serviceName === 'meteor-developer' ?
+                                   'MeteorDeveloperAccounts' :
+                                   capitalize(serviceName))];
 
     var options = {}; // use default scope unless specified
     if (Accounts.ui._options.requestPermissions[serviceName])
@@ -37,6 +42,8 @@ Template._loginButtonsLoggedOutSingleLoginButton.capitalizedName = function () {
   if (this.name === 'github')
     // XXX we should allow service packages to set their capitalized name
     return 'GitHub';
+  else if (this.name === 'meteor-developer')
+    return 'Meteor Developer Accounts';
   else
     return capitalize(this.name);
 };

packages/accounts-meteorid/meteorid.js

@@ -1,11 +1,13 @@
-MeteorId = {};
+MeteorDeveloperAccounts = {};
 
-// Request MeteorId credentials for the user
+// Request Meteor Developer Accounts credentials for the user
 // @param credentialRequestCompleteCallback {Function} Callback function to call on
 //   completion. Takes one argument, credentialToken on success, or Error on
 //   error.
-MeteorId.requestCredential = function (credentialRequestCompleteCallback) {
-  var config = ServiceConfiguration.configurations.findOne({service: 'meteorId'});
+var requestCredential = function (credentialRequestCompleteCallback) {
+  var config = ServiceConfiguration.configurations.findOne({
+    service: 'meteor-developer'
+  });
   if (!config) {
     credentialRequestCompleteCallback &&
       credentialRequestCompleteCallback(
@@ -17,11 +19,11 @@ MeteorId.requestCredential = function (credentialRequestCompleteCallback) {
   var credentialToken = Random.id();
 
   var loginUrl =
-        METEORID_URL + "/oauth2/authorize?" +
+        METEOR_DEVELOPER_URL + "/oauth2/authorize?" +
         "state=" + credentialToken +
         "&response_type=code&" +
         "client_id=" + config.clientId +
-        "&redirect_uri=" + Meteor.absoluteUrl("_oauth/meteorId?close");
+        "&redirect_uri=" + Meteor.absoluteUrl("_oauth/meteor-developer?close");
 
   Oauth.showPopup(
     loginUrl,
@@ -32,3 +34,5 @@ MeteorId.requestCredential = function (credentialRequestCompleteCallback) {
     }
   );
 };
+
+MeteorDeveloperAccounts.requestCredential = requestCredential;

packages/accounts-ui-unstyled/login_buttons_dialogs.js

@@ -0,0 +1 @@
+METEOR_DEVELOPER_URL = "https://www.meteor.com";

packages/accounts-ui-unstyled/login_buttons_single.js

@@ -0,0 +1,9 @@
+<template name="configureLoginServiceDialogForMeteorDeveloper">
+  <p>
+    First, you'll need to get a Meteor Developer Accounts Client ID.
+    Set Authorized Redirect URIs to:
+    <span class="url">
+      {{siteUrl}}_oauth/meteor-developer?close
+    </span>
+  </p>
+</template>

packages/meteorid/.gitignore packages/meteor-developer/.gitignore

@@ -0,0 +1,10 @@
+Template.configureLoginServiceDialogForMeteorDeveloper.siteUrl = function () {
+  return Meteor.absoluteUrl();
+};
+
+Template.configureLoginServiceDialogForMeteorDeveloper.fields = function () {
+  return [
+    {property: 'clientId', label: 'Client ID'},
+    {property: 'secret', label: 'Client secret'}
+  ];
+};

packages/meteorid/meteorid_client.js packages/meteor-developer/meteor_developer_client.js

@@ -1,6 +1,6 @@
-MeteorId = {};
+MeteorDeveloperAccounts = {};
 
-Oauth.registerService("meteorId", 2, null, function (query) {
+Oauth.registerService("meteor-developer", 2, null, function (query) {
   var response = getTokens(query);
   var accessToken = response.accessToken;
   var identity = getIdentity(accessToken);
@@ -31,34 +31,42 @@ Oauth.registerService("meteorId", 2, null, function (query) {
 // - refreshToken, if this is the first authorization request and we got a
 //   refresh token from the server
 var getTokens = function (query) {
-  var config = ServiceConfiguration.configurations.findOne({service: 'meteorId'});
+  var config = ServiceConfiguration.configurations.findOne({
+    service: 'meteor-developer'
+  });
   if (!config)
     throw new ServiceConfiguration.ConfigError("Service not configured");
 
   var response;
   try {
     response = HTTP.post(
-      METEORID_URL + "/oauth2/token", {
+      METEOR_DEVELOPER_URL + "/oauth2/token", {
         params: {
           grant_type: "authorization_code",
           code: query.code,
           client_id: config.clientId,
           client_secret: config.secret,
-          redirect_uri: Meteor.absoluteUrl("_oauth/meteorId?close")
+          redirect_uri: Meteor.absoluteUrl("_oauth/meteor-developer?close")
         }
       }
     );
   } catch (err) {
-    throw _.extend(new Error("Failed to complete OAuth handshake with MeteorId. "
-                             + err.message),
-                   {response: err.response});
+    throw _.extend(
+      new Error(
+        "Failed to complete OAuth handshake with Meteor Developer Accounts. "
+          + err.message
+      ),
+      {response: err.response}
+    );
   }
 
   if (! response.data || response.data.error) {
     // if the http response was a json object with an error attribute
-    throw new Error("Failed to complete OAuth handshake with MeteorId. " +
-                    (response.data ? response.data.error :
-                    "No response data"));
+    throw new Error(
+      "Failed to complete OAuth handshake with Meteor Developer Accounts. " +
+        (response.data ? response.data.error :
+         "No response data")
+    );
   } else {
     return {
       accessToken: response.data.access_token,
@@ -71,14 +79,17 @@ var getTokens = function (query) {
 var getIdentity = function (accessToken) {
   try {
     return HTTP.get(
-      METEORID_URL + "/api/v1/identity",
+      METEOR_DEVELOPER_URL + "/api/v1/identity",
       {params: {access_token: accessToken}}).data;
   } catch (err) {
-    throw _.extend(new Error("Failed to fetch identity from MeteorId. " + err.message),
-                   {response: err.response});
+    throw _.extend(
+      new Error("Failed to fetch identity from Meteor Developer Accounts. " +
+                err.message),
+      {response: err.response}
+    );
   }
 };
 
-MeteorId.retrieveCredential = function(credentialToken) {
+MeteorDeveloperAccounts.retrieveCredential = function (credentialToken) {
   return Oauth.retrieveCredential(credentialToken);
 };

packages/meteor-developer/meteor_developer_common.js

@@ -0,0 +1,19 @@
+Package.describe({
+  summary: "Meteor Developer Accounts OAuth flow"
+});
+
+Package.on_use(function (api) {
+  api.use('oauth2', ['client', 'server']);
+  api.use('oauth', ['client', 'server']);
+  api.use('http', ['server']);
+  api.use(['underscore', 'service-configuration'], ['client', 'server']);
+  api.use(['random', 'templating'], 'client');
+
+  api.export('MeteorDeveloperAccounts');
+
+  api.add_files('meteor_developer_common.js');
+  api.add_files(['meteor_developer_configure.html',
+                 'meteor_developer_configure.js'], 'client');
+  api.add_files('meteor_developer_server.js', 'server');
+  api.add_files('meteor_developer_client.js', 'client');
+});