diff --git a/backend/server/server.go b/backend/server/server.go index 76bdf3a9..9cb952cb 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -58,7 +58,7 @@ func Init(db *gorm.DB, stores *store.Stores, integrations integrations.Integrati applicationURL := settings.Application.ApplicationURL() - msftProvider := msft.New(settings.Microsft.Key, fmt.Sprintf("%s/api/v1/auth/microsoftonline/callback", applicationURL), settings.Microsft.Tenant) + msftProvider := msft.New(settings.Microsft.Key, "myapp://auth/callback", settings.Microsft.Tenant) googProvider := goog.New(settings.Google.Key, settings.Google.Secret, fmt.Sprintf("%s/api/v1/auth/google/callback", applicationURL)) authMiddleware := authMiddleware.New( diff --git a/frontend/lib/package.json b/frontend/lib/package.json index d6006b1a..9b9af8d8 100644 --- a/frontend/lib/package.json +++ b/frontend/lib/package.json @@ -1,6 +1,6 @@ { "name": "@generatesac/lib", - "version": "0.0.179", + "version": "0.0.180", "type": "module", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/frontend/lib/src/api/base.ts b/frontend/lib/src/api/base.ts index a4dfb23a..1920a23f 100644 --- a/frontend/lib/src/api/base.ts +++ b/frontend/lib/src/api/base.ts @@ -1,11 +1,12 @@ import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react"; -export const API_BASE_URL = "http://127.0.0.1:8080/api/v1"; +export const LOCAL_API_BASE_URL = "http://localhost:3000/api/v1"; +export const PROD_API_BASE_URL = "https://studentactivitycalendar.xyz/api/v1"; // BaseAPI for the entire application: export const baseApi = createApi({ baseQuery: fetchBaseQuery({ - baseUrl: API_BASE_URL, + baseUrl: PROD_API_BASE_URL, credentials: "include", prepareHeaders: async (headers, { getState }) => { // User slice existing must exist in all dependent apps: