release-v-1-15-0 (#15)

* fix password change for non sso

* fixing 2fa totp

Author: LennartSchmidtKern

pages/login.tsx

@@ -20,7 +20,7 @@ const Login: NextPage = () => {
   const [oidcFlow, setOidcFlow] = useState<LoginFlow>();
   const [selectedRole, setSelectedRole] = useState<string | undefined>('engineer');
   const [isAccLinkageRequested, setIsAccLinkageRequested] = useState(false);
-
+  const [totpFlow, setTotpFlow] = useState<LoginFlow>();
   // Get ?flow=... from the URL
   const router = useRouter()
   const {
@@ -90,6 +90,13 @@ const Login: NextPage = () => {
       submitNode.meta.label.text = "Proceed"
     }
 
+    if (initialFlow.ui.nodes.some((node: any) => node.group === "totp")) {
+      const totcData = JSON.parse(JSON.stringify(flowData));
+      totcData.ui.nodes = totcData.ui.nodes.filter((node: any) => node.group == "totp" || node.group == "default");
+      // prevent duplicate messages
+      totcData.ui.messages = [];
+      setTotpFlow(totcData);
+    }
 
     if (flowData.ui.nodes.some((node: any) => node.group === "oidc")) {
       const oidcData = JSON.parse(JSON.stringify(flowData));
@@ -164,7 +171,12 @@ const Login: NextPage = () => {
                     <div className="divider-outer"><span className="divider">Or</span></div>
                     <Flow onSubmit={onSubmit} flow={oidcFlow} only="oidc" />
                   </> : null}
+                {totpFlow ?
+                  <>
+                    <Flow onSubmit={onSubmit} flow={totpFlow} only="totp" />
+                  </> : null}
               </div>) : (<>
+
                 <fieldset>
                   <span className="typography-h3">
                     Select role

pages/settings.tsx

@@ -63,7 +63,7 @@ const Settings: NextPage = () => {
     setChangedFlow(initialFlow)
 
     //prevent password change option display if sso
-    if (initialFlow.identity.metadata_public?.registration_scope?.provider_id != "kern.ai") {
+    if (["microsoft", "google"].includes(initialFlow.identity.metadata_public?.registration_scope?.provider_id)) {
       initialFlow.ui.nodes = initialFlow.ui.nodes.filter((node: UiNode) => node.group !== "password");
       setIsOidc(true);
     }

pkg/errors.tsx

@@ -41,7 +41,7 @@ export function handleGetFlowError<S>(
           "A security violation was detected, please fill out the form again.",
         )
         resetFlow(undefined)
-        await router.push("/welcome" + flowType)
+        await router.push("/auth/" + flowType)
         return
       case "security_identity_mismatch":
         // The requested item was intended for someone else. Let's request a new flow...