Skip to content

feat: add nonce attribute #62

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 2 commits into from
Oct 8, 2020
Merged

feat: add nonce attribute #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df22e77
feat: add nonce attribute
jpoehnelt Oct 8, 2020
c5ff981
docs: update example with nonce
jpoehnelt Oct 8, 2020
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
18 changes: 15 additions & 3 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta
http-equiv="Content-Security-Policy"
content="script-src 'nonce-caffe67d7b989af3a1c7f4a1a6c79bd9fb2b4eb0'"
/>

<title>Loader Example</title>
<style>
html,
Expand All @@ -28,9 +33,16 @@
padding: 0;
}
</style>
<script type="text/javascript" src="../dist/index.dev.js"></script>
<script
nonce="caffe67d7b989af3a1c7f4a1a6c79bd9fb2b4eb0"
type="text/javascript"
src="../dist/index.dev.js"
></script>

<script type="text/javascript">
<script
nonce="caffe67d7b989af3a1c7f4a1a6c79bd9fb2b4eb0"
type="text/javascript"
>
const mapOptions = {
center: {
lat: 0,
Expand All @@ -43,6 +55,7 @@
apiKey: "",
version: "weekly",
libraries: ["places"],
nonce: "caffe67d7b989af3a1c7f4a1a6c79bd9fb2b4eb0",
});

// Promise
Expand All @@ -68,6 +81,5 @@

<body>
<div id="map" class="map"></div>
<div id="map2" class="map"></div>
</body>
</html>
14 changes: 11 additions & 3 deletions src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { Loader, LoaderOptions } from ".";

afterEach(() => {
document.getElementsByTagName('html')[0].innerHTML = '';
document.getElementsByTagName("html")[0].innerHTML = "";
});

test.each([
Expand Down Expand Up @@ -65,8 +65,8 @@ test("setScript adds a script to head with correct attributes", () => {
});

test("setScript does not add second script with same id", () => {
new Loader({ apiKey: "foo", id: "bar" })['setScript']();
new Loader({ apiKey: "foo", id: "bar" })['setScript']();
new Loader({ apiKey: "foo", id: "bar" })["setScript"]();
new Loader({ apiKey: "foo", id: "bar" })["setScript"]();

expect(document.head.childNodes.length).toBe(1);
});
Expand Down Expand Up @@ -143,3 +143,11 @@ test("loader should wait if already loading", () => {

loader.load();
});

test("setScript adds a nonce", () => {
const nonce = "bar";
const loader = new Loader({ apiKey: "foo", nonce });
loader["setScript"]();
const script = document.head.childNodes[0] as HTMLScriptElement;
expect(script.nonce).toBe(nonce);
});
20 changes: 18 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ export interface LoaderOptions {
* Use a custom url and path to load the Google Maps API script.
*/
url?: string;
/**
* Use a cryptographic nonce attribute.
*/
nonce?: string;
}

/**
Expand Down Expand Up @@ -197,6 +201,11 @@ export class Loader {
*/
mapIds: string[];

/**
* See [[LoaderOptions.nonce]]
*/
nonce: string | null;

/**
* See [[LoaderOptions.url]]
*/
Expand Down Expand Up @@ -225,6 +234,7 @@ export class Loader {
region,
version,
mapIds,
nonce,
url = "https://maps.googleapis.com/maps/api/js",
}: LoaderOptions) {
this.version = version;
Expand All @@ -234,6 +244,7 @@ export class Loader {
this.language = language;
this.region = region;
this.mapIds = mapIds;
this.nonce = nonce;
this.url = url;
}
/**
Expand Down Expand Up @@ -311,9 +322,9 @@ export class Loader {
private setScript(): void {
if (this.id && document.getElementById(this.id)) {
this.callback();
return;
return;
}

const url = this.createUrl();
const script = document.createElement("script");
script.id = this.id;
Expand All @@ -322,6 +333,11 @@ export class Loader {
script.onerror = this.loadErrorCallback.bind(this);
script.defer = true;
script.async = true;

if (this.nonce) {
script.nonce = this.nonce;
}

document.head.appendChild(script);
}

Expand Down