Skip to content
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.

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

Check for auth origin before checking for host origin #64

Merged

Conversation

steelbrain
Copy link
Contributor

Fixes pwa-builder/PWABuilder#4564

This PR also contains trimming of extra whitespace as well as fixes for mixed spacing in the file, automatically by VSCode.

The main changeset here is that the checks for auth origin have been moved above host origin, rest is whitespace or rearranging. This is necessary because auth origin is often a superset of host origin, and is therefore always returning true on the first check, so users never see the modal view for auth.

@steelbrain
Copy link
Contributor Author

@microsoft-github-policy-service agree

@khmyznikov khmyznikov merged commit dba68cd into pwa-builder:main Feb 16, 2024
2 of 3 checks passed
khmyznikov added a commit that referenced this pull request Feb 16, 2024
commit dba68cd
Merge: 909bdd3 6ad7187
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 23:03:30 2024 +0100

    Merge pull request #64 from steelbrain/steelbrain/fix-auth-origin-check

    Check for auth origin before checking for host origin

commit 6ad7187
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 22:59:26 2024 +0100

    Update WebView.swift

commit b75972e
Merge: ba5c674 909bdd3
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 20:28:56 2024 +0100

    Merge branch 'main' into steelbrain/fix-auth-origin-check

commit 909bdd3
Merge: b19fdca 9c157c0
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 20:27:22 2024 +0100

    Merge pull request #63 from steelbrain/steelbrain/fix-typo

    Fix a minor typo in README

commit b19fdca
Merge: 2868264 4d557a6
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 20:27:01 2024 +0100

    Merge pull request #66 from pwa-builder/patch-referrer-property-name

    Patch: Fix typo in referrer property name

commit 2868264
Merge: c1596cf b4ca506
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 20:26:30 2024 +0100

    Merge pull request #65 from steelbrain/steelbrain/inspectable-locally

    Make PWA inspectable during dev

commit b4ca506
Author: Gleb Khmyznikov <[email protected]>
Date:   Fri Feb 16 20:25:50 2024 +0100

    Update WebView.swift

commit 4d557a6
Author: Zach Teutsch <[email protected]>
Date:   Wed Dec 13 19:53:01 2023 -0800

    Fix typo in referrer proprety name

commit 9bf47c3
Author: steelbrain <[email protected]>
Date:   Wed Dec 6 04:32:24 2023 +0200

    :new: Make webapp inspectable during dev

commit ba5c674
Author: steelbrain <[email protected]>
Date:   Tue Dec 5 23:32:50 2023 +0200

    :bug: Check for auth origin before checking for host origin

commit 9c157c0
Author: steelbrain <[email protected]>
Date:   Tue Dec 5 23:29:54 2023 +0200

    :bug: Fix a minor typo in README
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] iOS: Origin and auth origin conflict
2 participants