diff --git a/.github/workflows/main-forestgeo-livesite.yml b/.github/workflows/main-forestgeo-livesite.yml index f7282c72..e0d4e64a 100644 --- a/.github/workflows/main-forestgeo-livesite.yml +++ b/.github/workflows/main-forestgeo-livesite.yml @@ -40,7 +40,6 @@ jobs: echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env - echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env @@ -60,12 +59,11 @@ jobs: if: startsWith(github.ref, 'refs/heads/forestgeo-app-') run: | touch frontend/.env - echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_SECRET }} >> frontend/.env - echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_CLIENT_ID }} >> frontend/.env - echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_DEVELOPMENT_TENANT_ID }} >> frontend/.env - echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env + echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env + echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env + echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env - echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_DEV_URL }} >> frontend/.env + echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env echo AZURE_SQL_PASSWORD=${{ secrets.AZURE_SQL_PASSWORD }} >> frontend/.env echo AZURE_SQL_SERVER=${{ secrets.AZURE_SQL_SERVER }} >> frontend/.env diff --git a/frontend/next.config.js b/frontend/next.config.js index 58e4ade1..a22039ef 100644 --- a/frontend/next.config.js +++ b/frontend/next.config.js @@ -33,9 +33,6 @@ const nextConfig = withBundleAnalyzer({ FG_PAT: process.env.FG_PAT, OWNER: process.env.OWNER, REPO: process.env.REPO, - AZURE_AD_CLIENT_SECRET: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_CLIENT_SECRET : process.env.AZURE_AD_DEVELOPMENT_CLIENT_SECRET, - AZURE_AD_CLIENT_ID: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_CLIENT_ID : process.env.AZURE_AD_DEVELOPMENT_CLIENT_ID, - AZURE_AD_TENANT_ID: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_TENANT_ID : process.env.AZURE_AD_DEVELOPMENT_TENANT_ID, } });