krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-13 04:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(apple auth): add needed env var to client and encode redirect url

Browse Source
This commit is contained in:
Matteo Pagliazzi
2020-04-18 17:41:25 +02:00
parent 9f9da5632d
commit 2d9715b657
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -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

2
website/client/src/libs/auth.js
View File

@@ -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}`;
}