@accounts/server - npm Package Compare versions

Comparing version 0.0.10-alpha.b575b352 to 0.0.10-alpha.c6ca3fa5

lib-es6/AccountsServer.js

@@ -1087,3 +1087,2 @@ 'use strict';
      * @description Send an email with a link the user can use verify their email address.
-     * @param {string} userId - The id of the user to send email to.
      * @param {string} [address] - Which address of the user's to send the email to.
@@ -1098,4 +1097,4 @@ * This address must be in the user's emails list.
     value: function () {
-      var _ref14 = _asyncToGenerator(regeneratorRuntime.mark(function _callee13(userId, address) {
-        var user, email, emails, token, siteUrl, verifyEmailUrl;
+      var _ref14 = _asyncToGenerator(regeneratorRuntime.mark(function _callee13(address) {
+        var user, email, emails, token, resetPasswordMail;
         return regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -1106,3 +1105,3 @@ while (1) {
                 _context13.next = 2;
-                return this.db.findUserById(userId);
+                return this.db.findUserByEmail(address);
 
@@ -1117,3 +1116,3 @@ case 2:
 
-                throw new _common.AccountsError('User not found', { id: userId });
+                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1144,16 +1143,10 @@ case 5:
                 _context13.next = 12;
-                return this.db.addEmailVerificationToken(userId, address, token);
+                return this.db.addEmailVerificationToken(user.id, address, token);
 
               case 12:
-                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-                verifyEmailUrl = siteUrl + '/verify-email/' + token;
-                _context13.next = 16;
-                return this.email.sendMail({
-                  from: this.emailTemplates.verifyEmail.from ? this.emailTemplates.verifyEmail.from : this.emailTemplates.from,
-                  to: address,
-                  subject: this.emailTemplates.verifyEmail.subject(user),
-                  text: this.emailTemplates.verifyEmail.text(user, verifyEmailUrl)
-                });
+                resetPasswordMail = this._prepareMail(address, token, user, 'verify-email', this.emailTemplates.verifyEmail, this.emailTemplates.from);
+                _context13.next = 15;
+                return this.email.sendMail(resetPasswordMail);
 
-              case 16:
+              case 15:
               case 'end':
@@ -1166,3 +1159,3 @@ return _context13.stop();
 
-      function sendVerificationEmail(_x25, _x26) {
+      function sendVerificationEmail(_x25) {
         return _ref14.apply(this, arguments);
@@ -1176,3 +1169,2 @@ }
      * @description Send an email with a link the user can use to reset their password.
-     * @param {string} userId - The id of the user to send email to.
      * @param {string} [address] - Which address of the user's to send the email to.
@@ -1187,4 +1179,4 @@ * This address must be in the user's emails list.
     value: function () {
-      var _ref15 = _asyncToGenerator(regeneratorRuntime.mark(function _callee14(userId, address) {
-        var user, token, siteUrl, resetPasswordUrl;
+      var _ref15 = _asyncToGenerator(regeneratorRuntime.mark(function _callee14(address) {
+        var user, token, resetPasswordMail;
         return regeneratorRuntime.wrap(function _callee14$(_context14) {
@@ -1195,3 +1187,3 @@ while (1) {
                 _context14.next = 2;
-                return this.db.findUserById(userId);
+                return this.db.findUserByEmail(address);
 
@@ -1206,3 +1198,3 @@ case 2:
 
-                throw new _common.AccountsError('User not found', { id: userId });
+                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1213,16 +1205,10 @@ case 5:
                 _context14.next = 9;
-                return this.db.addResetPasswordToken(userId, address, token);
+                return this.db.addResetPasswordToken(user.id, address, token);
 
               case 9:
-                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-                resetPasswordUrl = siteUrl + '/reset-password/' + token;
-                _context14.next = 13;
-                return this.email.sendMail({
-                  from: this.emailTemplates.resetPassword.from ? this.emailTemplates.resetPassword.from : this.emailTemplates.from,
-                  to: address,
-                  subject: this.emailTemplates.resetPassword.subject(user),
-                  text: this.emailTemplates.resetPassword.text(user, resetPasswordUrl)
-                });
+                resetPasswordMail = this._prepareMail(address, token, user, 'reset-password', this.emailTemplates.resetPassword, this.emailTemplates.from);
+                _context14.next = 12;
+                return this.email.sendMail(resetPasswordMail);
 
-              case 13:
+              case 12:
               case 'end':
@@ -1235,3 +1221,3 @@ return _context14.stop();
 
-      function sendResetPasswordEmail(_x27, _x28) {
+      function sendResetPasswordEmail(_x26) {
         return _ref15.apply(this, arguments);
@@ -1245,3 +1231,2 @@ }
      * @description Send an email with a link the user can use to set their initial password.
-     * @param {string} userId - The id of the user to send email to.
      * @param {string} [address] - Which address of the user's to send the email to.
@@ -1256,4 +1241,4 @@ * This address must be in the user's emails list.
     value: function () {
-      var _ref16 = _asyncToGenerator(regeneratorRuntime.mark(function _callee15(userId, address) {
-        var user, token, siteUrl, enrollAccountUrl;
+      var _ref16 = _asyncToGenerator(regeneratorRuntime.mark(function _callee15(address) {
+        var user, token, enrollmentMail;
         return regeneratorRuntime.wrap(function _callee15$(_context15) {
@@ -1264,3 +1249,3 @@ while (1) {
                 _context15.next = 2;
-                return this.db.findUserById(userId);
+                return this.db.findUserByEmail(address);
 
@@ -1275,3 +1260,3 @@ case 2:
 
-                throw new _common.AccountsError('User not found', { id: userId });
+                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1282,16 +1267,10 @@ case 5:
                 _context15.next = 9;
-                return this.db.addResetPasswordToken(userId, address, token, 'enroll');
+                return this.db.addResetPasswordToken(user.id, address, token, 'enroll');
 
               case 9:
-                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-                enrollAccountUrl = siteUrl + '/enroll-account/' + token;
-                _context15.next = 13;
-                return this.email.sendMail({
-                  from: this.emailTemplates.enrollAccount.from ? this.emailTemplates.enrollAccount.from : this.emailTemplates.from,
-                  to: address,
-                  subject: this.emailTemplates.enrollAccount.subject(user),
-                  text: this.emailTemplates.enrollAccount.text(user, enrollAccountUrl)
-                });
+                enrollmentMail = this._prepareMail(address, token, user, 'enroll-account', this.emailTemplates.enrollAccount, this.emailTemplates.from);
+                _context15.next = 12;
+                return this.email.sendMail(enrollmentMail);
 
-              case 13:
+              case 12:
               case 'end':
@@ -1304,3 +1283,3 @@ return _context15.stop();
 
-      function sendEnrollmentEmail(_x29, _x30) {
+      function sendEnrollmentEmail(_x27) {
         return _ref16.apply(this, arguments);
@@ -1312,2 +1291,32 @@ }
   }, {
+    key: '_prepareMail',
+    value: function _prepareMail() {
+      if (this._options.prepareMail) {
+        var _options2;
+
+        return (_options2 = this._options).prepareMail.apply(_options2, arguments);
+      }
+      return this._defaultPrepareEmail.apply(this, arguments);
+    }
+
+    // eslint-disable-next-line max-len
+
+  }, {
+    key: '_defaultPrepareEmail',
+    value: function _defaultPrepareEmail(to, token, user, pathFragment, emailTemplate, from) {
+      var tokenizedUrl = this._defaultCreateTokenizedUrl(pathFragment, token);
+      return {
+        from: emailTemplate.from || from,
+        to: to,
+        subject: emailTemplate.subject(user),
+        text: emailTemplate.text(user, tokenizedUrl)
+      };
+    }
+  }, {
+    key: '_defaultCreateTokenizedUrl',
+    value: function _defaultCreateTokenizedUrl(pathFragment, token) {
+      var siteUrl = this._options.siteUrl || _config3.default.siteUrl;
+      return siteUrl + '/' + pathFragment + '/' + token;
+    }
+  }, {
     key: '_getFirstUserEmail',
@@ -1314,0 +1323,0 @@ value: function _getFirstUserEmail(user, address) {

lib-es6/AccountsServer.spec.js

@@ -1478,3 +1478,3 @@ 'use strict';
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(null);
@@ -1515,3 +1515,3 @@ }
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1522,3 +1522,3 @@ }
               _context40.next = 5;
-              return Accounts.sendVerificationEmail('userId', 'toto');
+              return Accounts.sendVerificationEmail('toto');
 
@@ -1553,3 +1553,3 @@ case 5:
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1563,3 +1563,3 @@ },
               _context41.next = 5;
-              return Accounts.sendVerificationEmail('userId');
+              return Accounts.sendVerificationEmail('email');
 
@@ -1592,3 +1592,3 @@ case 5:
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1602,3 +1602,3 @@ },
               _context42.next = 5;
-              return Accounts.sendVerificationEmail('userId', 'email');
+              return Accounts.sendVerificationEmail('email');
 
@@ -1628,3 +1628,3 @@ case 5:
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(null);
@@ -1665,3 +1665,3 @@ }
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1672,3 +1672,3 @@ }
               _context44.next = 5;
-              return Accounts.sendResetPasswordEmail('userId', 'toto');
+              return Accounts.sendResetPasswordEmail('toto');
 
@@ -1703,3 +1703,3 @@ case 5:
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1713,3 +1713,3 @@ },
               _context45.next = 5;
-              return Accounts.sendResetPasswordEmail('userId');
+              return Accounts.sendResetPasswordEmail('email');
 
@@ -1742,3 +1742,3 @@ case 5:
               Accounts.config({}, {
-                findUserById: function findUserById() {
+                findUserByEmail: function findUserByEmail() {
                   return Promise.resolve(user);
@@ -1752,3 +1752,3 @@ },
               _context46.next = 5;
-              return Accounts.sendResetPasswordEmail('userId', 'email');
+              return Accounts.sendResetPasswordEmail('email');
 
@@ -1769,3 +1769,119 @@ case 5:
     })));
+
+    describe('sendEnrollmentEmail', function () {
+      it('throws error if user not found', _asyncToGenerator(regeneratorRuntime.mark(function _callee47() {
+        return regeneratorRuntime.wrap(function _callee47$(_context47) {
+          while (1) {
+            switch (_context47.prev = _context47.next) {
+              case 0:
+                Accounts.config({}, {
+                  findUserByEmail: function findUserByEmail() {
+                    return Promise.resolve(null);
+                  }
+                });
+                _context47.prev = 1;
+                _context47.next = 4;
+                return Accounts.sendEnrollmentEmail('email');
+
+              case 4:
+                throw new Error();
+
+              case 7:
+                _context47.prev = 7;
+                _context47.t0 = _context47['catch'](1);
+
+                expect(_context47.t0.message).toEqual('User not found');
+
+              case 10:
+              case 'end':
+                return _context47.stop();
+            }
+          }
+        }, _callee47, undefined, [[1, 7]]);
+      })));
+      it('adds email verification token and sends mail', _asyncToGenerator(regeneratorRuntime.mark(function _callee48() {
+        var addResetPasswordToken, _getFirstUserEmail, sendMail;
+
+        return regeneratorRuntime.wrap(function _callee48$(_context48) {
+          while (1) {
+            switch (_context48.prev = _context48.next) {
+              case 0:
+                addResetPasswordToken = jest.fn();
+                _getFirstUserEmail = jest.fn(function () {
+                  return '[e-mail]';
+                });
+                sendMail = jest.fn();
+
+                Accounts.config({
+                  siteUrl: 'siteUrl'
+                }, {
+                  findUserByEmail: function findUserByEmail() {
+                    return Promise.resolve({
+                      id: 'userId',
+                      emails: [{
+                        address: '[e-mail]',
+                        verified: false
+                      }]
+                    });
+                  },
+                  addResetPasswordToken: addResetPasswordToken
+                });
+                Accounts._getFirstUserEmail = _getFirstUserEmail;
+                Accounts.email.sendMail = sendMail;
+                _context48.next = 8;
+                return Accounts.sendEnrollmentEmail('[e-mail]');
+
+              case 8:
+                expect(addResetPasswordToken.mock.calls[0][0]).toEqual('userId');
+                expect(addResetPasswordToken.mock.calls[0][1]).toEqual('[e-mail]');
+                expect(addResetPasswordToken.mock.calls[0][3]).toEqual('enroll');
+                expect(sendMail.mock.calls.length).toEqual(1);
+
+              case 12:
+              case 'end':
+                return _context48.stop();
+            }
+          }
+        }, _callee48, undefined);
+      })));
+    });
+    describe('_getFirstUserEmail', function () {
+      it('throws error if email does not exist', function () {
+        try {
+          Accounts._getFirstUserEmail({
+            emails: [{
+              address: '',
+              verified: false
+            }]
+          });
+          throw new Error();
+        } catch (err) {
+          expect(err.message).toEqual('No such email address for user');
+        }
+        try {
+          Accounts._getFirstUserEmail({
+            emails: [{
+              address: '[e-mail]',
+              verified: false
+            }]
+          }, 'email');
+          throw new Error();
+        } catch (err) {
+          expect(err.message).toEqual('No such email address for user');
+        }
+      });
+      it('returns first email', function () {
+        var email = Accounts._getFirstUserEmail({
+          emails: [{
+            address: '[e-mail]',
+            verified: false
+          }, {
+            address: '[e-mail]',
+            verified: false
+          }]
+        });
+        expect(email).toEqual('[e-mail]');
+      });
+    });
   });
 });

lib-es6/config.js

@@ -11,2 +11,3 @@ 'use strict';
 
+// eslint-disable-next-line max-len
 exports.default = _extends({}, _common.config, {
@@ -13,0 +14,0 @@ tokenSecret: 'terrible secret',

lib/index.js

@@ -1188,3 +1188,2 @@ (function webpackUniversalModuleDefinition(root, factory) {
 	     * @description Send an email with a link the user can use verify their email address.
-	     * @param {string} userId - The id of the user to send email to.
 	     * @param {string} [address] - Which address of the user's to send the email to.
@@ -1199,4 +1198,4 @@ * This address must be in the user's emails list.
 	    value: function () {
-	      var _ref14 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(userId, address) {
-	        var user, email, emails, token, siteUrl, verifyEmailUrl;
+	      var _ref14 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(address) {
+	        var user, email, emails, token, resetPasswordMail;
 	        return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -1207,3 +1206,3 @@ while (1) {
 	                _context13.next = 2;
-	                return this.db.findUserById(userId);
+	                return this.db.findUserByEmail(address);
 
@@ -1218,3 +1217,3 @@ case 2:
 
-	                throw new _common.AccountsError('User not found', { id: userId });
+	                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1245,16 +1244,10 @@ case 5:
 	                _context13.next = 12;
-	                return this.db.addEmailVerificationToken(userId, address, token);
+	                return this.db.addEmailVerificationToken(user.id, address, token);
 
 	              case 12:
-	                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-	                verifyEmailUrl = siteUrl + '/verify-email/' + token;
-	                _context13.next = 16;
-	                return this.email.sendMail({
-	                  from: this.emailTemplates.verifyEmail.from ? this.emailTemplates.verifyEmail.from : this.emailTemplates.from,
-	                  to: address,
-	                  subject: this.emailTemplates.verifyEmail.subject(user),
-	                  text: this.emailTemplates.verifyEmail.text(user, verifyEmailUrl)
-	                });
+	                resetPasswordMail = this._prepareMail(address, token, user, 'verify-email', this.emailTemplates.verifyEmail, this.emailTemplates.from);
+	                _context13.next = 15;
+	                return this.email.sendMail(resetPasswordMail);
 
-	              case 16:
+	              case 15:
 	              case 'end':
@@ -1267,3 +1260,3 @@ return _context13.stop();
 
-	      function sendVerificationEmail(_x25, _x26) {
+	      function sendVerificationEmail(_x25) {
 	        return _ref14.apply(this, arguments);
@@ -1277,3 +1270,2 @@ }
 	     * @description Send an email with a link the user can use to reset their password.
-	     * @param {string} userId - The id of the user to send email to.
 	     * @param {string} [address] - Which address of the user's to send the email to.
@@ -1288,4 +1280,4 @@ * This address must be in the user's emails list.
 	    value: function () {
-	      var _ref15 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee14(userId, address) {
-	        var user, token, siteUrl, resetPasswordUrl;
+	      var _ref15 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee14(address) {
+	        var user, token, resetPasswordMail;
 	        return _regenerator2.default.wrap(function _callee14$(_context14) {
@@ -1296,3 +1288,3 @@ while (1) {
 	                _context14.next = 2;
-	                return this.db.findUserById(userId);
+	                return this.db.findUserByEmail(address);
 
@@ -1307,3 +1299,3 @@ case 2:
 
-	                throw new _common.AccountsError('User not found', { id: userId });
+	                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1314,16 +1306,10 @@ case 5:
 	                _context14.next = 9;
-	                return this.db.addResetPasswordToken(userId, address, token);
+	                return this.db.addResetPasswordToken(user.id, address, token);
 
 	              case 9:
-	                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-	                resetPasswordUrl = siteUrl + '/reset-password/' + token;
-	                _context14.next = 13;
-	                return this.email.sendMail({
-	                  from: this.emailTemplates.resetPassword.from ? this.emailTemplates.resetPassword.from : this.emailTemplates.from,
-	                  to: address,
-	                  subject: this.emailTemplates.resetPassword.subject(user),
-	                  text: this.emailTemplates.resetPassword.text(user, resetPasswordUrl)
-	                });
+	                resetPasswordMail = this._prepareMail(address, token, user, 'reset-password', this.emailTemplates.resetPassword, this.emailTemplates.from);
+	                _context14.next = 12;
+	                return this.email.sendMail(resetPasswordMail);
 
-	              case 13:
+	              case 12:
 	              case 'end':
@@ -1336,3 +1322,3 @@ return _context14.stop();
 
-	      function sendResetPasswordEmail(_x27, _x28) {
+	      function sendResetPasswordEmail(_x26) {
 	        return _ref15.apply(this, arguments);
@@ -1346,3 +1332,2 @@ }
 	     * @description Send an email with a link the user can use to set their initial password.
-	     * @param {string} userId - The id of the user to send email to.
 	     * @param {string} [address] - Which address of the user's to send the email to.
@@ -1357,4 +1342,4 @@ * This address must be in the user's emails list.
 	    value: function () {
-	      var _ref16 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee15(userId, address) {
-	        var user, token, siteUrl, enrollAccountUrl;
+	      var _ref16 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee15(address) {
+	        var user, token, enrollmentMail;
 	        return _regenerator2.default.wrap(function _callee15$(_context15) {
@@ -1365,3 +1350,3 @@ while (1) {
 	                _context15.next = 2;
-	                return this.db.findUserById(userId);
+	                return this.db.findUserByEmail(address);
 
@@ -1376,3 +1361,3 @@ case 2:
 
-	                throw new _common.AccountsError('User not found', { id: userId });
+	                throw new _common.AccountsError('User not found', { email: address });
 
@@ -1383,16 +1368,10 @@ case 5:
 	                _context15.next = 9;
-	                return this.db.addResetPasswordToken(userId, address, token, 'enroll');
+	                return this.db.addResetPasswordToken(user.id, address, token, 'enroll');
 
 	              case 9:
-	                siteUrl = this._options.siteUrl || _config3.default.siteUrl;
-	                enrollAccountUrl = siteUrl + '/enroll-account/' + token;
-	                _context15.next = 13;
-	                return this.email.sendMail({
-	                  from: this.emailTemplates.enrollAccount.from ? this.emailTemplates.enrollAccount.from : this.emailTemplates.from,
-	                  to: address,
-	                  subject: this.emailTemplates.enrollAccount.subject(user),
-	                  text: this.emailTemplates.enrollAccount.text(user, enrollAccountUrl)
-	                });
+	                enrollmentMail = this._prepareMail(address, token, user, 'enroll-account', this.emailTemplates.enrollAccount, this.emailTemplates.from);
+	                _context15.next = 12;
+	                return this.email.sendMail(enrollmentMail);
 
-	              case 13:
+	              case 12:
 	              case 'end':
@@ -1405,3 +1384,3 @@ return _context15.stop();
 
-	      function sendEnrollmentEmail(_x29, _x30) {
+	      function sendEnrollmentEmail(_x27) {
 	        return _ref16.apply(this, arguments);
@@ -1413,2 +1392,32 @@ }
 	  }, {
+	    key: '_prepareMail',
+	    value: function _prepareMail() {
+	      if (this._options.prepareMail) {
+	        var _options2;
+
+	        return (_options2 = this._options).prepareMail.apply(_options2, arguments);
+	      }
+	      return this._defaultPrepareEmail.apply(this, arguments);
+	    }
+
+	    // eslint-disable-next-line max-len
+
+	  }, {
+	    key: '_defaultPrepareEmail',
+	    value: function _defaultPrepareEmail(to, token, user, pathFragment, emailTemplate, from) {
+	      var tokenizedUrl = this._defaultCreateTokenizedUrl(pathFragment, token);
+	      return {
+	        from: emailTemplate.from || from,
+	        to: to,
+	        subject: emailTemplate.subject(user),
+	        text: emailTemplate.text(user, tokenizedUrl)
+	      };
+	    }
+	  }, {
+	    key: '_defaultCreateTokenizedUrl',
+	    value: function _defaultCreateTokenizedUrl(pathFragment, token) {
+	      var siteUrl = this._options.siteUrl || _config3.default.siteUrl;
+	      return siteUrl + '/' + pathFragment + '/' + token;
+	    }
+	  }, {
 	    key: '_getFirstUserEmail',
@@ -1501,2 +1510,3 @@ value: function _getFirstUserEmail(user, address) {
 
+	// eslint-disable-next-line max-len
 	exports.default = (0, _extends3.default)({}, _common.config, {
@@ -1503,0 +1513,0 @@ tokenSecret: 'terrible secret',

package.json

 {
   "name": "@accounts/server",
-  "version": "0.0.10-alpha.b575b352",
+  "version": "0.0.10-alpha.c6ca3fa5",
   "description": "Fullstack authentication and accounts-management",
@@ -51,3 +51,3 @@ "main": "lib/index.js",
   "dependencies": {
-    "@accounts/common": "^0.0.10-alpha.b575b352",
+    "@accounts/common": "^0.0.10-alpha.c6ca3fa5",
     "babel-polyfill": "^6.23.0",
@@ -54,0 +54,0 @@ "bcryptjs": "^2.4.0",

No alert changes

Improved metrics

Total package byte prevSize

580685

increased by1.63%

Lines of code

8476

increased by1.45%

Dependency changes

• Updated@accounts/common@^0.0.10-alpha.c6ca3fa5