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

Move into the function

Browse source
This commit is contained in:
Manav Rathi 2024-05-23 13:03:31 +05:30
parent 26436f116f
commit 99f47dc1ae
No known key found for this signature in database
2 changed files with 12 additions and 14 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

@ -179,7 +179,7 @@ const CodeDisplay: React.FC<CodeDisplay> = ({ codeInfo }) => {
console.log({ codeInfo });
const totp = new TOTP({
secret: codeInfo.secret,
algorithm: codeInfo.algorithm ?? Code.defaultAlgo,
algorithm: codeInfo.algorithm,
period: codeInfo.period,
digits: codeInfo.digits,
});

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

@ -11,8 +11,6 @@ type AlgorithmType =
| "SHA512";
export class Code {
static readonly defaultAlgo = "sha1";
// id for the corresponding auth entity
id?: String;
account: string;
@ -81,8 +79,8 @@ export const codeFromRawData = (id: string, rawData: string): Code => {
return new Code(
_getAccount(uriPath),
_getIssuer(uriPath, uriParams),
_getDigits(uriParams) || 6,
_getPeriod(uriParams) || 30,
_getDigits(uriParams),
_getPeriod(uriParams),
getSanitizedSecret(uriParams),
_getAlgorithm(uriParams),
_getType(uriPath),
@ -129,23 +127,23 @@ const _getIssuer = (uriPath: string, uriParams: { get?: any }): string => {
}
};
const _getDigits = (uriParams): number | undefined => {
const _getDigits = (uriParams): number => {
try {
return parseInt(uriParams["digits"], 10);
} catch (e) {
return undefined;
return parseInt(uriParams["digits"], 10) || 6;
} catch {
return 6;
}
};
const _getPeriod = (uriParams): number | undefined => {
const _getPeriod = (uriParams): number => {
try {
return parseInt(uriParams["period"], 10);
} catch (e) {
return undefined;
return parseInt(uriParams["period"], 10) || 30;
} catch {
return 30;
}
};
const _getAlgorithm = (uriParams): AlgorithmType => {
const _getAlgorithm = (uriParams): AlgorithmType | undefined => {
try {
const algorithm = uriParams["algorithm"].toLowerCase();
if (algorithm === "sha256") {