wip

GraxMonzo · Jan 16, 2021 · 2417d71 · 2417d71
1 parent c7a09bd
commit 2417d71
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 47 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
diff --git a/src/HasOTP.php b/src/HasOTP.php
@@ -6,8 +6,6 @@
 
 trait HasOTP
 {
-    protected int $digits = 6;
-
     protected OTPOptions $otpOptions;
 
     abstract public function getOTPOptions(): OTPOptions;
@@ -46,7 +44,9 @@ public function authenticate($code, $options = [])
     {
         $this->otpOptions = $this->getOTPOptions();
         $otpField = $this->otpOptions->otpField;
-        $totp = new TOTP($this->$otpField, ['digits' => $this->digits]);
+        $digits = $this->otpOptions->digits;
+
+        $totp = new TOTP($this->$otpField, compact('digits'));
         if ($drift = $options['drift']) {
             return $totp->verify($code, $drift);
         } else {
@@ -58,11 +58,13 @@ public function otpCode($options = [])
     {
         $this->otpOptions = $this->getOTPOptions();
         $otpField = $this->otpOptions->otpField;
+        $digits = $this->otpOptions->digits;
+
         if (is_array($options)) {
             $time = $options['time'] ?? time();
         } else {
             $time = $options;
         }
-        return (new TOTP($this->$otpField, ['digits' => $this->digits]))->at($time);
+        return (new TOTP($this->$otpField, compact('digits')))->at($time);
     }
 }
diff --git a/src/OTPOptions.php b/src/OTPOptions.php
@@ -6,6 +6,8 @@ class OTPOptions
 {
     public string $otpField;
 
+    public int $digits = 6;
+
     public bool $generateOTPOnCreate = true;
 
     public static function create(): self
@@ -19,4 +21,11 @@ public function saveOTPTo(string $fieldName): self
 
         return $this;
     }
+
+    public function withDigits(int $digits): self
+    {
+        $this->digits = $digits;
+
+        return $this;
+    }
 }