pwa-auth 3.8.0 → 3.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/base/firebase/message.d.ts.map +1 -1
- package/base/firebase/message.js +1 -0
- package/base/firebase/message.js.map +1 -1
- package/base/webcomponents/settings/input/uploader.d.ts.map +1 -1
- package/base/webcomponents/settings/input/uploader.js +45 -20
- package/base/webcomponents/settings/input/uploader.js.map +1 -1
- package/docs/google-sign-in-safari.md +120 -0
- package/package.json +2 -1
- package/source/pwa-auth.js +11 -11
package/README.md
CHANGED
|
@@ -210,6 +210,8 @@ initialize({
|
|
|
210
210
|
|
|
211
211
|
Use one of these. Once Firebase is connected, another one leaves it as it is.
|
|
212
212
|
|
|
213
|
+
On iPhone Safari, Google sign-in needs your own domain as `authDomain`. [Google sign-in on iPhone and Safari](docs/google-sign-in-safari.md).
|
|
214
|
+
|
|
213
215
|
## License
|
|
214
216
|
|
|
215
217
|
MIT. See [license](license). Third-party notices are in [LICENSES.txt](LICENSES.txt).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../typescript/firebase/message.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../typescript/firebase/message.ts"],"names":[],"mappings":"AAqCA,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAGlD"}
|
package/base/firebase/message.js
CHANGED
|
@@ -29,6 +29,7 @@ const known = {
|
|
|
29
29
|
'pwa/not-image': 'Choose an image file.',
|
|
30
30
|
'pwa/photo-too-large': 'Choose an image under 5 MB.',
|
|
31
31
|
'pwa/photo-unreadable': 'That image could not be prepared. Try another.',
|
|
32
|
+
'pwa/photo-still-large': 'That photo is still over 500 KB. Try another.',
|
|
32
33
|
'pwa/not-ready': 'Sign-in is not ready yet.',
|
|
33
34
|
'pwa/unknown': 'Something went wrong. Try again.'
|
|
34
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../typescript/firebase/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9E,uEAAuE;AACvE,MAAM,KAAK,GAA2B;IACpC,oBAAoB,EAAY,8BAA8B;IAC9D,qBAAqB,EAAW,6BAA6B;IAC7D,qBAAqB,EAAW,yBAAyB;IACzD,yBAAyB,EAAO,kCAAkC;IAClE,gCAAgC,EAAE,kCAAkC;IACpE,yBAAyB,EAAO,sCAAsC;IACtE,yBAAyB,EAAO,sCAAsC;IACtE,oBAAoB,EAAY,2BAA2B;IAC3D,2BAA2B,EAAK,qCAAqC;IACrE,+CAA+C,EAAE,qEAAqE;IACtH,oBAAoB,EAAY,aAAa;IAC7C,wBAAwB,EAAQ,qCAAqC;IACrE,6BAA6B,EAAG,6BAA6B;IAC7D,4BAA4B,EAAI,4BAA4B;IAC5D,mBAAmB,EAAa,yBAAyB;IACzD,mBAAmB,EAAa,8BAA8B;IAC9D,sBAAsB,EAAU,mBAAmB;IACnD,oBAAoB,EAAY,aAAa;IAC7C,mBAAmB,EAAa,YAAY;IAC5C,sBAAsB,EAAU,8BAA8B;IAC9D,uBAAuB,EAAS,gBAAgB;IAChD,mBAAmB,EAAa,aAAa;IAC7C,gBAAgB,EAAgB,gBAAgB;IAChD,kBAAkB,EAAc,uBAAuB;IACvD,eAAe,EAAiB,uBAAuB;IACvD,qBAAqB,EAAW,6BAA6B;IAC7D,sBAAsB,EAAU,gDAAgD;IAChF,eAAe,EAAiB,2BAA2B;IAC3D,aAAa,EAAmB,kCAAkC;CACnE,CAAC;AAEF,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,kCAAkC,CAAC;AAClE,CAAC"}
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../typescript/firebase/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9E,uEAAuE;AACvE,MAAM,KAAK,GAA2B;IACpC,oBAAoB,EAAY,8BAA8B;IAC9D,qBAAqB,EAAW,6BAA6B;IAC7D,qBAAqB,EAAW,yBAAyB;IACzD,yBAAyB,EAAO,kCAAkC;IAClE,gCAAgC,EAAE,kCAAkC;IACpE,yBAAyB,EAAO,sCAAsC;IACtE,yBAAyB,EAAO,sCAAsC;IACtE,oBAAoB,EAAY,2BAA2B;IAC3D,2BAA2B,EAAK,qCAAqC;IACrE,+CAA+C,EAAE,qEAAqE;IACtH,oBAAoB,EAAY,aAAa;IAC7C,wBAAwB,EAAQ,qCAAqC;IACrE,6BAA6B,EAAG,6BAA6B;IAC7D,4BAA4B,EAAI,4BAA4B;IAC5D,mBAAmB,EAAa,yBAAyB;IACzD,mBAAmB,EAAa,8BAA8B;IAC9D,sBAAsB,EAAU,mBAAmB;IACnD,oBAAoB,EAAY,aAAa;IAC7C,mBAAmB,EAAa,YAAY;IAC5C,sBAAsB,EAAU,8BAA8B;IAC9D,uBAAuB,EAAS,gBAAgB;IAChD,mBAAmB,EAAa,aAAa;IAC7C,gBAAgB,EAAgB,gBAAgB;IAChD,kBAAkB,EAAc,uBAAuB;IACvD,eAAe,EAAiB,uBAAuB;IACvD,qBAAqB,EAAW,6BAA6B;IAC7D,sBAAsB,EAAU,gDAAgD;IAChF,uBAAuB,EAAS,+CAA+C;IAC/E,eAAe,EAAiB,2BAA2B;IAC3D,aAAa,EAAmB,kCAAkC;CACnE,CAAC;AAEF,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,KAAc;IACxC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,kCAAkC,CAAC;AAClE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../../typescript/webcomponents/settings/input/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,cAAc,EAAE,MAAQ,KAAK,CAAC;AAE9D,OAAO,EAAS,QAAQ,EAAE,MAAe,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../../typescript/webcomponents/settings/input/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,cAAc,EAAE,MAAQ,KAAK,CAAC;AAE9D,OAAO,EAAS,QAAQ,EAAE,MAAe,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;AA4G7D,qBAAa,YAAa,SAAQ,iBAA0B;IAE1D,kBAAkB;IACC,KAAK,EAAG,MAAM,GAAG,IAAI,GAAG,GAAG,CAAM;IAEpD,yBAAyB;IACuB,YAAY,SAAM;IAEzD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,IAAI,CAAS;IAE9B,OAAO,CAAC,QAAQ,CAA6B;;IAMpC,iBAAiB,IAAI,IAAI;IAiBzB,oBAAoB,IAAI,IAAI;IAMrC,YAAY,CAAC,KAAK,EAAE,QAAQ;IAM5B,MAAM,KAAK,MAAM,IAAG,cAAc,CAqIjC;IAED,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,WAAW;IAKnB,SAAS,CAAC,MAAM;IAsDhB,OAAO,CAAC,IAAI;IASZ,OAAO,CAAC,SAAS,CAiHhB;IAED,OAAO,CAAC,UAAU,CA4BjB;CAEF;AAID,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC3B,eAAe,EAAE,YAAY,CAAC;KACjC;CACF"}
|
|
@@ -25,8 +25,11 @@ import { userMessage } from '../../../firebase/message.js';
|
|
|
25
25
|
const maxPhotoBytes = 5 * 1024 * 1024;
|
|
26
26
|
/** Required - longest side stored. A smaller original is not enlarged. */
|
|
27
27
|
const maxPhotoEdge = 1024;
|
|
28
|
-
/** Required -
|
|
29
|
-
const
|
|
28
|
+
/** Required - Storage refuses a file of 500 KB or larger. The first encode is 0.8. */
|
|
29
|
+
const outputLimit = 500 * 1024;
|
|
30
|
+
/** Required - try the first quality, then lower, then a shorter edge. */
|
|
31
|
+
const qualitySteps = [0.8, 0.72, 0.64, 0.56];
|
|
32
|
+
const edgeSteps = [1024, 800, 640];
|
|
30
33
|
/** Required - stable object. A new upload replaces this file instead of keeping the old name. */
|
|
31
34
|
function photoPath(uid) {
|
|
32
35
|
return 'pwa-auth/' + uid + '/photo';
|
|
@@ -40,20 +43,36 @@ function photoProblem(file) {
|
|
|
40
43
|
}
|
|
41
44
|
return null;
|
|
42
45
|
}
|
|
43
|
-
function fittedSize(width, height) {
|
|
46
|
+
function fittedSize(width, height, edge = maxPhotoEdge) {
|
|
44
47
|
const longest = Math.max(width, height);
|
|
45
|
-
if (!(longest >
|
|
48
|
+
if (!(longest > edge)) {
|
|
46
49
|
return {
|
|
47
50
|
width: Math.max(1, Math.round(width)),
|
|
48
51
|
height: Math.max(1, Math.round(height))
|
|
49
52
|
};
|
|
50
53
|
}
|
|
51
|
-
const scale =
|
|
54
|
+
const scale = edge / longest;
|
|
52
55
|
return {
|
|
53
56
|
width: Math.max(1, Math.round(width * scale)),
|
|
54
57
|
height: Math.max(1, Math.round(height * scale))
|
|
55
58
|
};
|
|
56
59
|
}
|
|
60
|
+
class PhotoStillLarge extends Error {
|
|
61
|
+
constructor() {
|
|
62
|
+
super('photo-still-large');
|
|
63
|
+
this.name = 'PhotoStillLarge';
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
function jpegBlob(canvas, quality) {
|
|
67
|
+
return new Promise((resolve, reject) => {
|
|
68
|
+
canvas.toBlob((result) => {
|
|
69
|
+
if (result)
|
|
70
|
+
resolve(result);
|
|
71
|
+
else
|
|
72
|
+
reject(new Error('no jpeg'));
|
|
73
|
+
}, 'image/jpeg', quality);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
57
76
|
/** Required - EXIF orientation comes from the decoder. No orientation library. */
|
|
58
77
|
async function openBitmap(file) {
|
|
59
78
|
try {
|
|
@@ -68,20 +87,22 @@ async function shrinkPhoto(file) {
|
|
|
68
87
|
try {
|
|
69
88
|
if (bitmap.width < 1 || bitmap.height < 1)
|
|
70
89
|
throw new Error('empty image');
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
90
|
+
for (const edge of edgeSteps) {
|
|
91
|
+
const size = fittedSize(bitmap.width, bitmap.height, edge);
|
|
92
|
+
const canvas = document.createElement('canvas');
|
|
93
|
+
canvas.width = size.width;
|
|
94
|
+
canvas.height = size.height;
|
|
95
|
+
const context = canvas.getContext('2d');
|
|
96
|
+
if (!context)
|
|
97
|
+
throw new Error('no canvas');
|
|
98
|
+
context.drawImage(bitmap, 0, 0, size.width, size.height);
|
|
99
|
+
for (const quality of qualitySteps) {
|
|
100
|
+
const blob = await jpegBlob(canvas, quality);
|
|
101
|
+
if (blob.size < outputLimit)
|
|
102
|
+
return blob;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
throw new PhotoStillLarge();
|
|
85
106
|
}
|
|
86
107
|
finally {
|
|
87
108
|
bitmap.close();
|
|
@@ -132,10 +153,14 @@ export class ContactPhoto extends connect(store)(LitElement) {
|
|
|
132
153
|
try {
|
|
133
154
|
prepared = await shrinkPhoto(file);
|
|
134
155
|
}
|
|
135
|
-
catch {
|
|
156
|
+
catch (error) {
|
|
136
157
|
this.busy = false;
|
|
137
158
|
this.progress = 0;
|
|
138
159
|
this.resetPicker();
|
|
160
|
+
if (error instanceof PhotoStillLarge) {
|
|
161
|
+
this.fail({ code: 'pwa/photo-still-large', message: 'That photo is still over 500 KB. Try another.' });
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
139
164
|
this.fail({ code: 'pwa/photo-unreadable', message: 'That image could not be prepared. Try another.' });
|
|
140
165
|
return;
|
|
141
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../../typescript/webcomponents/settings/input/uploader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../../typescript/webcomponents/settings/input/uploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
# Google sign-in on iPhone and Safari (Firebase Auth PWAs)
|
|
2
|
+
|
|
3
|
+
This guide is for any Firebase Auth app. `<your-domain>` is the site people open. `<project-id>` is the Firebase project id. The same steps apply to `www.<your-domain>` when that host is in use.
|
|
4
|
+
|
|
5
|
+
## 1. Why
|
|
6
|
+
|
|
7
|
+
Safari's tracking prevention blocks the cross-site storage Firebase redirect sign-in uses. That storage lives on `authDomain`. When `authDomain` is `<project-id>.firebaseapp.com` and the app runs on `<your-domain>`, those are different sites. The person signs in at Google, comes back, and is signed out.
|
|
8
|
+
|
|
9
|
+
A desktop popup often stays on your origin, so the same setup can look fine there. iPhone Safari and a home-screen app leave the page and come back. They need the handler on `<your-domain>`.
|
|
10
|
+
|
|
11
|
+
## 2. Google Cloud: the web client
|
|
12
|
+
|
|
13
|
+
1. Open [APIs & Services, Credentials](https://console.cloud.google.com/apis/credentials).
|
|
14
|
+
2. Select the project for `<project-id>`.
|
|
15
|
+
3. Under OAuth 2.0 Client IDs, open the client whose Type is Web application. The name may vary.
|
|
16
|
+
4. Add an Authorized JavaScript origin: `https://<your-domain>`.
|
|
17
|
+
5. Add an Authorized redirect URI: `https://<your-domain>/__/auth/handler`.
|
|
18
|
+
6. Keep the existing `firebaseapp.com` origins and redirect URIs.
|
|
19
|
+
7. Save. Allow a few minutes.
|
|
20
|
+
|
|
21
|
+
Credentials is in the left menu. The Enabled APIs list is a different page.
|
|
22
|
+
|
|
23
|
+
## 3. Firebase: authorized domains
|
|
24
|
+
|
|
25
|
+
1. Open the Firebase console. Go to Authentication, then Settings, then Authorized domains.
|
|
26
|
+
2. Confirm `<your-domain>` is listed. Choose Add domain when it is missing.
|
|
27
|
+
|
|
28
|
+
Repeat sections 2 and 3 for `www.<your-domain>` when the site uses that host. The origin is `https://www.<your-domain>`. The redirect URI is `https://www.<your-domain>/__/auth/handler`.
|
|
29
|
+
|
|
30
|
+
## 4. Code
|
|
31
|
+
|
|
32
|
+
On the production domain, set `authDomain` to the page's own host. On localhost and on preview channels, keep `<project-id>.firebaseapp.com`.
|
|
33
|
+
|
|
34
|
+
Use `signInWithPopup` in a normal browser tab. Use `signInWithRedirect` and `getRedirectResult` in the installed standalone PWA. Detect that with `matchMedia('(display-mode: standalone)')` or `navigator.standalone`. When the popup fails with `auth/popup-blocked`, use the redirect.
|
|
35
|
+
|
|
36
|
+
```javascript
|
|
37
|
+
import {
|
|
38
|
+
GoogleAuthProvider,
|
|
39
|
+
getRedirectResult,
|
|
40
|
+
signInWithPopup,
|
|
41
|
+
signInWithRedirect
|
|
42
|
+
} from 'firebase/auth';
|
|
43
|
+
|
|
44
|
+
const host = location.hostname;
|
|
45
|
+
const preview = host === 'localhost'
|
|
46
|
+
|| host === '127.0.0.1'
|
|
47
|
+
|| host.endsWith('.firebaseapp.com')
|
|
48
|
+
|| host.endsWith('.web.app');
|
|
49
|
+
|
|
50
|
+
const authDomain = preview ? '<project-id>.firebaseapp.com' : host;
|
|
51
|
+
|
|
52
|
+
function installedApp() {
|
|
53
|
+
return window.matchMedia('(display-mode: standalone)').matches
|
|
54
|
+
|| navigator.standalone === true;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export async function signInWithGoogle(auth) {
|
|
58
|
+
const provider = new GoogleAuthProvider();
|
|
59
|
+
if (installedApp()) {
|
|
60
|
+
await signInWithRedirect(auth, provider);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
try {
|
|
64
|
+
await signInWithPopup(auth, provider);
|
|
65
|
+
} catch (error) {
|
|
66
|
+
if (error && error.code === 'auth/popup-blocked') {
|
|
67
|
+
await signInWithRedirect(auth, provider);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
throw error;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
// Call once after Auth is ready. A normal page load returns null.
|
|
75
|
+
export function resumeGoogleRedirect(auth) {
|
|
76
|
+
return getRedirectResult(auth);
|
|
77
|
+
}
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
Pass `authDomain` in the Firebase config the page already uses.
|
|
81
|
+
|
|
82
|
+
Keep the service worker from caching or rewriting `/__/auth` and `/__/firebase`. A worker that sends every navigation to `index.html` must leave those paths alone.
|
|
83
|
+
|
|
84
|
+
```javascript
|
|
85
|
+
self.addEventListener('fetch', (event) => {
|
|
86
|
+
const path = new URL(event.request.url).pathname;
|
|
87
|
+
if (path.startsWith('/__/auth') || path.startsWith('/__/firebase')) return;
|
|
88
|
+
// Cache and respond for the rest of the app.
|
|
89
|
+
});
|
|
90
|
+
```
|
|
91
|
+
|
|
92
|
+
Firebase Hosting serves `/__/auth/handler` on a connected custom domain. Another host proxies `/__/auth` and `/__/firebase` to `https://<project-id>.firebaseapp.com`. The proxy steps are in [Firebase's redirect best practices](https://firebase.google.com/docs/auth/web/redirect-best-practices).
|
|
93
|
+
|
|
94
|
+
## 5. Test after you deploy
|
|
95
|
+
|
|
96
|
+
Wait a few minutes after the console saves, then deploy the `authDomain` change.
|
|
97
|
+
|
|
98
|
+
1. iPhone Safari tab. Open `https://<your-domain>`, continue with Google, and come back signed in.
|
|
99
|
+
2. Home-screen icon. Open the installed app and sign in the same way.
|
|
100
|
+
3. Desktop Safari. The popup signs you in. When the browser blocks the popup, the redirect still returns you signed in.
|
|
101
|
+
|
|
102
|
+
## 6. Troubleshooting
|
|
103
|
+
|
|
104
|
+
| What you see | Fix |
|
|
105
|
+
| --- | --- |
|
|
106
|
+
| `redirect_uri_mismatch` | Add Authorized redirect URI `https://<your-domain>/__/auth/handler` on the Web application client. Include `www` when that host is in use. |
|
|
107
|
+
| `auth/unauthorized-domain` | Add `<your-domain>` under Firebase Authentication, Settings, Authorized domains. |
|
|
108
|
+
| Signed out after returning from Google | On the production page, `authDomain` is still `<project-id>.firebaseapp.com`, or a service worker is caching or rewriting `/__/auth`. |
|
|
109
|
+
|
|
110
|
+
## With pwa-auth
|
|
111
|
+
|
|
112
|
+
pwa-auth does not set `authDomain`. Pass the host from section 4 in `initialize({ config })`, in the `firebase-config` attribute, or in `window.process.env.FIREBASE_CONFIG`.
|
|
113
|
+
|
|
114
|
+
Continue with Google calls `signInWithGoogle` in `typescript/firebase/google.ts`.
|
|
115
|
+
|
|
116
|
+
- A phone user agent (iPhone, iPad, iPod, or Android) uses `signInWithRedirect`. That includes a normal iPhone Safari tab. The check is the user agent. It does not read `display-mode: standalone` or `navigator.standalone`.
|
|
117
|
+
- Any other browser uses `signInWithPopup`. `auth/popup-blocked` falls back to `signInWithRedirect`.
|
|
118
|
+
- `watchGoogleRedirect` calls `getRedirectResult` once, after `initialize` has an app.
|
|
119
|
+
|
|
120
|
+
The package does not register a service worker. Skip `/__/auth` and `/__/firebase` in the worker that ships with the page. An iPhone Safari tab in this package already uses the redirect, so sections 2–4 apply to that tab and to the home-screen icon.
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"url": "https://www.jackspublishing.com",
|
|
7
7
|
"email": "jack.solutionbox@gmail.com"
|
|
8
8
|
},
|
|
9
|
-
"version": "3.8.
|
|
9
|
+
"version": "3.8.1",
|
|
10
10
|
"description": "Five elements: user-icon, user-drawer, user-login, user-settings, and email-reset. pwa- events, a small API, and --pwa_ theme variables.",
|
|
11
11
|
"homepage": "https://pwa-authentic.firebaseapp.com",
|
|
12
12
|
"repository": {
|
|
@@ -91,6 +91,7 @@
|
|
|
91
91
|
"source/empty.jpg",
|
|
92
92
|
"README.md",
|
|
93
93
|
"docs/drawer-slide.md",
|
|
94
|
+
"docs/google-sign-in-safari.md",
|
|
94
95
|
"docs/sliders.md",
|
|
95
96
|
"license",
|
|
96
97
|
"LICENSES.txt"
|