Skip to content

Fix dom.crypto.getRandomValues #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 19, 2022
Merged

Fix dom.crypto.getRandomValues #669

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df03142
Move crypto test to BrowserTests
armanbilge Jan 12, 2022
d133521
Fix dom.crypto.getRandomValues
armanbilge Jan 12, 2022
c268215
Tap dance for bincompat
armanbilge Jan 19, 2022
54932de
Merge branch 'main' into issue/668
armanbilge Jan 19, 2022
390faff
Relocate test
armanbilge Jan 19, 2022
e836956
Remove unused import
armanbilge Jan 19, 2022
4cc7429
Another unused import
armanbilge Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api-reports/2_12.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25514,7 +25514,7 @@ crypto/package[SO] @deprecated("use dom.RsaKeyGenParams instead", "2.0.0") val R
crypto/package[SO] @deprecated("use dom.RsaOaepParams instead", "2.0.0") val RsaOaepParams = dom.RsaOaepParams
crypto/package[SO] @deprecated("use dom.RsaPssParams instead", "2.0.0") val RsaPssParams = dom.RsaPssParams
crypto/package[SO] def crypto: Crypto (@deprecated in 2.0.0)
crypto/package[SO] @JSGlobal("crypto.getRandomValues") @js.native def getRandomValues(array: ArrayBufferView): ArrayBufferView
crypto/package[SO] def getRandomValues(array: ArrayBufferView): ArrayBufferView
crypto/package[SO] @JSGlobal("crypto.subtle") @js.native val subtle: dom.SubtleCrypto
experimental/Fullscreen[SO] (@deprecated in 2.0.0)
experimental/PointerLock[SO] type PointerLockDocument = dom.Document (@deprecated in 2.0.0)
Expand Down
2 changes: 1 addition & 1 deletion api-reports/2_13.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25514,7 +25514,7 @@ crypto/package[SO] @deprecated("use dom.RsaKeyGenParams instead", "2.0.0") val R
crypto/package[SO] @deprecated("use dom.RsaOaepParams instead", "2.0.0") val RsaOaepParams = dom.RsaOaepParams
crypto/package[SO] @deprecated("use dom.RsaPssParams instead", "2.0.0") val RsaPssParams = dom.RsaPssParams
crypto/package[SO] def crypto: Crypto (@deprecated in 2.0.0)
crypto/package[SO] @JSGlobal("crypto.getRandomValues") @js.native def getRandomValues(array: ArrayBufferView): ArrayBufferView
crypto/package[SO] def getRandomValues(array: ArrayBufferView): ArrayBufferView
crypto/package[SO] @JSGlobal("crypto.subtle") @js.native val subtle: dom.SubtleCrypto
experimental/Fullscreen[SO] (@deprecated in 2.0.0)
experimental/PointerLock[SO] type PointerLockDocument = dom.Document (@deprecated in 2.0.0)
Expand Down
5 changes: 2 additions & 3 deletions dom/src/main/scala/org/scalajs/dom/crypto/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ package object crypto {
val subtle: dom.SubtleCrypto = js.native

/** Fills the passed TypedArray with cryptographically sound random values. */
@JSGlobal("crypto.getRandomValues")
@js.native
def getRandomValues(array: ArrayBufferView): ArrayBufferView = js.native
@inline def getRandomValues(array: ArrayBufferView): ArrayBufferView =
webcrypto.getRandomValues(array)

@deprecated("use dom.crypto instead", "2.0.0")
@inline def crypto: Crypto = GlobalCrypto.crypto
Expand Down
21 changes: 0 additions & 21 deletions tests-chrome/src/test/scala/org/scalajs/dom/tests/chrome/CryptoTests.scala
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions tests-shared/src/main/scala/org/scalajs/dom/tests/shared/BrowserTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.scalajs.dom.tests.shared

import org.junit.Assert.assertEquals
import org.junit.Test
import org.scalajs.dom
import org.scalajs.dom.QueuingStrategy
import org.scalajs.dom.ReadableStream
import org.scalajs.dom.ReadableStreamController
Expand All @@ -15,10 +16,15 @@ import scala.concurrent.Future
import scala.concurrent.Promise
import scala.scalajs.js
import scala.scalajs.js.Thenable.Implicits._
import scala.scalajs.js.typedarray._
import scala.util.Try

trait BrowserTests {

// https://github.com/scala-js/scala-js-dom/issues/668
@Test final def cryptoGetRandomValues(): Unit =
dom.crypto.getRandomValues(new Uint8Array(1))

def read[T](reader: ReadableStreamReader[T])(values: Seq[T]): Future[Seq[T]] = {
reader
.read()
Expand Down