Skip to content

Commit

Permalink
Merge branch 'main' into improve-token-errors-handling
Browse files Browse the repository at this point in the history
  • Loading branch information
kirillplatonov committed Jul 2, 2024
2 parents d3ea9ac + 2661888 commit ac68e80
Show file tree
Hide file tree
Showing 25 changed files with 2 additions and 330 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Unreleased
----------
- ⚠️ [Breaking] Removes `ShopifyApp::JWTMiddleware`. Any existing app code relying on decoded JWT contents set from `request.env` should instead include the `WithShopifyIdToken` concern and call its respective methods. [#1861](https://github.com/Shopify/shopify_app/pull/1861)
- Handle scenario when invalid URI is passed to `sanitize_shop_domain` [#1852](https://github.com/Shopify/shopify_app/pull/1852)
- Remove references to old JS files during asset precompile [#1865](https://github.com/Shopify/shopify_app/pull/1865)
- Remove old translation keys for `enable_cookies_*`, `top_level_interaction_*` and `request_storage_access_*` [#1865](https://github.com/Shopify/shopify_app/pull/1865)
- Add invalid id token handling for `current_shopify_domain` method [#1868](https://github.com/Shopify/shopify_app/pull/1868)

22.2.1 (May 6,2024)
Expand Down
1 change: 0 additions & 1 deletion app/assets/images/storage_access.svg

This file was deleted.

18 changes: 0 additions & 18 deletions config/locales/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,3 @@ cs:
logged_out: Odhlášení proběhlo úspěšně
could_not_log_in: Nelze se přihlásit do obchodu Shopify
invalid_shop_url: Neplatná doména obchodu
enable_cookies_heading: Zapnout soubory cookie z aplikace %{app}
enable_cookies_body: Pokud chcete v Shopify používat aplikaci %{app}, musíte soubory
cookie v tomto prohlížeči povolit ručně.
enable_cookies_footer: Soubory cookie umožňují, aby vás aplikace ověřila pomocí
dočasného uchování preferencí a osobních údajů. Jejich platnost vyprší po 30 dnech.
enable_cookies_action: Povolit soubory cookie
top_level_interaction_heading: Váš prohlížeč potřebuje ověřit aplikaci %{app}
top_level_interaction_body: Váš prohlížeč vyžaduje, aby si od vás aplikace, jako
je %{app}, nejdřív vyžádaly přístup k souborům cookie, než je pro vás Shopify
otevře.
top_level_interaction_action: Pokračovat
request_storage_access_heading: Aplikace %{app} potřebuje získat přístup k souborům
cookie
request_storage_access_body: Tato aplikace vám umožní ověření prostřednictvím dočasného
uchování vašich osobních údajů. Pokud chcete používat tuto aplikaci, klikněte
na tlačítko Pokračovat a povolte soubory cookie.
request_storage_access_footer: Platnost souborů cookie vyprší po 30 dnech.
request_storage_access_action: Pokračovat
15 changes: 0 additions & 15 deletions config/locales/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,3 @@ da:
logged_out: Logget ud
could_not_log_in: Kunne ikke logge ind på Shopify-butik
invalid_shop_url: Ugyldig butiksdomæne
enable_cookies_heading: Aktivér cookies fra %{app}
enable_cookies_body: Du skal manuelt aktivere cookies i denne browser for at kunne
bruge %{app} i Shopify.
enable_cookies_footer: Cookies lader appen godkende dig ved at gemme dine præferencer
og personlige oplysninger midlertidigt. De udløber efter 30 dage.
enable_cookies_action: Aktivér cookies
top_level_interaction_heading: Din browser skal godkende %{app}
top_level_interaction_body: Din browser kræver, at apps som f.eks. %{app} spørger
dig om adgang til cookies, inden Shopify kan åbne den for dig.
top_level_interaction_action: Fortsæt
request_storage_access_heading: "%{app} skal have adgang til cookies"
request_storage_access_body: Det lader appen godkende dig ved at gemme dine personlige
oplysninger midlertidigt. Klik på forsæt, og tillad cookies for at bruge appen.
request_storage_access_footer: Cookies udløber efter 30 dage.
request_storage_access_action: Fortsæt
17 changes: 0 additions & 17 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,3 @@ de:
logged_out: Erfolgreich ausgelogt
could_not_log_in: Shopify Store Login fehlgeschlagen
invalid_shop_url: Ungültige Shop-Domain
enable_cookies_heading: Cookies von %{app} aktivieren
enable_cookies_body: Du musst Cookies in diesem Browser manuell aktivieren, um %{app}
in Shopify verwenden zu können.
enable_cookies_footer: Mithilfe von Cookies kann die App dich authentifizieren,
indem deine Einstellungen und personenbezogenen Daten vorübergehend gespeichert
werden. Sie laufen nach 30 Tagen ab.
enable_cookies_action: Cookies aktivieren
top_level_interaction_heading: Dein Browser muss %{app} authentifizieren
top_level_interaction_body: Dein Browser verlangt, dass Apps wie %{app} dich um
Zugriff auf Cookies bitten, bevor Shopify sie für dich öffnen kann.
top_level_interaction_action: Weiter
request_storage_access_heading: "%{app} braucht Zugriff auf Cookies"
request_storage_access_body: Damit kann die App dich authentifizieren, indem deine
Einstellungen und personenbezogenen Daten vorübergehend gespeichert werden. Klicke
auf "Weiter" und erlaube Cookies, um die App zu verwenden.
request_storage_access_footer: Cookies laufen nach 30 Tagen ab.
request_storage_access_action: Weiter
11 changes: 0 additions & 11 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,3 @@ en:
logged_out: 'Successfully logged out'
could_not_log_in: 'Could not log in to Shopify store'
invalid_shop_url: 'Invalid shop domain'
enable_cookies_heading: "Enable cookies from %{app}"
enable_cookies_body: "You must manually enable cookies in this browser in order to use %{app} within Shopify."
enable_cookies_footer: 'Cookies let the app authenticate you by temporarily storing your preferences and personal information. They expire after 30 days.'
enable_cookies_action: 'Enable cookies'
top_level_interaction_heading: "Your browser needs to authenticate %{app}"
top_level_interaction_body: "Your browser requires apps like %{app} to ask you for access to cookies before Shopify can open it for you."
top_level_interaction_action: 'Continue'
request_storage_access_heading: "%{app} needs access to cookies"
request_storage_access_body: "This lets the app authenticate you by temporarily storing your personal information. Click continue and allow cookies to use the app."
request_storage_access_footer: 'Cookies expire after 30 days.'
request_storage_access_action: 'Continue'
17 changes: 0 additions & 17 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,3 @@ es:
logged_out: Cerrar sesión
could_not_log_in: No se pudo iniciar sesión en tu tienda Shopify
invalid_shop_url: Dominio de tienda inválido
enable_cookies_heading: Habilitar cookies de %{app}
enable_cookies_body: Debes habilitar manualmente las cookies en este navegador para
usar %{app} en Shopify.
enable_cookies_footer: Las cookies permiten que la aplicación te autentique almacenando
temporalmente tus preferencias y datos personales. Las cookies expiran al cabo
de 30 días.
enable_cookies_action: Habilitar cookies
top_level_interaction_heading: Tu navegador necesita autenticar %{app}
top_level_interaction_body: Tu navegador requiere aplicaciones como %{app} para
solicitarte acceso a cookies antes de que Shopify pueda abrirlo por ti.
top_level_interaction_action: Continuar
request_storage_access_heading: "%{app} necesita acceso a las cookies"
request_storage_access_body: Esto permite que la aplicación te autentique almacenando
temporalmente tus datos personales. Haz clic en continuar y permite que las cookies
utilicen la aplicación.
request_storage_access_footer: Las cookies expiran a los 30 días.
request_storage_access_action: Continuar
15 changes: 0 additions & 15 deletions config/locales/fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,3 @@ fi:
logged_out: Olet kirjautunut ulos
could_not_log_in: Kirjautuminen Shopify-kauppaan ei onnistunut
invalid_shop_url: Virheellinen kaupan verkkotunnus
enable_cookies_heading: Ota käyttöön sovelluksen %{app} evästeet
enable_cookies_body: Sinun on otettava evästeet käyttöön manuaalisesti tässä selaimessa,
jotta voit käyttää sovellusta %{app} Shopifyssa.
enable_cookies_footer: Evästeiden avulla sovellus voi todentaa sinut tallentamalla
asetuksesi ja henkilötietosi tilapäisesti. Ne vanhenevat 30 päivän kuluttua.
enable_cookies_action: Ota evästeet käyttöön
top_level_interaction_heading: Selaimesi täytyy todentaa %{app}
top_level_interaction_body: Selaimesi vaatii sovelluksia, kuten %{app}, pyytämään
sinulta luvan evästeiden käyttöön, ennen kuin Shopify voi avata sovelluksen.
top_level_interaction_action: Jatka
request_storage_access_heading: "%{app} edellyttää evästeiden käyttöä"
request_storage_access_body: Näin sovellus voi todentaa sinut tallentamalla henkilötietosi
tilapäisesti. Klikkaa Jatka ja salli evästeet sovelluksen käyttämiseksi.
request_storage_access_footer: Evästeet vanhenevat 30 päivän kuluttua.
request_storage_access_action: Jatka
18 changes: 0 additions & 18 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,3 @@ fr:
logged_out: Vous êtes déconnecté(e)
could_not_log_in: Impossible de se connecter à la boutique Shopify
invalid_shop_url: Url invalide
enable_cookies_heading: Activer les cookies de %{app}
enable_cookies_body: Vous devez manuellement activer les cookies dans ce navigateur
pour utiliser %{app} dans Shopify.
enable_cookies_footer: Les cookies permettent à l'application de vous authentifier
en stockant temporairement vos préférences et informations personnelles. Celles-ci
expirent après 30 jours.
enable_cookies_action: Activer les cookies
top_level_interaction_heading: Votre navigateur doit s'authentifier %{app}
top_level_interaction_body: Votre navigateur nécessite des applications telles que
%{app} pour vous demander l'accès aux cookies avant que Shopify ne puisse l'ouvrir
pour vous.
top_level_interaction_action: Continuer
request_storage_access_heading: "%{app} a besoin d'accéder aux cookies"
request_storage_access_body: Cela permet à l'application de vous authentifier en
stockant temporairement vos informations personnelles. Cliquez pour continuer
et autorisez les cookies à utiliser l'application.
request_storage_access_footer: Les cookies expirent après 30 jours.
request_storage_access_action: Continuer
16 changes: 0 additions & 16 deletions config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@ it:
logged_out: Disconnessione effettuata correttamente
could_not_log_in: Impossibile accedere al negozio Shopify
invalid_shop_url: Dominio negozio non valido
enable_cookies_heading: Abilita i cookie di %{app}
enable_cookies_body: Devi abilitare manualmente i cookie in questo browser per poter
utilizzare %{app} da Shopify.
enable_cookies_footer: I cookie consentono all'app di autenticarti memorizzando
temporaneamente le tue preferenze e informazioni personali. Scadono dopo 30 giorni.
enable_cookies_action: Abilita i cookie
top_level_interaction_heading: Il tuo browser deve autenticare %{app}
top_level_interaction_body: Il tuo browser richiede che app come %{app} ti chiedano
l'accesso ai cookie prima dell'apertura automatica da parte di Shopify.
top_level_interaction_action: Continua
request_storage_access_heading: "%{app} deve accedere ai cookie"
request_storage_access_body: L'app potrà così autenticarti memorizzando temporaneamente
le tue informazioni personali. Clicca su Continua e consenti ai cookie di utilizzare
l'app.
request_storage_access_footer: I cookie scadono dopo 30 giorni.
request_storage_access_action: Continua
12 changes: 0 additions & 12 deletions config/locales/ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,3 @@ ja:
logged_out: ログアウトに成功しました
could_not_log_in: Shopifyストアにログインできませんでした
invalid_shop_url: ショップのドメインが無効です
enable_cookies_heading: "%{app}からのCookieを有効にする"
enable_cookies_body: Shopifyで%{app}を使用できるようにするためには、このブラウザのCookieを手動で有効にする必要があります。
enable_cookies_footer: Cookieを使用すると、各種設定や個人情報を一時的に保存することで、アプリ認証を受けることができます。30日後に有効期限が切れます。
enable_cookies_action: Cookieを有効にする
top_level_interaction_heading: お使いのブラウザを更新する必要があります%{app}
top_level_interaction_body: Shopifyがアプリを開けるように、ブラウザはCookieにアクセスするための%{app}のようなアプリが必要です。
top_level_interaction_action: 続ける
request_storage_access_heading: "%{app}はCookieへのアクセス許可が必要です"
request_storage_access_body: Cookieを使用すると、個人情報を一時的に保存することで、アプリ認証を受けることができます。[続ける]
をクリックすると、アプリはCookieを利用します。
request_storage_access_footer: Cookieは30日後に有効期限が切れます。
request_storage_access_action: 続ける
14 changes: 0 additions & 14 deletions config/locales/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,3 @@ ko:
logged_out: 성공적으로 로그아웃 되었습니다.
could_not_log_in: Shopify 스토어에 로그인할 수 없습니다.
invalid_shop_url: 유효하지 않은 상점 도메인
enable_cookies_heading: "%{app}에서 쿠키를 사용 가능"
enable_cookies_body: Shopify 내에서 %{app} 을 사용하기 위해 이 브라우저에서 쿠키를 수동으로 사용할 수 있습니다.
enable_cookies_footer: 쿠키를 사용하면 개인의 선호나 정보를 임시로 저장하여 앱에서 사용자를 인증할 수 있습니다. 쿠키는 30일
후에 만료됩니다.
enable_cookies_action: 쿠리 사용 가능
top_level_interaction_heading: 브라우저에서 %{app} 을 인증해야 합니다.
top_level_interaction_body: Shopify를 열기 전 쿠키에 엑세스하려면 %{app} 과 같은 앱 들이 브라우저에 설치되어야
합니다.
top_level_interaction_action: 계속
request_storage_access_heading: "%{app}에서 쿠키에 접근해야 합니다."
request_storage_access_body: 이를 통해 개인 정보를 임시로 저장하여 앱에서 사용자를 인증할 수 있습니다. 계속 클릭하여
쿠키로 앱을 사용하세요.
request_storage_access_footer: 쿠키는 30일 후에 만료됩니다.
request_storage_access_action: 계속
16 changes: 0 additions & 16 deletions config/locales/nb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@ nb:
logged_out: Logget ut
could_not_log_in: Kunne ikke logge på Shopify-butikken
invalid_shop_url: Ugyldig butikkdomene
enable_cookies_heading: Aktiver informasjonskapsler fra %{app}
enable_cookies_body: Du kan manuelt aktivere informasjonskapsler i denne nettleseren
for å kunne bruke %{app} i Shopify.
enable_cookies_footer: Informasjonskapsler lar appen autentisere deg ved å midlertidig
lagre innstillingene og personopplysningene dine. De går ut etter 30 dager.
enable_cookies_action: Aktiver informasjonskapsler
top_level_interaction_heading: Nettleseren din må autentisere %{app}
top_level_interaction_body: Nettleseren din krever apper som %{app} for å spørre
deg om tilgang til informasjonskapsler før Shopify kan åpne den for deg.
top_level_interaction_action: Fortsett
request_storage_access_heading: "%{app} må ha tilgang til informasjonskapsler"
request_storage_access_body: Informasjonskapsler lar appen autentisere deg ved å
midlertidig lagre personopplysningene dine. Klikk på Fortsett og gi informasjonskapsler
tillatelse til å bruke appen.
request_storage_access_footer: Informasjonskapslene går ut etter 30 dager.
request_storage_access_action: Fortsett
16 changes: 0 additions & 16 deletions config/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@ nl:
logged_out: Je bent afgemeld
could_not_log_in: Kon niet inloggen bij Shopify-winkel
invalid_shop_url: Ongeldig winkeldomein
enable_cookies_heading: Schakel cookies in van %{app}
enable_cookies_body: Je moet cookies in deze browser handmatig inschakelen om %{app}
binnen Shopify te gebruiken.
enable_cookies_footer: Met cookies kan de app je verifiëren door je voorkeuren en
persoonlijke informatie tijdelijk op te slaan. Ze vervallen na 30 dagen.
enable_cookies_action: Schakel cookies in
top_level_interaction_heading: Je browser moet %{app} verifiëren
top_level_interaction_body: Je browser heeft apps nodig zoals %{app} om je toegang
te vragen tot cookies voordat Shopify het voor je kan openen.
top_level_interaction_action: Doorgaan
request_storage_access_heading: "%{app} heeft toegang tot cookies nodig"
request_storage_access_body: Hiermee kan de app je verifiëren door je persoonlijke
gegevens tijdelijk op te slaan. Klik op Doorgaan en sta cookies toe om de app
te gebruiken.
request_storage_access_footer: Cookies verlopen na 30 dagen.
request_storage_access_action: Doorgaan
16 changes: 0 additions & 16 deletions config/locales/pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@ pl:
logged_out: Pomyślne wylogowanie
could_not_log_in: Nie można zalogować się do sklepu Shopify
invalid_shop_url: Nieprawidłowa domena sklepu
enable_cookies_heading: Włącz korzystanie z plików cookie z %{app}
enable_cookies_body: Aby móc korzystać z %{app} w Shopify, musisz ręcznie włączyć
korzystanie z plików cookie w tej przeglądarce.
enable_cookies_footer: Pliki cookie umożliwiają uwierzytelnianie aplikacji przez
tymczasowe przechowywanie preferencji i danych osobowych. Wygasają one po 30 dniach.
enable_cookies_action: Włącz korzystanie z plików cookie
top_level_interaction_heading: Twoja przeglądarka wymaga uwierzytelnienia %{app}
top_level_interaction_body: Twoja przeglądarka wymaga takich aplikacji jak %{app},
aby poprosić o dostęp do plików cookie, zanim Shopify będzie mógł ją otworzyć.
top_level_interaction_action: Kontynuuj
request_storage_access_heading: "%{app} potrzebuje dostępu do plików cookie"
request_storage_access_body: Dzięki temu aplikacja może Cię uwierzytelniać, tymczasowo,
przechowując Twoje dane osobowe. Kliknij przycisk Kontynuuj i zezwalaj na pliki
cookie, aby korzystać z aplikacji.
request_storage_access_footer: Pliki cookie wygasają po 30 dniach.
request_storage_access_action: Kontynuuj
16 changes: 0 additions & 16 deletions config/locales/pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,3 @@ pt-BR:
logged_out: Você saiu.
could_not_log_in: Não foi possível fazer login na Shopify store
invalid_shop_url: Domínio de loja inválido
enable_cookies_heading: Habilitar cookies de %{app}
enable_cookies_body: Você precisa habilitar manualmente os cookies neste navegador
para usar %{app} dentro da Shopify.
enable_cookies_footer: Os cookies permitem que o app o autentique armazenando temporariamente
suas preferências e dados pessoais. Eles expiram depois de 30 dias.
enable_cookies_action: Habilitar cookies
top_level_interaction_heading: Seu navegador precisa autenticar %{app}
top_level_interaction_body: Seu navegador exige que apps como o %{app} consultem
você sobre o acesso a cookies antes que a Shopify os abra.
top_level_interaction_action: Continuar
request_storage_access_heading: "%{app} precisa acessar cookies"
request_storage_access_body: Isso permite que o app autentique você armazenando
temporariamente seus dados pessoais. Clique em continuar e permita os cookies
para usar o app.
request_storage_access_footer: Os cookies expiram depois de 30 dias.
request_storage_access_action: Continuar
Loading

0 comments on commit ac68e80

Please sign in to comment.