merge

apps/betterangels-backend/.env

@@ -6,4 +6,4 @@ SOCIALACCOUNT_GOOGLE_CLIENT_ID="488261458560-ign54eicotm281qll13vi7gq7ps4ga3h.ap
 SOCIALACCOUNT_GOOGLE_SECRET="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"
 
 TRUSTED_ORIGINS=http://localhost:8081
-CORS_ALLOW_ALL_ORIGINS=True
+CORS_ALLOW_ALL_ORIGINS=True

apps/betterangels-backend/accounts/serializers.py

@@ -16,6 +16,7 @@
     SocialLoginSerializer as DjRestAuthSocialLoginSerializer,
 )
 from django.contrib.auth import get_user_model
+from django.contrib.auth.models import User
 from django.http import HttpResponseBadRequest
 from django.utils.translation import gettext_lazy as _
 from requests.exceptions import HTTPError

apps/betterangels-backend/betterangels_backend/settings.py

@@ -71,12 +71,12 @@
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "corsheaders.middleware.CorsMiddleware",
 ]
 
 
@@ -228,4 +228,5 @@
 
 CORS_ALLOW_CREDENTIALS = True
 CSRF_TRUSTED_ORIGINS = env("TRUSTED_ORIGINS")
-CORS_ALLOW_ALL_ORIGINS = env("CORS_ALLOW_ALL_ORIGINS")
+# CORS_ALLOW_ALL_ORIGINS = env("CORS_ALLOW_ALL_ORIGINS")
+CORS_ALLOW_ALL_ORIGINS = True

apps/betterangels/.env

@@ -1,3 +1,3 @@
-EXPO_PUBLIC_API_URL=http://localhost:8000
+EXPO_PUBLIC_API_URL=http://127.0.0.1:8000
 EXPO_PUBLIC_CLIENT_ID=488261458560-ign54eicotm281qll13vi7gq7ps4ga3h.apps.googleusercontent.com
-EXPO_PUBLIC_REDIRECT_URL=http://localhost:8000/auth-redirect
+EXPO_PUBLIC_REDIRECT_URL=http://127.0.0.1:8000/auth-redirect

apps/betterangels/src/app/(tabs)/index.tsx

@@ -15,6 +15,11 @@ export default function TabOneScreen() {
     console.log(user);
   }
 
+  async function getUser() {
+    if (!user) return;
+    console.log(user);
+  }
+
   return (
     <View style={styles.container}>
       <Text style={styles.title}>Tab One: user id: {user?.id}</Text>