Ignore:
Timestamp:
09/14/26 21:15:01 (9 days ago)
Author:
Stefan-Saveski <stefansaveski19@…>
Branches:
master
Children:
93c368a
Parents:
ff7f308 (diff), ce1f8d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/Dev'

# Conflicts:
# iknow-api/Controllers/AuthController.cs
# iknow-api/DTOs/RefreshTokenDTO.cs
# iknow-api/DTOs/UserDTO.cs
# iknow-api/Data/AppDbContext.cs
# iknow-api/Migrations/AppDbContextModelSnapshot.cs
# iknow-api/Models/RefreshToken.cs
# iknow-api/Models/User.cs
# iknow-api/Program.cs
# iknow-api/Repository/Implementations/UserRepository.cs
# iknow-api/Repository/Interface/IUserRepository.cs
# iknow-api/Services/Implementations/AuthService.cs
# iknow-api/Services/Interfaces/IAuthService.cs
# iknow-api/appsettings.Development.json
# iknow-api/appsettings.json

File:
1 edited

Legend:

Unmodified
Added
Removed

  • iknow-api/appsettings.json

    rff7f308 rdced479  
    66    }
    77  },
    8   "AllowedHosts": "*"
     8  "AllowedOrigins": [
     9    "http://localhost:3000",
     10    "https://iknow-remaster.vercel.app"
     11  ],
     12  "ConnectionStrings": {
     13    "DefaultConnection": "Host=ep-divine-term-aghfotgc-pooler.c-2.eu-central-1.aws.neon.tech; Database=neondb; Username=neondb_owner; Password=REDACTED_ROTATE_ME; SSL Mode=VerifyFull; Channel Binding=Require;"
     14  },
     15  "Jwt": {
     16    "Key": "REDACTED_SET_VIA_USER_SECRETS"
     17  }
    918}
Note: See TracChangeset for help on using the changeset viewer.