From 90f723316aea59287ed2a11ebee86d474fe67e42 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 10 Oct 2018 17:52:08 -0400
Subject: [PATCH] support for new Challenge token for U2F

---
 .../components/two-factor.component.ts        | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/angular/components/two-factor.component.ts b/src/angular/components/two-factor.component.ts
index 3f60203b9e8..99342b8e9ae 100644
--- a/src/angular/components/two-factor.component.ts
+++ b/src/angular/components/two-factor.component.ts
@@ -97,18 +97,23 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
                     break;
                 }
 
-                const challenges = JSON.parse(params.Challenges);
-                if (challenges != null && challenges.length > 0) {
-                    this.u2f.init({
-                        appId: challenges[0].appId,
-                        challenge: challenges[0].challenge,
-                        keys: challenges.map((c: any) => {
-                            return {
-                                version: c.version,
-                                keyHandle: c.keyHandle,
-                            };
-                        }),
-                    });
+                if (params.Challenge != null) {
+                    this.u2f.init(JSON.parse(params.Challenge));
+                } else {
+                    // TODO: Deprecated. Remove in future version.
+                    const challenges = JSON.parse(params.Challenges);
+                    if (challenges != null && challenges.length > 0) {
+                        this.u2f.init({
+                            appId: challenges[0].appId,
+                            challenge: challenges[0].challenge,
+                            keys: challenges.map((c: any) => {
+                                return {
+                                    version: c.version,
+                                    keyHandle: c.keyHandle,
+                                };
+                            }),
+                        });
+                    }
                 }
                 break;
             case TwoFactorProviderType.Duo: