beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

non optional

Browse source
This commit is contained in:
Manav Rathi 2024-05-23 12:20:04 +05:30
parent d2743f4121
commit 51568e6c56
No known key found for this signature in database
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/apps/auth/src/pages/auth.tsx
View file

@ -326,7 +326,7 @@ const OTPDisplay: React.FC<OTPDisplayProps> = ({ codeInfo }) => {
secret: codeInfo.secret,
algorithm: codeInfo.algorithm ?? Code.defaultAlgo,
period: codeInfo.period ?? Code.defaultPeriod,
digits: codeInfo.digits ?? Code.defaultDigits,
digits: codeInfo.digits,
});
setCode(totp.generate());
setNextCode(

13
web/apps/auth/src/services/code.ts
View file

@ -11,7 +11,6 @@ type AlgorithmType =
| "SHA512";
export class Code {
static readonly defaultDigits = 6;
static readonly defaultAlgo = "sha1";
static readonly defaultPeriod = 30;
@ -19,7 +18,7 @@ export class Code {
id?: String;
account: string;
issuer: string;
digits?: number;
digits: number;
period: number;
secret: string;
algorithm: AlgorithmType;
@ -49,7 +48,7 @@ export class Code {
}
}
const codeFromRawData = (id: string, rawData: string): Code => {
export const codeFromRawData = (id: string, rawData: string): Code => {
let santizedRawData = rawData
.replace(/\+/g, "%2B")
.replace(/:/g, "%3A")
@ -83,7 +82,7 @@ const codeFromRawData = (id: string, rawData: string): Code => {
return new Code(
_getAccount(uriPath),
_getIssuer(uriPath, uriParams),
_getDigits(uriParams),
_getDigits(uriParams) ?? 6,
_getPeriod(uriParams),
getSanitizedSecret(uriParams),
_getAlgorithm(uriParams),
@ -131,11 +130,11 @@ const _getIssuer = (uriPath: string, uriParams: { get?: any }): string => {
}
};
const _getDigits = (uriParams): number => {
const _getDigits = (uriParams): number | undefined => {
try {
return parseInt(uriParams["digits"], 10) || Code.defaultDigits;
return parseInt(uriParams["digits"], 10);
} catch (e) {
return Code.defaultDigits;
return undefined;
}
};

4
web/apps/auth/src/services/remote.ts
View file

@ -6,7 +6,7 @@ import { getEndpoint } from "@ente/shared/network/api";
import { getToken } from "@ente/shared/storage/localStorage/helpers";
import { getActualKey } from "@ente/shared/user";
import { HttpStatusCode } from "axios";
import { Code } from "services/code";
import { Code, codeFromRawData } from "services/code";
const ENDPOINT = getEndpoint();
@ -33,7 +33,7 @@ export const getAuthCodes = async (): Promise<Code[]> => {
entity.header,
authenticatorKey,
);
return Code.fromRawData(entity.id, decryptedCode);
return codeFromRawData(entity.id, decryptedCode);
} catch (e) {
log.error(`failed to parse codeId = ${entity.id}`);
return null;