dceky 1.0.23 → 1.0.25

package/lib/src/commands/getCredentialValue.d.ts

@@ -0,0 +1,18 @@
+declare global {
+    namespace Cypress {
+        interface Chainable {
+            /**
+             * Alias for cy.env for retrieving a single environment variable
+             * Obtains a credential value from the Cypress env depending on
+             * the provided key.
+             * @author Allison Zhang
+             * @param key the key of the environment variable to retrieve
+             * @return The value of the specified environment variable
+             * the corresponding environment variable values from global credentials
+             */
+            getCredentialValue(key: string): Chainable<any>;
+        }
+    }
+}
+declare const getCredentialValue: () => void;
+export default getCredentialValue;

package/lib/{commands/assertHasClass.js → src/commands/getCredentialValue.js}

@@ -4,14 +4,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /*----------------------------------------*/
 /* --------------- Command -------------- */
 /*----------------------------------------*/
-var assertHasClass = function () {
-    Cypress.Commands.add('assertHasClass', function (opts) {
-        cy.log("Assert ".concat(opts.item, " has class ").concat(opts.className));
-        return cy.get(opts.item).should('have.class', opts.className);
+var getCredentialValue = function () {
+    Cypress.Commands.add('getCredentialValue', function (key) {
+        return cy.env([key]).then(function (_a) {
+            var _b = key, value = _a[_b];
+            return cy.wrap(value);
+        });
     });
 };
 /*----------------------------------------*/
 /* --------------- Export --------------- */
 /*----------------------------------------*/
-exports.default = assertHasClass;
-//# sourceMappingURL=assertHasClass.js.map
+exports.default = getCredentialValue;
+//# sourceMappingURL=getCredentialValue.js.map

package/lib/src/commands/getCredentialValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCredentialValue.js","sourceRoot":"","sources":["../../../src/commands/getCredentialValue.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAyBjC,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,kBAAkB,GAAG;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,oBAAoB,EACpB,UAAC,GAAG;QACF,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,EAAgB;gBAAd,KAAC,GAAI,EAAE,KAAK,SAAA;YACvC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,kBAAkB,CAAC"}

package/lib/src/commands/getCredentialValues.d.ts

@@ -0,0 +1,18 @@
+declare global {
+    namespace Cypress {
+        interface Chainable {
+            /**
+             * Alias for cy.env for retrieving multiple environment variables at once
+             * Obtains multiple credential values from the Cypress env depending on
+             * the provided keys.
+             * @author Allison Zhang
+             * @param keys the keys of the environment variables to retrieve
+             * @return Object where keys are the provided keys and the values are
+             * the corresponding environment variable values from global credentials
+             */
+            getCredentialValues(keys: string[]): Chainable<Record<string, any>>;
+        }
+    }
+}
+declare const getCredentialValues: () => void;
+export default getCredentialValues;

package/lib/{commands/getTitle.js → src/commands/getCredentialValues.js}

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /*----------------------------------------*/
 /* --------------- Command -------------- */
 /*----------------------------------------*/
-var getTitle = function () {
-    Cypress.Commands.add('getTitle', function () {
-        return (cy
-            .title()
-            .then(function (title) {
-            return title;
-        }));
+var getCredentialValues = function () {
+    Cypress.Commands.add('getCredentialValues', function (keys) {
+        return cy.env(keys);
     });
 };
 /*----------------------------------------*/
 /* --------------- Export --------------- */
 /*----------------------------------------*/
-exports.default = getTitle;
-//# sourceMappingURL=getTitle.js.map
+exports.default = getCredentialValues;
+//# sourceMappingURL=getCredentialValues.js.map

package/lib/src/commands/getCredentialValues.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCredentialValues.js","sourceRoot":"","sources":["../../../src/commands/getCredentialValues.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAyBjC,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,mBAAmB,GAAG;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,qBAAqB,EACrB,UAAC,IAAI;QACH,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,mBAAmB,CAAC"}

package/lib/src/commands/getProfileValue.d.ts

@@ -0,0 +1,15 @@
+declare global {
+    namespace Cypress {
+        interface Chainable {
+            /**
+             * Alias for Cypress.expose
+             * @author Allison Zhang
+             * @param key the key of the environment variable to retrieve
+             * @return Environment variable from the exposed environment
+             */
+            getProfileValue(key: string): ObjectLike;
+        }
+    }
+}
+declare const getProfileValue: () => void;
+export default getProfileValue;

package/lib/{commands/getId.js → src/commands/getProfileValue.js}

@@ -4,18 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /*----------------------------------------*/
 /* --------------- Command -------------- */
 /*----------------------------------------*/
-var getId = function () {
-    Cypress.Commands.add('getId', function (selector) {
-        return (cy
-            .get(selector)
-            .invoke('attr', 'id')
-            .then(function (attr) {
-            return attr;
-        }));
+var getProfileValue = function () {
+    Cypress.Commands.add('getProfileValue', function (key) {
+        return Cypress.expose(key);
     });
 };
 /*----------------------------------------*/
 /* --------------- Export --------------- */
 /*----------------------------------------*/
-exports.default = getId;
-//# sourceMappingURL=getId.js.map
+exports.default = getProfileValue;
+//# sourceMappingURL=getProfileValue.js.map

package/lib/src/commands/getProfileValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getProfileValue.js","sourceRoot":"","sources":["../../../src/commands/getProfileValue.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAsBjC,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,eAAe,GAAG;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,iBAAiB,EACjB,UAAC,GAAG;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,eAAe,CAAC"}

package/lib/src/commands/handleHarvardKey.js

@@ -7,41 +7,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var handleHarvardKey = function () {
     Cypress.Commands.add('handleHarvardKey', function (name) {
         cy.log('🔓 Handling HarvardKey authentication via UI');
-        var userInfo = Cypress.env(name);
-        if (!userInfo) {
-            throw new Error("Could not find ".concat(name, " in environment variables"));
-        }
-        // Destructure the user info object
-        var username = userInfo.username, password = userInfo.password;
-        // Get the Harvard login URL using originWithKaixa with auto-initialized functions
-        cy.origin('https://apps.cirrusidentity.com', function () {
-            Cypress.require('dceky');
-            // To go the login screen
-            // Clicking the button doesn't work for some reason, so we access the href attribute instead
-            return cy.navigateToHref('#idp_1001962798_button');
-        }).then(function (fullUrl) {
-            // Navigate to the Harvard login page using originWithKaixa
-            cy.origin('https://harvard.idp.cirrusidentity.com', {
-                args: { username: username, password: password, fullUrl: fullUrl },
-            }, function (args) {
+        // Get user credentials from environment variables
+        cy.env([name]).then(function (environment) {
+            var userInfo = environment[name];
+            if (!userInfo) {
+                throw new Error("Could not find ".concat(name, " in environment variables"));
+            }
+            // Destructure the user info object
+            var username = userInfo.username, password = userInfo.password;
+            // Get the Harvard login URL using originWithKaixa with auto-initialized functions
+            cy.origin('https://apps.cirrusidentity.com', function () {
                 Cypress.require('dceky');
-                var harvardUsername = args.username, harvardPassword = args.password, harvardLoginUrl = args.fullUrl;
-                cy.on('uncaught:exception', function (e) {
-                    // Ignore known HarvardKey errors
-                    if (!e.message.includes('ready is not defined')) {
-                        return true;
-                    }
-                    return false;
+                // To go the login screen
+                // Clicking the button doesn't work for some reason, so we access the href attribute instead
+                return cy.navigateToHref('#idp_1001962798_button');
+            }).then(function (fullUrl) {
+                // Navigate to the Harvard login page using originWithKaixa
+                cy.origin('https://harvard.idp.cirrusidentity.com', {
+                    args: { username: username, password: password, fullUrl: fullUrl },
+                }, function (args) {
+                    Cypress.require('dceky');
+                    var harvardUsername = args.username, harvardPassword = args.password, harvardLoginUrl = args.fullUrl;
+                    cy.on('uncaught:exception', function (e) {
+                        // Ignore known HarvardKey errors
+                        if (!e.message.includes('ready is not defined')) {
+                            return true;
+                        }
+                        return false;
+                    });
+                    // Visit the Harvard login page
+                    cy.visit(harvardLoginUrl);
+                    // Wait for and fill in the login form
+                    cy.waitForElementVisible('#username');
+                    cy.waitForElementVisible('#password');
+                    cy.typeInto({ item: '#username', text: harvardUsername });
+                    cy.typeInto({ item: '#password', text: harvardPassword });
+                    // Submit the form
+                    cy.get('input[type="submit"], button[type="submit"], .btn-primary').click();
                 });
-                // Visit the Harvard login page
-                cy.visit(harvardLoginUrl);
-                // Wait for and fill in the login form
-                cy.waitForElementVisible('#username');
-                cy.waitForElementVisible('#password');
-                cy.typeInto({ item: '#username', text: harvardUsername });
-                cy.typeInto({ item: '#password', text: harvardPassword });
-                // Submit the form
-                cy.get('input[type="submit"], button[type="submit"], .btn-primary').click();
             });
         });
     });

package/lib/src/commands/handleHarvardKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleHarvardKey.js","sourceRoot":"","sources":["../../../src/commands/handleHarvardKey.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAsBjC,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,gBAAgB,GAAG;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,kBAAkB,EAClB,UACE,IAAY;QAEZ,EAAE,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAEvD,IAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,yBAAkB,IAAI,8BAA2B,CAAC,CAAC;QACrE,CAAC;QAED,mCAAmC;QAC3B,IAAA,QAAQ,GAAe,QAAQ,SAAvB,EAAE,QAAQ,GAAK,QAAQ,SAAb,CAAc;QAExC,kFAAkF;QAClF,EAAE,CAAC,MAAM,CAAC,iCAAiC,EAAE;YAC3C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACzB,yBAAyB;YACzB,4FAA4F;YAC5F,OAAO,EAAE,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,OAAe;YACxB,2DAA2D;YACzD,EAAE,CAAC,MAAM,CAAC,wCAAwC,EAAE;gBAClD,IAAI,EAAE,EAAE,QAAQ,UAAA,EAAE,QAAQ,UAAA,EAAE,OAAO,SAAA,EAAE;aACtC,EAAE,UAAC,IAAI;gBACN,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAEvB,IAAU,eAAe,GAGvB,IAAI,SAHmB,EACf,eAAe,GAEvB,IAAI,SAFmB,EAChB,eAAe,GACtB,IAAI,QADkB,CACjB;gBAET,EAAE,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,CAAQ;oBACnC,iCAAiC;oBACjC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;wBAChD,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;gBAEH,+BAA+B;gBAC/B,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAE1B,sCAAsC;gBACtC,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBACtC,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBAEtC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;gBAC1D,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;gBAE1D,kBAAkB;gBAClB,EAAE,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC,KAAK,EAAE,CAAC;YAC9E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"handleHarvardKey.js","sourceRoot":"","sources":["../../../src/commands/handleHarvardKey.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAsBjC,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,gBAAgB,GAAG;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,kBAAkB,EAClB,UACE,IAAY;QAEZ,EAAE,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAEvD,kDAAkD;QAClD,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,WAAW;YAC9B,IAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,yBAAkB,IAAI,8BAA2B,CAAC,CAAC;YACrE,CAAC;YAED,mCAAmC;YAC3B,IAAA,QAAQ,GAAe,QAAQ,SAAvB,EAAE,QAAQ,GAAK,QAAQ,SAAb,CAAc;YAExC,kFAAkF;YAClF,EAAE,CAAC,MAAM,CAAC,iCAAiC,EAAE;gBAC3C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACzB,yBAAyB;gBACzB,4FAA4F;gBAC5F,OAAO,EAAE,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC,IAAI,CAAC,UAAC,OAAe;gBACxB,2DAA2D;gBACzD,EAAE,CAAC,MAAM,CAAC,wCAAwC,EAAE;oBAClD,IAAI,EAAE,EAAE,QAAQ,UAAA,EAAE,QAAQ,UAAA,EAAE,OAAO,SAAA,EAAE;iBACtC,EAAE,UAAC,IAAI;oBACN,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAEvB,IAAU,eAAe,GAGvB,IAAI,SAHmB,EACf,eAAe,GAEvB,IAAI,SAFmB,EAChB,eAAe,GACtB,IAAI,QADkB,CACjB;oBAET,EAAE,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAC,CAAQ;wBACnC,iCAAiC;wBACjC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;4BAChD,OAAO,IAAI,CAAC;wBACd,CAAC;wBACD,OAAO,KAAK,CAAC;oBACf,CAAC,CAAC,CAAC;oBAEH,+BAA+B;oBAC/B,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBAE1B,sCAAsC;oBACtC,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;oBACtC,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;oBAEtC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;oBAC1D,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;oBAE1D,kBAAkB;oBAClB,EAAE,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC9E,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,gBAAgB,CAAC"}

package/lib/src/commands/index.js

@@ -34,6 +34,9 @@ var uniquify_1 = __importDefault(require("./uniquify"));
 var visitCanvasEndpoint_1 = __importDefault(require("./visitCanvasEndpoint"));
 var waitForAtLeastOneElementPresent_1 = __importDefault(require("./waitForAtLeastOneElementPresent"));
 var waitForElementVisible_1 = __importDefault(require("./waitForElementVisible"));
+var getProfileValue_1 = __importDefault(require("./getProfileValue"));
+var getCredentialValue_1 = __importDefault(require("./getCredentialValue"));
+var getCredentialValues_1 = __importDefault(require("./getCredentialValues"));
 /**
  * Initialize custom commands
  * @author Gabe Abrams
@@ -70,6 +73,9 @@ var commands = function () {
     (0, visitCanvasEndpoint_1.default)();
     (0, waitForAtLeastOneElementPresent_1.default)();
     (0, waitForElementVisible_1.default)();
+    (0, getProfileValue_1.default)();
+    (0, getCredentialValue_1.default)();
+    (0, getCredentialValues_1.default)();
 };
 exports.default = commands;
 //# sourceMappingURL=index.js.map

package/lib/src/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":";;;;;AAAA,sBAAsB;AACtB,oFAA8D;AAC9D,oEAA8C;AAC9C,0EAAoD;AACpD,gFAA0D;AAC1D,gFAA0D;AAC1D,oGAA8E;AAC9E,sEAAgD;AAChD,gEAA0C;AAC1C,gEAA0C;AAC1C,4EAAsD;AACtD,kDAA4B;AAC5B,sDAAgC;AAChC,oEAA8C;AAC9C,sEAAgD;AAChD,wDAAkC;AAClC,wEAAkD;AAClD,wDAAkC;AAClC,wEAAkD;AAClD,wEAAkD;AAClD,gEAA0C;AAC1C,oEAA8C;AAC9C,gEAA0C;AAC1C,0DAAoC;AACpC,8CAAwB;AACxB,8DAAwC;AACxC,wDAAkC;AAClC,wDAAkC;AAClC,8EAAwD;AACxD,sGAAgF;AAChF,kFAA4D;AAE5D;;;GAGG;AACH,IAAM,QAAQ,GAAG;IACf,6BAA6B;IAC7B,IAAA,gCAAsB,GAAE,CAAC;IACzB,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,2BAAiB,GAAE,CAAC;IACpB,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,wCAA8B,GAAE,CAAC;IACjC,IAAA,yBAAe,GAAE,CAAC;IAClB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,eAAK,GAAE,CAAC;IACR,IAAA,iBAAO,GAAE,CAAC;IACV,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,yBAAe,GAAE,CAAC;IAClB,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,mBAAS,GAAE,CAAC;IACZ,IAAA,aAAG,GAAE,CAAC;IACN,IAAA,qBAAW,GAAE,CAAC;IACd,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,6BAAmB,GAAE,CAAC;IACtB,IAAA,yCAA+B,GAAE,CAAC;IAClC,IAAA,+BAAqB,GAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":";;;;;AAAA,sBAAsB;AACtB,oFAA8D;AAC9D,oEAA8C;AAC9C,0EAAoD;AACpD,gFAA0D;AAC1D,gFAA0D;AAC1D,oGAA8E;AAC9E,sEAAgD;AAChD,gEAA0C;AAC1C,gEAA0C;AAC1C,4EAAsD;AACtD,kDAA4B;AAC5B,sDAAgC;AAChC,oEAA8C;AAC9C,sEAAgD;AAChD,wDAAkC;AAClC,wEAAkD;AAClD,wDAAkC;AAClC,wEAAkD;AAClD,wEAAkD;AAClD,gEAA0C;AAC1C,oEAA8C;AAC9C,gEAA0C;AAC1C,0DAAoC;AACpC,8CAAwB;AACxB,8DAAwC;AACxC,wDAAkC;AAClC,wDAAkC;AAClC,8EAAwD;AACxD,sGAAgF;AAChF,kFAA4D;AAC5D,sEAAgD;AAChD,4EAAsD;AACtD,8EAAwD;AAExD;;;GAGG;AACH,IAAM,QAAQ,GAAG;IACf,6BAA6B;IAC7B,IAAA,gCAAsB,GAAE,CAAC;IACzB,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,2BAAiB,GAAE,CAAC;IACpB,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,wCAA8B,GAAE,CAAC;IACjC,IAAA,yBAAe,GAAE,CAAC;IAClB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,eAAK,GAAE,CAAC;IACR,IAAA,iBAAO,GAAE,CAAC;IACV,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,yBAAe,GAAE,CAAC;IAClB,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,0BAAgB,GAAE,CAAC;IACnB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,wBAAc,GAAE,CAAC;IACjB,IAAA,sBAAY,GAAE,CAAC;IACf,IAAA,mBAAS,GAAE,CAAC;IACZ,IAAA,aAAG,GAAE,CAAC;IACN,IAAA,qBAAW,GAAE,CAAC;IACd,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,kBAAQ,GAAE,CAAC;IACX,IAAA,6BAAmB,GAAE,CAAC;IACtB,IAAA,yCAA+B,GAAE,CAAC;IAClC,IAAA,+BAAqB,GAAE,CAAC;IACxB,IAAA,yBAAe,GAAE,CAAC;IAClB,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,6BAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/lib/src/commands/launchAs.js

@@ -16,94 +16,96 @@ var launchAs = function () {
         cy.visit(baseURL);
         // Get courseId from environment variables if not provided
         if (!courseId) {
-            var envCourseId = Cypress.env('courseId');
+            var envCourseId = Cypress.expose('courseId');
             if (!envCourseId) {
                 throw new Error('Could not find courseId in environment variables');
             }
             courseId = Number.parseInt(envCourseId, 10);
         }
         // Get appName from environment variables if not provided
-        appName = appName || Cypress.env('appName');
+        appName = appName || Cypress.expose('appName');
         if (!appName) {
             throw new Error('Could not find appName in environment variables');
         }
         // Get user accessToken from environment variables
-        var userInfo = Cypress.env(name);
-        if (!userInfo) {
-            throw new Error("Could not find ".concat(name, " in environment variables"));
-        }
-        var accessToken = userInfo.accessToken;
-        if (!accessToken) {
-            throw new Error("Could not find accessToken for ".concat(name, " in environment variables"));
-        }
-        // List external tools in the course
-        return (cy
-            .request({
-            method: 'GET',
-            url: "https://canvas.harvard.edu/api/v1/courses/".concat(courseId, "/external_tools"),
-            body: {
-                per_page: 200,
-                access_token: accessToken,
-            },
-        })
-            .then(function (response) {
-            // Extract tools from the body
-            var externalTools = response.body;
-            // Find the external tool of interest
-            var matchingTool = externalTools.find(function (externalTool) {
-                // Skip non-nav items
-                if (
-                // No nav
-                !externalTool.course_navigation
-                    // No nav information
-                    || typeof externalTool.course_navigation !== 'object') {
-                    return false;
-                }
-                // Skip non-labeled items
-                if (!externalTool.course_navigation.text) {
-                    return false;
-                }
-                // Skip if the app name does not match the expected name
-                var thisAppName = (externalTool
-                    .course_navigation
-                    .text
-                    .trim()
-                    .toLowerCase());
-                return thisAppName === appName.trim().toLowerCase();
-            });
-            // Make sure we found the app
-            if (!matchingTool) {
-                throw new Error("Could not find any apps named \"".concat(appName, "\" in course ").concat(courseId));
+        cy.env([name]).then(function (environment) {
+            var userInfo = environment[name];
+            if (!userInfo) {
+                throw new Error("Could not find ".concat(name, " in environment variables"));
+            }
+            var accessToken = userInfo.accessToken;
+            if (!accessToken) {
+                throw new Error("Could not find accessToken for ".concat(name, " in environment variables"));
             }
-            // Get the toolId for the matching tool
-            var toolId = (matchingTool === null || matchingTool === void 0 ? void 0 : matchingTool.id) || 0;
-            return cy.wrap(toolId);
-        })
-            .then(function (toolId) {
-            // Request sessionless launch URL
+            // List external tools in the course
             return (cy
                 .request({
                 method: 'GET',
-                url: "https://canvas.harvard.edu/api/v1/courses/".concat(courseId, "/external_tools/sessionless_launch?id=").concat(toolId),
+                url: "https://canvas.harvard.edu/api/v1/courses/".concat(courseId, "/external_tools"),
                 body: {
                     per_page: 200,
                     access_token: accessToken,
                 },
             })
-                .its('body'));
-        })
-            .then(function (sessionlessLaunchInfo) {
-            cy.on('uncaught:exception', function (e) {
-                // Ignore known LTI launch errors
-                if (!e.message.includes('postMessage')) {
-                    return true;
+                .then(function (response) {
+                // Extract tools from the body
+                var externalTools = response.body;
+                // Find the external tool of interest
+                var matchingTool = externalTools.find(function (externalTool) {
+                    // Skip non-nav items
+                    if (
+                    // No nav
+                    !externalTool.course_navigation
+                        // No nav information
+                        || typeof externalTool.course_navigation !== 'object') {
+                        return false;
+                    }
+                    // Skip non-labeled items
+                    if (!externalTool.course_navigation.text) {
+                        return false;
+                    }
+                    // Skip if the app name does not match the expected name
+                    var thisAppName = (externalTool
+                        .course_navigation
+                        .text
+                        .trim()
+                        .toLowerCase());
+                    return thisAppName === appName.trim().toLowerCase();
+                });
+                // Make sure we found the app
+                if (!matchingTool) {
+                    throw new Error("Could not find any apps named \"".concat(appName, "\" in course ").concat(courseId));
                 }
-                return false;
-            });
-            // Launch via the sessionless launch URL
-            var launchURL = sessionlessLaunchInfo.url;
-            cy.visit(launchURL);
-        }));
+                // Get the toolId for the matching tool
+                var toolId = (matchingTool === null || matchingTool === void 0 ? void 0 : matchingTool.id) || 0;
+                return cy.wrap(toolId);
+            })
+                .then(function (toolId) {
+                // Request sessionless launch URL
+                return (cy
+                    .request({
+                    method: 'GET',
+                    url: "https://canvas.harvard.edu/api/v1/courses/".concat(courseId, "/external_tools/sessionless_launch?id=").concat(toolId),
+                    body: {
+                        per_page: 200,
+                        access_token: accessToken,
+                    },
+                })
+                    .its('body'));
+            })
+                .then(function (sessionlessLaunchInfo) {
+                cy.on('uncaught:exception', function (e) {
+                    // Ignore known LTI launch errors
+                    if (!e.message.includes('postMessage')) {
+                        return true;
+                    }
+                    return false;
+                });
+                // Launch via the sessionless launch URL
+                var launchURL = sessionlessLaunchInfo.url;
+                cy.visit(launchURL);
+            }));
+        });
     });
 };
 /*----------------------------------------*/

package/lib/src/commands/launchAs.js.map

@@ -1 +1 @@
-{"version":3,"file":"launchAs.js","sourceRoot":"","sources":["../../../src/commands/launchAs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"launchAs.js","sourceRoot":"","sources":["../../../src/commands/launchAs.ts"],"names":[],"mappings":"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"}

package/lib/src/commands/logIntoPorta.js

@@ -52,65 +52,68 @@ var getFormData = function (html, formSelector) {
 var logIntoPorta = function () {
     Cypress.Commands.add('logIntoPorta', function (name) {
         cy.log('🔓 Handling HarvardKey authentication via API');
-        var userInfo = Cypress.env(name);
-        if (!userInfo) {
-            throw new Error("Could not find ".concat(name, " in environment variables"));
-        }
-        var username = userInfo.username, password = userInfo.password;
-        // Check if username and password are set
-        if (!username || !password) {
-            throw new Error("Credential \"".concat(name, "\" is missing username and/or password"));
-        }
-        var htmlHeaders = { accept: 'text/html' };
-        // Request 1: GET Cirrus Identity discovery page
-        cy.request({
-            url: LOGIN_PAGE,
-            followRedirect: true,
-            failOnStatusCode: false,
-            headers: htmlHeaders,
-        }).then(function (discoveryRes) {
-            // Parse discovery page for HarvardKey IdP button href
-            var btnMatch = discoveryRes.body.match(new RegExp("href=[\"']([^\"']+)[\"'][^>]*id=[\"']".concat(HARVARDKEY_IDP_BUTTON_ID, "[\"']")));
-            if (!btnMatch) {
-                throw new Error('Could not find HarvardKey IdP button link on discovery page');
+        // Get user credentials from environment variables
+        cy.env([name]).then(function (environment) {
+            var userInfo = environment[name];
+            if (!userInfo) {
+                throw new Error("Could not find ".concat(name, " in environment variables"));
+            }
+            var username = userInfo.username, password = userInfo.password;
+            // Check if username and password are set
+            if (!username || !password) {
+                throw new Error("Credential \"".concat(name, "\" is missing username and/or password"));
             }
-            var idpUrl = "".concat(IDP_BASE_URL).concat(btnMatch[1]);
-            // Request 2: GET HarvardKey IdP login page
+            var htmlHeaders = { accept: 'text/html' };
+            // Request 1: GET Cirrus Identity discovery page
             cy.request({
-                url: idpUrl,
+                url: LOGIN_PAGE,
                 followRedirect: true,
                 failOnStatusCode: false,
                 headers: htmlHeaders,
-            }).then(function (loginPageRes) {
-                // Parse login form action and hidden fields
-                var _a = getFormData(loginPageRes.body), loginFormUrl = _a.action, loginHiddenFields = _a.fields;
-                if (!loginFormUrl) {
-                    throw new Error('Could not find login form action on HarvardKey page');
+            }).then(function (discoveryRes) {
+                // Parse discovery page for HarvardKey IdP button href
+                var btnMatch = discoveryRes.body.match(new RegExp("href=[\"']([^\"']+)[\"'][^>]*id=[\"']".concat(HARVARDKEY_IDP_BUTTON_ID, "[\"']")));
+                if (!btnMatch) {
+                    throw new Error('Could not find HarvardKey IdP button link on discovery page');
                 }
-                // Request 3: POST credentials to HarvardKey login form
+                var idpUrl = "".concat(IDP_BASE_URL).concat(btnMatch[1]);
+                // Request 2: GET HarvardKey IdP login page
                 cy.request({
-                    method: 'POST',
-                    url: loginFormUrl,
-                    form: true,
+                    url: idpUrl,
                     followRedirect: true,
                     failOnStatusCode: false,
                     headers: htmlHeaders,
-                    body: __assign(__assign({}, loginHiddenFields), { username: username, password: password }),
-                }).then(function (authRes) {
-                    // Parse SAML form from login response
-                    var _a = getFormData(authRes.body, 'form[action*="saml2-acs"]'), samlFormUrl = _a.action, samlHiddenFields = _a.fields;
-                    if (!samlFormUrl) {
-                        throw new Error('Could not find SAML form in login response');
+                }).then(function (loginPageRes) {
+                    // Parse login form action and hidden fields
+                    var _a = getFormData(loginPageRes.body), loginFormUrl = _a.action, loginHiddenFields = _a.fields;
+                    if (!loginFormUrl) {
+                        throw new Error('Could not find login form action on HarvardKey page');
                     }
-                    // Request 4: POST SAML assertion to ACS
-                    return cy.request({
+                    // Request 3: POST credentials to HarvardKey login form
+                    cy.request({
                         method: 'POST',
-                        url: samlFormUrl,
+                        url: loginFormUrl,
                         form: true,
                         followRedirect: true,
                         failOnStatusCode: false,
                         headers: htmlHeaders,
-                        body: samlHiddenFields,
+                        body: __assign(__assign({}, loginHiddenFields), { username: username, password: password }),
+                    }).then(function (authRes) {
+                        // Parse SAML form from login response
+                        var _a = getFormData(authRes.body, 'form[action*="saml2-acs"]'), samlFormUrl = _a.action, samlHiddenFields = _a.fields;
+                        if (!samlFormUrl) {
+                            throw new Error('Could not find SAML form in login response');
+                        }
+                        // Request 4: POST SAML assertion to ACS
+                        return cy.request({
+                            method: 'POST',
+                            url: samlFormUrl,
+                            form: true,
+                            followRedirect: true,
+                            failOnStatusCode: false,
+                            headers: htmlHeaders,
+                            body: samlHiddenFields,
+                        });
                     });
                 });
             });

package/lib/src/commands/logIntoPorta.js.map

@@ -1 +1 @@
-{"version":3,"file":"logIntoPorta.js","sourceRoot":"","sources":["../../../src/commands/logIntoPorta.ts"],"names":[],"mappings":";AAAA,iCAAiC;;;;;;;;;;;;;AA6BjC,4CAA4C;AAC5C,kDAAkD;AAClD,4CAA4C;AAE5C,6CAA6C;AAC7C,IAAM,UAAU,GAAG,uHAAuH,CAAC;AAC3I,0CAA0C;AAC1C,IAAM,YAAY,GAAG,iCAAiC,CAAC;AACvD,oDAAoD;AACpD,IAAM,wBAAwB,GAAG,uBAAuB,CAAC;AAEzD,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C;;;;;;GAMG;AACH,IAAM,WAAW,GAAG,UAAC,IAAY,EAAE,YAAqB;;IAArB,6BAAA,EAAA,qBAAqB;IACtD,IAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC/D,IAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC7C,IAAM,MAAM,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC;IAClD,IAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB,CAAC,oBAAoB,EAAE,OAAO,CAAC,UAAC,KAAK;;QACzD,IAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,MAAA,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,IAAM,YAAY,GAAG;IACnB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAClB,cAAc,EACd,UACE,IAAY;QAEZ,EAAE,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;QAExD,IAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,yBAAkB,IAAI,8BAA2B,CAAC,CAAC;QACrE,CAAC;QACO,IAAA,QAAQ,GAAe,QAAQ,SAAvB,EAAE,QAAQ,GAAK,QAAQ,SAAb,CAAc;QAExC,yCAAyC;QACzC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,uBAAe,IAAI,2CAAuC,CAAC,CAAC;QAC9E,CAAC;QAED,IAAM,WAAW,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QAE5C,gDAAgD;QAChD,EAAE,CAAC,OAAO,CAAC;YACT,GAAG,EAAE,UAAU;YACf,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,KAAK;YACvB,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC,IAAI,CAAC,UAAC,YAAY;YACnB,sDAAsD;YACtD,IAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CACtC,IAAI,MAAM,CAAC,+CAAoC,wBAAwB,UAAM,CAAC,CAC/E,CAAC;YACF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;YACjF,CAAC;YAED,IAAM,MAAM,GAAG,UAAG,YAAY,SAAG,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC;YAE/C,2CAA2C;YAC3C,EAAE,CAAC,OAAO,CAAC;gBACT,GAAG,EAAE,MAAM;gBACX,cAAc,EAAE,IAAI;gBACpB,gBAAgB,EAAE,KAAK;gBACvB,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC,IAAI,CAAC,UAAC,YAAY;gBACnB,4CAA4C;gBACtC,IAAA,KAGF,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,EAFxB,YAAY,YAAA,EACZ,iBAAiB,YACO,CAAC;gBACnC,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBACzE,CAAC;gBAED,uDAAuD;gBACvD,EAAE,CAAC,OAAO,CAAC;oBACT,MAAM,EAAE,MAAM;oBACd,GAAG,EAAE,YAAY;oBACjB,IAAI,EAAE,IAAI;oBACV,cAAc,EAAE,IAAI;oBACpB,gBAAgB,EAAE,KAAK;oBACvB,OAAO,EAAE,WAAW;oBACpB,IAAI,wBACC,iBAAiB,KACpB,QAAQ,UAAA,EACR,QAAQ,UAAA,GACT;iBACF,CAAC,CAAC,IAAI,CAAC,UAAC,OAAO;oBACd,sCAAsC;oBAChC,IAAA,KAGF,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,2BAA2B,CAAC,EAFhD,WAAW,YAAA,EACX,gBAAgB,YACgC,CAAC;oBAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;oBAChE,CAAC;oBAED,wCAAwC;oBACxC,OAAO,EAAE,CAAC,OAAO,CAAC;wBAChB,MAAM,EAAE,MAAM;wBACd,GAAG,EAAE,WAAW;wBAChB,IAAI,EAAE,IAAI;wBACV,cAAc,EAAE,IAAI;wBACpB,gBAAgB,EAAE,KAAK;wBACvB,OAAO,EAAE,WAAW;wBACpB,IAAI,EAAE,gBAAgB;qBACvB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"logIntoPorta.js","sourceRoot":"","sources":["../../../src/commands/logIntoPorta.ts"],"names":[],"mappings":"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"}

package/lib/src/genConfiguration/index.js

@@ -70,7 +70,6 @@ var genConfiguration = function () {
     }
     // NOTE: Order matters (later overrides earlier)
     var sources = [
-        GlobalCredentials,
         GlobalResources,
         GlobalValues,
         profileModules,
@@ -92,8 +91,11 @@ var genConfiguration = function () {
     // Resolve dependencies
     var dependents = (0, resolveDependents_1.default)(dependentValues, basics);
     // Add basics, depends, and profileName into the final env
-    var finalEnv = __assign(__assign(__assign({}, basics), dependents), { profileName: profileName });
-    var baseUrl = finalEnv.baseURL;
+    var exposed = __assign(__assign(__assign({}, basics), dependents), { profileName: profileName });
+    // Add all global values and credentials into the final env
+    // Does not support dependent values in GlobalCredentials, TODO: Fix
+    var securedEnv = __assign(__assign({}, GlobalCredentials), exposed);
+    var baseUrl = exposed.baseURL;
     if (!(baseUrl === null || baseUrl === void 0 ? void 0 : baseUrl.startsWith('http'))) {
         baseUrl = "https://".concat(baseUrl);
     }
@@ -103,7 +105,8 @@ var genConfiguration = function () {
             experimentalWebKitSupport: true,
             experimentalOriginDependencies: true,
             baseUrl: baseUrl,
-            env: finalEnv,
+            expose: exposed,
+            env: securedEnv,
         },
     });
 };