@raytio/decrypt-helper 3.1.1 → 3.2.0

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 3.2.0 (2022-04-21)
+
+- !177 do not use `hashPassword` when logging in, and migrate old credentials
+
 ## 3.1.1 (2022-04-02)
 
 - !168 Fix import issue in v3.1

package/dist/api/signIn.js

@@ -8,31 +8,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signIn = void 0;
-const auth_1 = __importDefault(require("@aws-amplify/auth"));
+const auth_1 = require("@aws-amplify/auth");
 const core_1 = require("@raytio/core");
+/** see #1252 in the client repo */
+function signInWithPasswordMigration(username, password) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const userObj = yield auth_1.Auth.signIn(username, password);
+            return userObj;
+        }
+        catch (_a) {
+            // if the login fails, try again with their hashed password.
+            // if it's successful the second time, we quietly change their password.
+            const hashedPassword = yield (0, core_1.hashPassword)(password);
+            const userObj = yield auth_1.Auth.signIn(username, hashedPassword);
+            // the login was successful. So we need to migrate their account.
+            // No changes to the maxcryptor, purely to cognito.
+            // we can only migrate their password if there are no login challenges
+            if (!userObj.challengeName) {
+                console.log("Migrating credentials...");
+                yield auth_1.Auth.changePassword(userObj, hashedPassword, password);
+            }
+            return userObj;
+        }
+    });
+}
 function signIn(CONFIG, envConfig) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        auth_1.default.configure({
+        auth_1.Auth.configure({
             region: envConfig.cognito_region,
             userPoolId: envConfig.cognito_user_pool_id,
             userPoolWebClientId: envConfig.cognito_web_client_id,
         });
-        const userObj = yield auth_1.default.signIn({
-            username: CONFIG.RAYTIO_USERNAME,
-            password: yield (0, core_1.hashPassword)(CONFIG.RAYTIO_PASSWORD),
-        });
+        const userObj = yield signInWithPasswordMigration(CONFIG.RAYTIO_USERNAME, CONFIG.RAYTIO_PASSWORD);
         if (userObj.challengeName === "SOFTWARE_TOKEN_MFA") {
             throw new Error(`The configured account (${CONFIG.RAYTIO_USERNAME}) has two factor authentication enabled. You must disable 2FA or use a different account`);
         }
-        const user = yield auth_1.default.currentAuthenticatedUser();
+        const user = yield auth_1.Auth.currentAuthenticatedUser();
         const apiToken = (_b = (_a = user.signInUserSession) === null || _a === void 0 ? void 0 : _a.idToken) === null || _b === void 0 ? void 0 : _b.jwtToken;
-        const cognitoAttributes = yield auth_1.default.userAttributes(user);
+        const cognitoAttributes = yield auth_1.Auth.userAttributes(user);
         return { apiToken, cognitoAttributes };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raytio/decrypt-helper",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "author": "Raytio",
   "description": "A helper to decrypt data shared by Raytio users",
   "main": "dist",