Update import path across packages

BrunoMiguens · Jul 17, 2019 · 14623cc · 14623cc
1 parent 8f2b7d9
commit 14623cc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/lib/src/hotp.dart b/lib/src/hotp.dart
@@ -4,7 +4,7 @@
 ///
 
 import 'otp.dart';
-import 'package:dart_otp/src/otp_type.dart';
+import 'package:dart_otp/src/components/otp_type.dart';
 
 class HOTP extends OTP {
   @override

diff --git a/lib/src/otp.dart b/lib/src/otp.dart
@@ -6,7 +6,8 @@
 import 'dart:math';
 import 'package:crypto/crypto.dart';
 import 'package:base32/base32.dart';
-import 'package:dart_otp/src/otp_type.dart';
+import 'package:dart_otp/src/components/otp_algorithm.dart';
+import 'package:dart_otp/src/components/otp_type.dart';
 import 'util.dart';
 
 abstract class OTP {
@@ -53,12 +54,12 @@ abstract class OTP {
   ///
   /// @return {String}
   ///
-  String generateOTP({int input}) {
+  String generateOTP({int input, OTPAlgorithm algorithm = OTPAlgorithm.SHA1}) {
     /// base32 decode the secret
     var hmacKey = base32.decode(this.secret);
 
     /// initial the HMAC-SHA1 object
-    var hmacSha1 = Hmac(sha1, hmacKey);
+    var hmacSha1 = createHmacFor(algorithm: algorithm, key: hmacKey);
 
     /// get hmac answer
     var hmac = hmacSha1.convert(Util.intToBytelist(input: input)).bytes;

diff --git a/lib/src/totp.dart b/lib/src/totp.dart
@@ -4,7 +4,7 @@
 ///
 
 import 'otp.dart';
-import 'otp_type.dart';
+import 'components/otp_type.dart';
 import 'util.dart';
 
 class TOTP extends OTP {

diff --git a/test/hotp_test.dart b/test/hotp_test.dart
@@ -1,5 +1,5 @@
 import 'package:dart_otp/dart_otp.dart';
-import 'package:dart_otp/src/otp_type.dart';
+import 'package:dart_otp/src/components/otp_type.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/totp_test.dart b/test/totp_test.dart
@@ -1,5 +1,5 @@
 import 'package:dart_otp/dart_otp.dart';
-import 'package:dart_otp/src/otp_type.dart';
+import 'package:dart_otp/src/components/otp_type.dart';
 import 'package:test/test.dart';
 
 void main() {