From c89b01c4616eb104156ab5ef427051c297417bdd Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 3 Apr 2018 15:11:37 -0400
Subject: [PATCH] added 2fa support for org duo

---
 jslib                                            |   2 +-
 src/app/accounts/two-factor-options.component.ts |   4 ++++
 src/app/accounts/two-factor.component.html       |   6 ++++--
 src/app/accounts/two-factor.component.ts         |   1 +
 src/images/two-factor/6.png                      | Bin 0 -> 1211 bytes
 src/locales/en/messages.json                     |   8 ++++++++
 6 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/images/two-factor/6.png

diff --git a/jslib b/jslib
index bdbb0131..bea9e065 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit bdbb01317d6b41a9c0f74d47bf89e8ed11631fdc
+Subproject commit bea9e06506424ba07764f68eaaaa9161a12da767
diff --git a/src/app/accounts/two-factor-options.component.ts b/src/app/accounts/two-factor-options.component.ts
index 49c6b14f..4bf54158 100644
--- a/src/app/accounts/two-factor-options.component.ts
+++ b/src/app/accounts/two-factor-options.component.ts
@@ -35,6 +35,10 @@ export class TwoFactorOptionsComponent implements OnInit {
         private platformUtilsService: PlatformUtilsService) { }
 
     ngOnInit() {
+        if (this.authService.twoFactorProviders.has(TwoFactorProviderType.OrganizationDuo)) {
+            this.providers.push(TwoFactorProviders[TwoFactorProviderType.OrganizationDuo]);
+        }
+
         if (this.authService.twoFactorProviders.has(TwoFactorProviderType.Authenticator)) {
             this.providers.push(TwoFactorProviders[TwoFactorProviderType.Authenticator]);
         }
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index ed95f9e3..8bfe9fbf 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -34,7 +34,8 @@
                 </div>
             </div>
         </ng-container>
-        <ng-container *ngIf="selectedProviderType === providerType.Duo">
+        <ng-container *ngIf="selectedProviderType === providerType.Duo ||
+                        selectedProviderType === providerType.OrganizationDuo">
             <div id="duo-frame"><iframe id="duo_iframe"></iframe></div>
             <div class="box last">
                 <div class="box-content">
@@ -55,7 +56,8 @@
         </div>
         <div class="buttons">
             <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick
-                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo">
+                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+                        selectedProviderType !== providerType.OrganizationDuo">
                 <span [hidden]="form.loading"><i class="fa fa-sign-in"></i> {{'continue' | i18n}}</span>
                 <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
             </button>
diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts
index c58a208f..139bb9fa 100644
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -85,6 +85,7 @@ export class TwoFactorComponent implements OnInit {
                 // TODO: init u2f
                 break;
             case TwoFactorProviderType.Duo:
+            case TwoFactorProviderType.OrganizationDuo:
                 setTimeout(() => {
                     (window as any).Duo.init({
                         host: params.Host,
diff --git a/src/images/two-factor/6.png b/src/images/two-factor/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab2e43403614fdae987a9f34b5c7c80f7a0599cd
GIT binary patch
literal 1211
zcmV;s1VsCZP)<h;3K|Lk000e1NJLTq003kF001Be1^@s6<SX4S00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$O-V#SRCwCd
zn^|a8R}_Z#y@}Bn6>%tn11b)cMr<v0!YTS9BBhR1p(uz_E42!R_#lOfPx_>&h>9Z!
zqKKearD~K`BZ~9TI#Wu;p;hXDB*uIFf9`+q5R%;C+<Vr^f{#q+?z7MN_gZ`Hy;ox2
zSABKHIoA=?x!f!U-heycGPnXxgBMw}(E}U+t--r2?_CV0fd9Z|Py`ZLwn2UXx3l<M
z85jmW1)qU_pbbcZXW%-x3eJOznf8ef(;swj!EG@3THikc2f+r3l+Id$0iacm_vYtH
zz$XC&X`SKqeDU9cX`p)(*NxOy4zNGKPOw!2r%{W$!dMqDU!!9SXrJc#WFGFxHfjQp
zPQ+5MS`lDr8ZrFF0a6ZDNtn47g7`gfo`k7z&DTB$)!@efUQFu@wt@YilZ7Cj^#MoZ
z=FQE<gDNm6k8Ms?n?0=raf<P~)tTmEV>O!F7NG5NB{Cmb2|{b3iEUsr5Tm;$;&uhR
z2fc2G2CIo6P80k_e<vbpYqFTQgV+SH*isPM2xVbWwdo;;)=E$OxZy)DjIft14*7na
zluDZl!bRMS2#QhRThxVVvzQjgjUWEY2nsUO=)PP`S6B-&T-zpf5fH*#sefVEhhf%&
za8z`Qh#+sZlJ0BRhoRPjaBGD-&F>=OA>3pwGwef0zL1Gpuq6#TzyWbho?>mx__+N(
z+VEYxp&$<ovn}r|B_07m;tE^$j0EAksG}eUT(ASGARVA*P6hu&U>@NXd@pcF;v_=8
zKa-nV#d;|v2BXw_XnM&1;JHhkxLJD0E8oirdtT$Ver>VbGhr|y_yTy;`LDdA+J&=s
z)R^%g=_&Xde5~*lcEq@08M`?OZ^$!fCyhf^k-pw^Hd{Ir<dUTz?7%7C&s7Rv)^=3h
z5eqr}f5IqXB}j>~yZyf3{RxgoK#*hd+?FBUvs44}p_L$<!1jWd^?tuT0)lWd-yLGu
zVyI-v)Fx+?|Ch=ewl(m#BVNahZI6<SFjnn69^U0r6)B+$!dO`gesYZ$()|qnG8Tk$
z$a1CQh4Pf71ZNT5I)CaJW){P^yaN2z#B~qBY^B7O#%ybu`%oQO2r;-IUL@f|6{JM-
z#!8ne97ty@Z~Z0$Sr@A>D<w!iCwYb`R(E~}?$=+O724Wp@?PRn#SNL-VK9c<2@#l2
z7J$ckk+FbLqMgDNPY5qGv|29ID!fem?otH<`*LW96^}f`+Tv_B{QPSZKEp5a^fKQ<
zG81dzKGb%tb*UnXyNyk<`P$2htG&2lBIgO#9R2Eo?F(@w&k7aRbFuhfl52R+E2ihj
zwb(k{$miU~ve>a;4jAH6=O+nm{UqwO>AjDnK6?Ue_p+&`vL5c;ymrC<9f6;HrR?aO
zMs~hKO||F>#(_~T^=|;3mASpu{c{zhHpA;rie3_h^p*#B=Snpil-CuO&bl;J@1DIE
ZU;w~$<goJj(jNc-002ovPDHLkV1nWGJ*ofz

literal 0
HcmV?d00001

diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 0998baeb..7dcf6e6a 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -537,6 +537,10 @@
     "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
+  "duoOrganizationDesc": {
+    "message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
+  },
   "u2fDesc": {
     "message": "Use any FIDO U2F enabled security key to access your account."
   },
@@ -1010,5 +1014,9 @@
   },
   "toggleOptions": {
     "message": "Toggle Options"
+  },
+  "organization": {
+    "message": "Organization",
+    "description": "An entity of multiple related people (ex. a team or business organization)."
   }
 }