From 2d9715b6570a470f5a34e98a0a98e7354a9e04fc Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sat, 18 Apr 2020 17:41:25 +0200
Subject: [PATCH 1/2] fix(apple auth): add needed env var to client  and encode
 redirect url

---
 Dockerfile                      | 1 +
 website/client/src/libs/auth.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d07a2fc789..8106f5ecbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleu
 ENV LOGGLY_CLIENT_TOKEN ab5663bf-241f-4d14-8783-7d80db77089a
 ENV NODE_ENV production
 ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA
+ENV APPLE_AUTH_CLIENT_ID 9Q9SMRMCNN.com.habitrpg.ios.Habitica
 
 # Install global packages
 RUN npm install -g gulp-cli mocha
diff --git a/website/client/src/libs/auth.js b/website/client/src/libs/auth.js
index e85e085bbf..917812f545 100644
--- a/website/client/src/libs/auth.js
+++ b/website/client/src/libs/auth.js
@@ -23,6 +23,6 @@ export function setUpAxios (AUTH_SETTINGS) { // eslint-disable-line import/prefe
 }
 
 export function buildAppleAuthUrl () {
-  const redirectUrl = `${window.location.protocol}//${window.location.host}/api/v4/user/auth/apple`;
+  const redirectUrl = encodeURIComponent(`${window.location.protocol}//${window.location.host}/api/v4/user/auth/apple`);
   return `https://appleid.apple.com/auth/authorize?response_mode=form_post&scope=name%20email&response_type=code&version=2&redirect_uri=${redirectUrl}&client_id=${process.env.APPLE_AUTH_CLIENT_ID}`;
 }

From 27263e9b2f83c569421d0fb7fa6e98b7b940953b Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sat, 18 Apr 2020 17:41:40 +0200
Subject: [PATCH 2/2] 4.140.8

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59f2a686d6..f1b9aa5a27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.140.7",
+  "version": "4.140.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 355470ed6b..cd1b8807c2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.140.7",
+  "version": "4.140.8",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.9.0",