From 9151b9c2d6d1b6244424dd1ad42282f53960b25d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Wed, 12 Aug 2020 16:03:41 -0400
Subject: [PATCH] support launching sso from login page button (#59)

---
 src/app/accounts/login.component.html | 27 ++++++++++++++++-----------
 src/app/accounts/login.component.ts   |  4 ++++
 src/app/accounts/sso.component.html   | 22 ++--------------------
 src/app/accounts/sso.component.ts     |  5 -----
 src/locales/en/messages.json          |  3 +++
 5 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 68971a6c..6ac1318b 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -18,17 +18,22 @@
                                     [(ngModel)]="masterPassword" class="form-control">
                             </div>
                         </div>
-                        <button type="submit" class="btn btn-primary" [disabled]="form.loading">
-                            <i class="fa fa-spinner fa-fw fa-spin" [hidden]="!form.loading"></i>
-                            <i class="fa fa-sign-in fa-fw" [hidden]="form.loading"></i>
-                            {{'logIn' | i18n}}
-                        </button>
-                        <button type="button" class="btn btn-link" (click)="settings()">
-                            {{'settings' | i18n}}
-                        </button>
-                        <a routerLink="/sso" class="btn btn-outline-secondary btn-block mt-2">
-                            <i class="fa fa-bank" aria-hidden="true"></i> Enterprise Single Sign-On
-                        </a>
+                        <div class="d-flex">
+                            <div>
+                                <button type="submit" class="btn btn-primary" [disabled]="form.loading">
+                                    <i class="fa fa-spinner fa-fw fa-spin" [hidden]="!form.loading"></i>
+                                    <i class="fa fa-sign-in fa-fw" [hidden]="form.loading"></i>
+                                    {{'logIn' | i18n}}
+                                </button>
+                                <button type="button" class="btn btn-secondary ml-1" (click)="sso()">
+                                    <i class="fa fa-bank" aria-hidden="true"></i>
+                                    {{'enterpriseSingleSignOn' | i18n}}
+                                </button>
+                            </div>
+                            <button type="button" class="btn btn-link ml-auto" (click)="settings()">
+                                {{'settings' | i18n}}
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 1d8779b8..6f9ea7b8 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -50,4 +50,8 @@ export class LoginComponent extends BaseLoginComponent {
             modal.close();
         });
     }
+
+    sso() {
+        return super.launchSsoBrowser('connector', 'bwdc://sso-callback');
+    }
 }
diff --git a/src/app/accounts/sso.component.html b/src/app/accounts/sso.component.html
index 6eac0959..1685dff0 100644
--- a/src/app/accounts/sso.component.html
+++ b/src/app/accounts/sso.component.html
@@ -3,27 +3,9 @@
         <div class="row justify-content-center">
             <div class="col-md-8 col-lg-6">
                 <div class="card">
-                    <div class="card-body" *ngIf="loggingIn">
+                    <div class="card-body">
                         <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                        Logging in, please wait...
-                    </div>
-                    <div class="card-body" *ngIf="!loggingIn">
-                        <p>
-                            Quickly log in using your organization's single sign-on portal. Please enter your
-                            organization's identifier to begin.</p>
-                        <div class="form-group">
-                            <label for="identifier">Organization Identifier</label>
-                            <input id="identifier" class="form-control" type="text" name="Identifier"
-                                [(ngModel)]="identifier" required>
-                        </div>
-                        <button type="submit" class="btn btn-primary" [disabled]="form.loading">
-                            <i class="fa fa-spinner fa-fw fa-spin" [hidden]="!form.loading"></i>
-                            <i class="fa fa-sign-in fa-fw" [hidden]="form.loading"></i>
-                            {{'logIn' | i18n}}
-                        </button>
-                        <a routerLink="/" class="btn btn-link">
-                            {{'cancel' | i18n}}
-                        </a>
+                        {{'loading' | i18n}}
                     </div>
                 </div>
             </div>
diff --git a/src/app/accounts/sso.component.ts b/src/app/accounts/sso.component.ts
index b9616506..1084aed4 100644
--- a/src/app/accounts/sso.component.ts
+++ b/src/app/accounts/sso.component.ts
@@ -33,9 +33,4 @@ export class SsoComponent extends BaseSsoComponent {
         this.redirectUri = 'bwdc://sso-callback';
         this.clientId = 'connector';
     }
-
-    async submit() {
-        await super.submit();
-        this.router.navigate(['login']);
-    }
 }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index e23335a5..e4134a76 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -614,5 +614,8 @@
     },
     "region": {
         "message": "Region"
+    },
+    "enterpriseSingleSignOn": {
+        "message": "Enterprise Single Sign-On"
     }
 }