Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/deploy-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ jobs:
repository: musicfestival

- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@master
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: musicfestival
username: ${{ steps.ecr.outputs.username }}
password: ${{ steps.ecr.outputs.password }}
registry: musicfestivalacr.azurecr.io
workdir: samples/musicfestival-backend-dotnet
buildoptions: "--compress --force-rm"
tags: "latest"
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EPiServer.CMS" Version="12.22.4" />
<PackageReference Include="EPiServer.CMS" Version="12.23.0" />
<PackageReference Include="EPiServer.ContentDefinitionsApi" Version="3.9.0" />
<PackageReference Include="EPiServer.ContentDeliveryApi.Cms" Version="3.9.0" />
<PackageReference Include="EPiServer.ContentDeliveryApi.Core" Version="3.9.0" />
<PackageReference Include="EPiServer.ContentManagementApi" Version="3.9.0" />
<PackageReference Include="EPiServer.OpenIDConnect" Version="3.8.0" />
<PackageReference Include="EPiServer.OpenIDConnect.UI" Version="3.8.0" />
<PackageReference Include="EPiServer.OpenIDConnect" Version="3.9.0" />
<PackageReference Include="EPiServer.OpenIDConnect.UI" Version="3.9.0" />
<PackageReference Include="Optimizely.ContentGraph.Cms" Version="3.4.0" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion samples/musicfestival-backend-dotnet/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public void ConfigureServices(IServiceCollection services)
new Uri(baseUri, "/"),
new Uri(baseUri, "/login-callback"),
new Uri(baseUri, "/login-renewal"),
new Uri(baseUri, "/api/auth/callback/optimizely_cms"),
},
});

Expand Down Expand Up @@ -147,7 +148,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseStaticFiles();
app.UseRouting();
app.UseCors(b => b
.WithOrigins(new[] { $"{_frontendUri}" })
.WithOrigins(new[] { $"{_frontendUri}", "*" })
.WithExposedContentDeliveryApiHeaders()
.WithExposedContentDefinitionApiHeaders()
.WithHeaders("Authorization")
Expand Down
2 changes: 1 addition & 1 deletion samples/musicfestival-frontend-nextjs/.env.local
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NEXTAUTH_URL=http://localhost:3000/
AZURE_AD_CLIENT_ID=355bdf4f-d596-4db7-8efe-8e3bc24a3611
AZURE_AD_CLIENT_SECRET=dBo8Q~qaopwwO-O3gL_Hv58HQHTJ1faWPpFxudcl
AZURE_AD_CLIENT_SECRET=eOn8Q~KxYudVYDmBs6OYYb9xolWvv~I1LdB1nbSc
AZURE_AD_TENANT_ID=7c4a1b79-4b8e-4ac7-b7e1-c5c3c5a4c139
OKTA_CLIENT_ID=0oa7c6ejkpzJ0CtcS1d7
OKTA_ISSUER=https://prep.login.optimizely.com
Expand Down

This file was deleted.

11 changes: 6 additions & 5 deletions samples/musicfestival-frontend-nextjs/components/LoginBtn.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { Session } from "next-auth"
import { useSession, signIn, signOut } from "next-auth/react"

type ExtendedSession = Session & {
token: any
export type ExtendedSession = Session & {
token?: any
}

export default function Component() {
const { data: session } = useSession()
const { data: session, status } = useSession()
const extendedSession: ExtendedSession = session as ExtendedSession
if (extendedSession) {
if (extendedSession && status === "authenticated") {
const userName = extendedSession.token?.user?.name || extendedSession.token?.name
return (
<div className="btn">
<button onClick={() => signOut()}>{extendedSession.token?.token?.user?.name}</button>
<button onClick={() => signOut()}>{userName}</button>
</div>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ function LandingPage({ content }: LandingPageProps) {
(() => {
const contentItem = mainContentAreaItem?.ContentLink?.Expanded
if (contentItem?.__typename === "ImageFile") {
console.log('contentItem', contentItem?.Url)
return (
<div className="Grid-cell u-md-size1of2" key={mainContentAreaItemIdx}>
<div className="Page-container ImageFile">
Expand Down

This file was deleted.

Loading