From 01099842cd83370316987e330c27a1929ef05584 Mon Sep 17 00:00:00 2001
From: Christian Murphy <Christian.Murphy.42@gmail.com>
Date: Wed, 3 Apr 2019 11:20:22 -0700
Subject: [PATCH] optionally use crypto to generate nonce

---
 projects/lib/src/oauth-service.ts | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/projects/lib/src/oauth-service.ts b/projects/lib/src/oauth-service.ts
index 039f56dc..de082350 100644
--- a/projects/lib/src/oauth-service.ts
+++ b/projects/lib/src/oauth-service.ts
@@ -1781,22 +1781,34 @@ export class OAuthService extends AuthConfig {
     }
 
     protected createNonce(): Promise<string> {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             if (this.rngUrl) {
                 throw new Error(
                     'createNonce with rng-web-api has not been implemented so far'
                 );
-            } else {
-                let text = '';
-                const possible =
-                    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+            }
 
-                for (let i = 0; i < 40; i++) {
-                    text += possible.charAt(Math.floor(Math.random() * possible.length));
+            /*
+             * This alphabet uses a-z A-Z 0-9 _- symbols.
+             * Symbols order was changed for better gzip compression.
+             */
+            const url = 'Uint8ArdomValuesObj012345679BCDEFGHIJKLMNPQRSTWXYZ_cfghkpqvwxyz-';
+            let size = 40;
+            let id = '';
+
+            const crypto = self.crypto || self.msCrypto;
+            if (crypto) {
+                const bytes = crypto.getRandomValues(new Uint8Array(size));
+                while (0 < size--) {
+                    id += url[bytes[size] & 63];
+                }
+            } else {
+                while (0 < size--) {
+                    id += url[Math.random() * 64 | 0];
                 }
-
-                resolve(text);
             }
+
+            resolve(id);
         });
     }