noah/noahspan-flying
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Feature/33 api fails when no pilots or logbook entries #35

Merged
noahspannbauer merged 85 commits from feature/33-api-fails-when-no-pilots-or-logbook-entries into main 2025-02-02 18:24:48 -05:00
Conversation 0 Commits 85 Files Changed 97 +144 -58
6 changed files with 144 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f34810fa80 - Show all commits

BIN
.DS_Store vendored
View File

Binary file not shown.

72
app/src/components/siteNav/SiteNav.tsx
View File

@@ -43,8 +43,8 @@ const SiteNav: React.FC<unknown> = () => {
url: '/pilots'
}
];
const handleSignIn = async () => {
await instance.loginRedirect({
const handleSignIn = () => {
instance.loginRedirect({
scopes: [`api://${import.meta.env.VITE_CLIENT_ID}/user_impersonation`]
});
};
@@ -98,44 +98,44 @@ const SiteNav: React.FC<unknown> = () => {
);
};
useEffect(() => {
const callback = instance.addEventCallback(
async (message: EventMessage) => {
if (message.eventType === EventType.LOGIN_SUCCESS) {
try {
setLoading(true);
// useEffect(() => {
// const callback = instance.addEventCallback(
// async (message: EventMessage) => {
// if (message.eventType === EventType.LOGIN_SUCCESS) {
// try {
// setLoading(true);
const eventPayload: EventPayloadExtended =
message.payload as EventPayloadExtended;
const userProfile: User = await getUserProfile(
eventPayload.accessToken
);
const userPhoto = await getUserPhoto(eventPayload.accessToken);
// const eventPayload: EventPayloadExtended =
// message.payload as EventPayloadExtended;
// const userProfile: User = await getUserProfile(
// eventPayload.accessToken
// );
// const userPhoto = await getUserPhoto(eventPayload.accessToken);
appContext.dispatch({
type: 'SET_USER_PROFILE',
payload: userProfile
});
} catch (error) {
console.log(error);
} finally {
setLoading(false);
}
}
}
);
// appContext.dispatch({
// type: 'SET_USER_PROFILE',
// payload: userProfile
// });
// } catch (error) {
// console.log(error);
// } finally {
// setLoading(false);
// }
// }
// }
// );
instance.handleRedirectPromise().then((response) => {
console.log(response)
})
// instance.handleRedirectPromise().then((response) => {
// console.log(response)
// })
return () => {
if (callback) {
instance.removeEventCallback(callback);
appContext.dispatch({ type: 'SET_USER_PROFILE', payload: {} });
}
};
}, []);
// return () => {
// if (callback) {
// instance.removeEventCallback(callback);
// appContext.dispatch({ type: 'SET_USER_PROFILE', payload: {} });
// }
// };
// }, []);
useEffect(() => {
const setUserProfile = async () => {

92
app/src/main.tsx
View File

@@ -5,35 +5,83 @@ import AppContextProvider from './context/appContext/AppContextProvider.tsx';
import { BrowserRouter } from 'react-router-dom';
import './index.css';
import '@noahspan/noahspan-components/noahspan-components.css';
import { PublicClientApplication } from '@azure/msal-browser';
import { Configuration, EventType, LogLevel, PublicClientApplication } from '@azure/msal-browser';
import { MsalProvider } from '@azure/msal-react';
const msalInstance: PublicClientApplication = new PublicClientApplication({
const msalConfig: Configuration = {
auth: {
clientId: import.meta.env.VITE_CLIENT_ID,
authority: `https://login.microsoftonline.com/${import.meta.env.VITE_TENANT_ID}`,
redirectUri: import.meta.env.VITE_REDIRECT_URL
}
});
redirectUri: import.meta.env.VITE_REDIRECT_URL,
postLogoutRedirectUri: '/',
navigateToLoginRequestUrl: false,
},
cache: {
cacheLocation: 'localStorage',
storeAuthStateInCookie: false,
},
system: {
loggerOptions: {
loggerCallback: (level, message, containsPii) => {
if (containsPii) {
return;
}
switch (level) {
case LogLevel.Error:
console.error(message);
return;
case LogLevel.Info:
console.info(message);
return;
case LogLevel.Verbose:
console.debug(message);
return;
case LogLevel.Warning:
console.warn(message);
return;
default:
return;
}
},
},
},
};
console.log(msalInstance);
const msalInstance: PublicClientApplication = new PublicClientApplication(msalConfig);
console.log('ClientId :' + import.meta.env.VITE_CLIENT_ID)
console.log('TenantId :' + import.meta.env.VITE_TENANT_ID)
console.log('RedirectUrl :' + import.meta.env.VITE_REDIRECT_URL)
msalInstance.initialize()
.then(() => {
console.log('Initialized!');
if (!msalInstance.getActiveAccount() && msalInstance.getAllAccounts().length > 0) {
msalInstance.setActiveAccount(msalInstance.getAllAccounts()[0]);
}
msalInstance.enableAccountStorageEvents();
msalInstance.addEventCallback((event: any) => {
if (
event.eventType === EventType.LOGIN_SUCCESS ||
event.eventType === EventType.ACQUIRE_TOKEN_SUCCESS ||
event.eventType === EventType.SSO_SILENT_SUCCESS
) {
const account = event.payload.account;
msalInstance.setActiveAccount(account);
}
});
})
.catch((err) => {
console.error('Error during initialization');
console.error(err);
});
msalInstance.initialize().then(() => {
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<MsalProvider instance={msalInstance}>
<AppContextProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</AppContextProvider>
</MsalProvider>
</React.StrictMode>
);
});
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<MsalProvider instance={msalInstance}>
<AppContextProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</AppContextProvider>
</MsalProvider>
</React.StrictMode>
);

4
infrastructure/config/main.tf
View File

@@ -17,6 +17,10 @@ locals {
prod = "flying-app-prod"
}
container_app_app_redirect_url = {
dev = "https://flying-app-dev.greensea-e83e7646.centralus.azurecontainerapps.io"
}
container_app_api_name = {
dev = "flying-api-dev"
test = "flying-api-test"

4
infrastructure/config/outputs.tf
View File

@@ -14,6 +14,10 @@ output "container_app_api_name" {
value = local.container_app_api_name[var.environment]
}
output "container_app_app_redirect_url" {
value = local.container_app_app_redirect_url[var.environment]
}
output "container_app_api_container_image" {
value = local.container_app_api_container_image[var.environment]
}

30
infrastructure/main.tf
View File

@@ -128,6 +128,26 @@ resource "azurerm_container_app" "container_app_app" {
image = module.environment.container_app_app_container_image
cpu = 0.25
memory = "0.5Gi"
env {
name = "VITE_API_URL"
value = azurerm_container_app.container_app_api.latest_revision_fqdn
}
env {
name = "VITE_CLIENT_ID"
secret_name = "client-id"
}
env {
name = "VITE_REDIRECT_URL"
value = module.environment.container_app_app_redirect_url
}
env {
name = "VITE_TENANT_ID"
secret_name = "tenant-id"
}
}
}
@@ -143,11 +163,21 @@ resource "azurerm_container_app" "container_app_app" {
}
}
secret {
name = "client-id"
value = var.CLIENT_ID
}
secret {
name = "docker-io-password"
value = var.DOCKER_IO_PASSWORD
}
secret {
name = "tenant-id"
value = var.TENANT_ID
}
lifecycle {
ignore_changes = [ template[0].container[0].image ]
}