@genesislcap/foundation-auth 14.71.1-auth-mf.2 → 14.71.1-auth-mf.4

package/dist/esm/routes/login/login.js

@@ -11,58 +11,47 @@ let Login = class Login extends BaseRoute {
         super(...arguments);
         this.idps = [];
         this.selectedIDP = '';
-        this.ssoToggled = false;
     }
-    enter() {
-        return __awaiter(this, void 0, void 0, function* () {
-            DOM.queueUpdate(() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    /**
-                     * Retaining the logic that logs authenticated users out when this route is visited for now.
-                     * TODO: Revisit as shouldn't load mf if logged in already.
-                     */
-                    if (this.user.isAuthenticated()) {
-                        this.logout();
-                    }
-                    if (this.config.autoAuth && this.user.isAnonymous()) {
-                        this.automaticLogin();
-                    }
-                }
-                catch (e) {
-                    logger.debug(e);
-                }
-            }));
-        });
+    connectedCallback() {
+        super.connectedCallback();
+        this.addStoreBindings();
     }
+    enter(phase) {
+        super.enter(phase);
+        /**
+         * Retaining the logic that logs authenticated users out when this route is visited for now.
+         * TODO: Revisit as shouldn't load mf if logged in already.
+         */
+        if (this.user.isAuthenticated()) {
+            this.logout();
+        }
+        if (this.config.autoAuth) {
+            this.automaticLogin();
+        }
+    }
+    // TODO: Move the auto login logic up a level
     automaticLogin() {
         /**
          * Login preference flow taken from @genesislcap/foundation-auth.
          * We should sit down with Jose and team to cross check this. Reference code is bit hard to follow in places.
          */
         const cm = this.credentialManager;
-        const refreshCredentials = cm.createRefreshCredentials();
+        const refreshCredentials = cm.createRefreshCredentials(); // < refresh can likely go
         if (cm.validateRefreshCredentials(refreshCredentials)) {
             logger.debug(`Attempting to login with refresh credentials.`);
             // TODO: These may need to invoke different events on the machine.
             this.login(refreshCredentials);
             return;
         }
-        if (this.ssoToggled) {
-            const ssoCredentials = cm.createSSOCredentials();
-            if (cm.validateSSOCredentials(ssoCredentials)) {
-                logger.debug(`Attempting to login with SSO.`);
-                // TODO: These may need to invoke different events on the machine.
-                this.login(ssoCredentials);
-                this.credentialManager.removeSSOToken(); // < sso tokens can only be used once, remove after login attempt
-                return;
-            }
+        if (!this.store.formEntry.ssoToggled) {
+            this.$emit('auth-autofill-form');
         }
         this.attemptBasicLogin();
     }
     attemptBasicLogin() {
         const basicCredentials = this.credentialManager.createBasicCredentials({
-            username: this.orgUsername,
-            password: this.password,
+            username: this.store.formEntry.username,
+            password: this.store.formEntry.password,
         });
         if (!this.credentialManager.validateBasicCredentials(basicCredentials)) {
             logger.debug(`Basic credentials appear invalid, aborting login attempt.`);
@@ -71,27 +60,29 @@ let Login = class Login extends BaseRoute {
         logger.debug(`Attempting to login with basic credentials.`);
         this.login(basicCredentials);
     }
-    // TODO: Sync the SSO changes from login here.
-    ssoToggledChanged() {
-        var _a, _b;
-        this.clearError();
-        if (this.ssoToggled) {
-            const path = `${(_b = (_a = this.config.sso) === null || _a === void 0 ? void 0 : _a.identityProvidersPath) !== null && _b !== void 0 ? _b : 'sso/list'}`;
-            fetchIDPs(path)
-                .then((idps) => {
-                var _a, _b, _c;
-                logger.debug('fetched IDPs', idps);
-                // it no longer throws, check for 'error' manually
-                if (!idps.length || (idps.length === 1 && ((_a = idps[0]) === null || _a === void 0 ? void 0 : _a.id) === 'error')) {
-                    this.setError('Failed to fetch identity providers.');
-                }
-                else {
-                    this.idps = idps;
-                    this.selectedIDP = (_c = (_b = this.idps) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.id;
-                }
-            })
-                .catch(() => this.setError('Failed to fetch identity providers.'));
-        }
+    addStoreBindings() {
+        this.store.formEntry.binding((x) => x.ssoToggled, (value) => {
+            var _a, _b;
+            this.clearError();
+            if (value) {
+                const path = `${(_b = (_a = this.config.sso) === null || _a === void 0 ? void 0 : _a.identityProvidersPath) !== null && _b !== void 0 ? _b : 'sso/list'}`;
+                fetchIDPs(path)
+                    .then((idps) => {
+                    var _a, _b, _c;
+                    logger.debug('fetched IDPs', idps);
+                    // it no longer throws, check for 'error' manually
+                    if (!idps.length || (idps.length === 1 && ((_a = idps[0]) === null || _a === void 0 ? void 0 : _a.id) === 'error')) {
+                        this.setError('Failed to fetch identity providers.');
+                    }
+                    else {
+                        // Move to store of keep local?
+                        this.idps = idps;
+                        this.selectedIDP = (_c = (_b = this.idps) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.id;
+                    }
+                })
+                    .catch(() => this.setError('Failed to fetch identity providers.'));
+            }
+        });
     }
     get selectedIDPName() {
         return this.selectedIDP ? ` - ${this.selectedIDP}` : '';
@@ -161,18 +152,13 @@ let Login = class Login extends BaseRoute {
             type: 'closeSocket',
         });
     }
-    onRefreshTest() {
-        this.$emit('auth-machine-event', {
-            type: 'refresh',
-        });
-    }
     onLoginDetailsTest() {
         this.$emit('auth-machine-event', {
             type: 'login-details',
         });
     }
     get submitDisabled() {
-        return this.authMachine.hasTag('pending');
+        return false; // this.authMachine.hasTag('pending'); // disable for now
     }
 };
 __decorate([
@@ -181,9 +167,6 @@ __decorate([
 __decorate([
     observable
 ], Login.prototype, "selectedIDP", void 0);
-__decorate([
-    observable
-], Login.prototype, "ssoToggled", void 0);
 __decorate([
     volatile
 ], Login.prototype, "selectedIDPName", null);

package/dist/esm/routes/login/login.template.js

@@ -2,7 +2,7 @@ import { sync } from '@genesislcap/foundation-utils';
 import { html, repeat, when } from '@microsoft/fast-element';
 import { organisationField, passwordField, showPasswordsCheckbox, usernameField, submitButton, } from '../base';
 const regularLogin = html `
-  ${when((login) => !login.ssoToggled, html `
+  ${when((login) => !login.store.formEntry.ssoToggled, html `
       ${organisationField()} ${usernameField()} ${passwordField()}
       <span class="case-warning">*Fields are case-sensitive</span>
       ${showPasswordsCheckbox()}
@@ -42,7 +42,6 @@ const regularLogin = html `
             <a class="link-url" @click=${(x) => x.logout()}>Logout Test</a>
             <a class="link-url" @click=${(x) => x.onOpenSocketTest()}>Socket Open Test</a>
             <a class="link-url" @click=${(x) => x.onCloseSocketTest()}>Socket Close Test</a>
-            <a class="link-url" @click=${(x) => x.onRefreshTest()}>Refresh Test</a>
             <a class="link-url" @click=${(x) => x.onLoginDetailsTest()}>Login Details Test</a>
             <pre>context: ${(x) => JSON.stringify(x.authMachine.errors.messages)}</pre>
             ${when((x) => !!x.authMachine.errors.size, html `
@@ -64,7 +63,7 @@ const regularLogin = html `
     `)}
 `;
 const ssoLogin = html `
-  ${when((login) => login.ssoToggled, html `
+  ${when((login) => login.store.formEntry.ssoToggled, html `
       <div class="sso">
         <span class="form-title">Providers</span>
         <zero-select
@@ -121,11 +120,11 @@ export const LoginTemplate = html `
           ${regularLogin} ${ssoLogin}
           ${when((x) => x.config.sso, html `
               <zero-checkbox
-                ?checked="${sync((x) => x.ssoToggled, 'boolean')}"
+                ?checked="${sync((x) => x.store.formEntry.ssoToggled, 'boolean')}"
                 name="sso-toggle"
                 data-test-id="sso-toggle"
               >
-                ${(x) => (x.ssoToggled ? 'SSO Enabled' + x.selectedIDPName : 'Enable SSO?')}
+                ${(x) => x.store.formEntry.ssoToggled ? 'SSO Enabled' + x.selectedIDPName : 'Enable SSO?'}
               </zero-checkbox>
             `)}
           <auth-message

package/dist/esm/store/auth.js

@@ -20,6 +20,7 @@ let DefaultAuthStore = class DefaultAuthStore extends AbstractStoreRoot {
                 credentials,
             },
         }));
+        this.onLoginDetails = this.createListener('auth-login-details', () => this.authMachine.send({ type: 'login-details' }));
         this.onLogout = this.createListener('auth-logout', () => this.authMachine.send({ type: 'logout' }));
     }
     get isPending() {

package/dist/esm/store/authFormEntry.js

@@ -1,7 +1,7 @@
 import { __awaiter, __decorate } from "tslib";
-import { CredentialManager } from '@genesislcap/foundation-comms';
+import { CredentialManager, credentialSeparator } from '@genesislcap/foundation-comms';
 import { AbstractStore, registerStore } from '@genesislcap/foundation-store';
-import { observable } from '@microsoft/fast-element';
+import { observable, volatile } from '@microsoft/fast-element';
 import { AuthConfig } from '../main';
 import { logger } from '../utils';
 /**
@@ -9,8 +9,14 @@ import { logger } from '../utils';
  * @public
  */
 export class DefaultAuthFormEntryStore extends AbstractStore {
+    get orgUsername() {
+        return this.config.fields.organisation && this.organisation.trim() !== ''
+            ? `${this.username.trim()}:${this.organisation.trim()}`
+            : this.username.trim();
+    }
     constructor() {
-        super(...arguments);
+        var _a, _b;
+        super();
         this.host = '';
         this.organisation = '';
         this.username = '';
@@ -33,8 +39,11 @@ export class DefaultAuthFormEntryStore extends AbstractStore {
         this.onPasswordChanged = this.createListener('auth-password-changed', (detail) => (this.commit.password = detail));
         this.onPassword2Changed = this.createListener('auth-password2-changed', (detail) => (this.commit.password2 = detail));
         this.onShowPasswordsChanged = this.createListener('auth-showPasswords-changed', (detail) => (this.commit.showPasswords = detail));
+        this.onAutofillForm = this.createListener('auth-autofill-form', () => this.autofill());
+        this.ssoToggled = (_b = (_a = this.config.sso) === null || _a === void 0 ? void 0 : _a.toggled) !== null && _b !== void 0 ? _b : false;
     }
     autofill() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             let credentialData;
             try {
@@ -43,30 +52,30 @@ export class DefaultAuthFormEntryStore extends AbstractStore {
                  * Neptune was using cookies directly. To provide them with a seamless upgrade, we should load from cookies if the
                  * container is empty. These stored cookies become irrelevant after their first login in the new system.
                  */
-                // const containerData = await this.credentialManager.getCredentialsFromContainer();
-                // const cookieData = await this.credentialManager.getCredentialsFromCookie();
-                // const [normalisedData, canRemoveCookie] =
-                //   this.credentialManager.normaliseLegacyCredentialData(containerData, cookieData);
-                // if (cookieData && canRemoveCookie) {
-                //   /**
-                //    * Upgrade path: They have chosen a profile from the container, yet also have a cookie... it's safe to remove the cookie.
-                //    */
-                //   this.credentialManager.removeCookie();
-                // }
-                // credentialData = normalisedData;
-                // if (credentialData) {
-                //   this.username = credentialData.name ?? '';
-                //   this.password = credentialData.password ?? '';
-                //   if (this.config.fields.organisation) {
-                //     const combinedCompIdUsername = credentialData.id ?? '';
-                //     const valueParts = combinedCompIdUsername.split(credentialSeparator);
-                //     const orgIdx = valueParts.length === 2 ? 1 : 0;
-                //     const proposedOrganisation = valueParts[orgIdx];
-                //     if (proposedOrganisation !== this.username) {
-                //       this.organisation = proposedOrganisation;
-                //     }
-                //   }
-                // }
+                const containerData = yield this.credentialManager.getCredentialsFromContainer();
+                const cookieData = yield this.credentialManager.getCredentialsFromCookie();
+                const [normalisedData, canRemoveCookie] = this.credentialManager.normaliseLegacyCredentialData(containerData, cookieData);
+                if (cookieData && canRemoveCookie) {
+                    /**
+                     * Upgrade path: They have chosen a profile from the container, yet also have a cookie... it's safe to remove the cookie.
+                     */
+                    this.credentialManager.removeCookie();
+                }
+                credentialData = normalisedData;
+                if (credentialData) {
+                    const passwordCredentials = credentialData;
+                    this.username = (_a = passwordCredentials.name) !== null && _a !== void 0 ? _a : '';
+                    this.password = (_b = passwordCredentials.password) !== null && _b !== void 0 ? _b : '';
+                    if (this.config.fields.organisation) {
+                        const combinedCompIdUsername = (_c = passwordCredentials.id) !== null && _c !== void 0 ? _c : '';
+                        const valueParts = combinedCompIdUsername.split(credentialSeparator);
+                        const orgIdx = valueParts.length === 2 ? 1 : 0;
+                        const proposedOrganisation = valueParts[orgIdx];
+                        if (proposedOrganisation !== this.username) {
+                            this.organisation = proposedOrganisation;
+                        }
+                    }
+                }
             }
             catch (err) {
                 logger.error('An error occurred attempting to get and autofill from stored credentials.', err);
@@ -129,6 +138,9 @@ __decorate([
 __decorate([
     observable
 ], DefaultAuthFormEntryStore.prototype, "termsAgreed", void 0);
+__decorate([
+    volatile
+], DefaultAuthFormEntryStore.prototype, "orgUsername", null);
 /**
  * DI key of the store.
  * @internal