Manav Rathi 1 rok temu
rodzic
commit
26436f116f

+ 3 - 2
web/apps/auth/src/pages/auth.tsx

@@ -176,10 +176,11 @@ const CodeDisplay: React.FC<CodeDisplay> = ({ codeInfo }) => {
         try {
             const currentTime = new Date().getTime();
             if (codeInfo.type.toLowerCase() === "totp") {
+                console.log({ codeInfo });
                 const totp = new TOTP({
                     secret: codeInfo.secret,
                     algorithm: codeInfo.algorithm ?? Code.defaultAlgo,
-                    period: codeInfo.period ?? Code.defaultPeriod,
+                    period: codeInfo.period,
                     digits: codeInfo.digits,
                 });
                 setOTP(totp.generate());
@@ -274,7 +275,7 @@ const OTPDisplay: React.FC<OTPDisplayProps> = ({ code, otp, nextOTP }) => {
                 overflow: "hidden",
             }}
         >
-            <TimerProgress period={code.period ?? Code.defaultPeriod} />
+            <TimerProgress period={code.period} />
             <div
                 style={{
                     padding: "12px 20px 0px 20px",

+ 4 - 5
web/apps/auth/src/services/code.ts

@@ -12,7 +12,6 @@ type AlgorithmType =
 
 export class Code {
     static readonly defaultAlgo = "sha1";
-    static readonly defaultPeriod = 30;
 
     // id for the corresponding auth entity
     id?: String;
@@ -83,7 +82,7 @@ export const codeFromRawData = (id: string, rawData: string): Code => {
         _getAccount(uriPath),
         _getIssuer(uriPath, uriParams),
         _getDigits(uriParams) || 6,
-        _getPeriod(uriParams),
+        _getPeriod(uriParams) || 30,
         getSanitizedSecret(uriParams),
         _getAlgorithm(uriParams),
         _getType(uriPath),
@@ -138,11 +137,11 @@ const _getDigits = (uriParams): number | undefined => {
     }
 };
 
-const _getPeriod = (uriParams): number => {
+const _getPeriod = (uriParams): number | undefined => {
     try {
-        return parseInt(uriParams["period"], 10) || Code.defaultPeriod;
+        return parseInt(uriParams["period"], 10);
     } catch (e) {
-        return Code.defaultPeriod;
+        return undefined;
     }
 };