libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Drop base64-js dependency from Keycloak JS (#26265)

Browse source 
Closes #26264

Signed-off-by: Jon Koops <jonkoops@gmail.com>
This commit is contained in:
Jon Koops 2024-01-17 13:23:40 +01:00 committed by GitHub
parent 0307779c55
commit b597c022e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/libs/keycloak-js/package.json
View file

@ -75,7 +75,6 @@
"shx": "^0.3.4" "shx": "^0.3.4"
}, },
"dependencies": { "dependencies": {
"base64-js": "^1.5.1",
"js-sha256": "^0.10.1", "js-sha256": "^0.10.1",
"jwt-decode": "^4.0.0" "jwt-decode": "^4.0.0"
} }

2
js/libs/keycloak-js/rollup.config.ts
View file

@ -39,7 +39,7 @@ function defineOptions({
file: path.join(targetDir, `${file}.mjs`), file: path.join(targetDir, `${file}.mjs`),
}, },
], ],
external: ["base64-js", "js-sha256", "jwt-decode"], external: ["js-sha256", "jwt-decode"],
}, },
// Legacy Universal Module Definition, or “UMD”, with inlined dependencies. // Legacy Universal Module Definition, or “UMD”, with inlined dependencies.
{ {

9
js/libs/keycloak-js/src/keycloak.js
View file

@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import base64 from 'base64-js';
import sha256 from 'js-sha256'; import sha256 from 'js-sha256';
import { jwtDecode } from 'jwt-decode'; import { jwtDecode } from 'jwt-decode';
@ -380,7 +379,7 @@ function Keycloak (config) {
case "S256": case "S256":
// hash codeVerifier, then encode as url-safe base64 without padding // hash codeVerifier, then encode as url-safe base64 without padding
var hashBytes = new Uint8Array(sha256.arrayBuffer(codeVerifier)); var hashBytes = new Uint8Array(sha256.arrayBuffer(codeVerifier));
var encodedHash = base64.fromByteArray(hashBytes) var encodedHash = bytesToBase64(hashBytes)
.replace(/\+/g, '-') .replace(/\+/g, '-')
.replace(/\//g, '_') .replace(/\//g, '_')
.replace(/\=/g, ''); .replace(/\=/g, '');
@ -1756,3 +1755,9 @@ function Keycloak (config) {
} }
export default Keycloak; export default Keycloak;
// See: https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
function bytesToBase64(bytes) {
const binString = String.fromCodePoint(...bytes);
return btoa(binString);
}

4
js/pnpm-lock.yaml
View file

@ -350,9 +350,6 @@ importers:
libs/keycloak-js: libs/keycloak-js:
dependencies: dependencies:
base64-js:
specifier: ^1.5.1
version: 1.5.1
js-sha256: js-sha256:
specifier: ^0.10.1 specifier: ^0.10.1
version: 0.10.1 version: 0.10.1
@ -2733,6 +2730,7 @@ packages:
/base64-js@1.5.1: /base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
dev: true
/bcrypt-pbkdf@1.0.2: /bcrypt-pbkdf@1.0.2:
resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}