+
+
+
+
+ 
+
+
+
+ OpenAPI Reference
+
+
+
+ 
GraphQL
+
OpenAPI
@@ -143,6 +163,7 @@ export default class ApplicationDetails extends Vue {
+
diff --git a/structures-frontend-next/src/pages/OpenAPIPlayground.vue b/structures-frontend-next/src/pages/OpenAPIPlayground.vue
new file mode 100644
index 000000000..a4f36ecd7
--- /dev/null
+++ b/structures-frontend-next/src/pages/OpenAPIPlayground.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/structures-frontend-next/src/pages/login/Login.vue b/structures-frontend-next/src/pages/login/Login.vue
index 2e58586cb..2a098be7c 100644
--- a/structures-frontend-next/src/pages/login/Login.vue
+++ b/structures-frontend-next/src/pages/login/Login.vue
@@ -1,6 +1,5 @@
OpenAPI
-
-
-
@@ -9,16 +8,18 @@
-
+
+
+ 
+
-
-
-
{
try {
- // TODO: add virtual scroll to the list of applications
const service = Structures.getApplicationService()
const pageable = Pageable.create(0, 1000)
const result = await service.findAll(pageable)
@@ -108,7 +107,6 @@ class ApplicationState implements IApplicationState {
}
}
- // ---------- Utility methods ----------
private createNavItem(route: RouteRecordRaw, parentPath: string): NavItem {
const fullPath = this.resolveFullPath(route.path, parentPath)
const navItem = new NavItem(
diff --git a/structures-frontend-next/src/states/IUserState.ts b/structures-frontend-next/src/states/IUserState.ts
index edef6ad43..af10bedda 100644
--- a/structures-frontend-next/src/states/IUserState.ts
+++ b/structures-frontend-next/src/states/IUserState.ts
@@ -21,6 +21,12 @@ export class UserState implements IUserState {
private accessDenied: boolean = false
public async authenticate(login: string, passcode: string): Promise {
+ try {
+ await Continuum.disconnect()
+ } catch (error) {
+ console.log('No existing connection to disconnect')
+ }
+
const connectionInfo: ConnectionInfo = this.createConnectionInfo()
connectionInfo.connectHeaders = {
login,
@@ -50,13 +56,16 @@ export class UserState implements IUserState {
}
public async handleOidcLogin(user: User): Promise {
+ try {
+ await Continuum.disconnect()
+ } catch (error) {
+ console.log('No existing connection to disconnect')
+ }
+
const connectionInfo: ConnectionInfo = this.createConnectionInfo()
- // Determine which token to use
let tokenToUse = user.access_token;
- // For Microsoft social login, check if access_token is a valid JWT
- // If not, use the ID token instead
if (user.access_token && !this.isValidJWT(user.access_token)) {
console.log('Access token is not a valid JWT, using ID token for Microsoft social login');
tokenToUse = user.id_token || user.access_token;
@@ -72,19 +81,17 @@ export class UserState implements IUserState {
this.accessDenied = false
this.oidcUser = user
- // Store the token in a cookie
Cookies.set('token', tokenToUse, {
sameSite: 'strict',
secure: true,
- expires: new Date(user.expires_at! * 1000) // Convert Unix timestamp to Date
+ expires: new Date(user.expires_at! * 1000)
})
- // Store refresh token if available
if (user.refresh_token) {
Cookies.set('oidc_refresh_token', user.refresh_token, {
sameSite: 'strict',
secure: true,
- expires: 30 // 30 days for refresh token
+ expires: 30
})
}
} catch (reason: any) {
@@ -98,17 +105,6 @@ export class UserState implements IUserState {
}
public async logout(): Promise {
- // Clear all auth-related cookies
- Cookies.remove('token')
- Cookies.remove('oidc_refresh_token')
-
- // Reset state
- this.connectedInfo = null
- this.oidcUser = null
- this.authenticated = false
- this.accessDenied = false
-
- // Disconnect from Continuum if connected
if (this.connectedInfo) {
try {
await Continuum.disconnect()
@@ -116,6 +112,14 @@ export class UserState implements IUserState {
console.error('Error disconnecting from Continuum:', error)
}
}
+
+ Cookies.remove('token')
+ Cookies.remove('oidc_refresh_token')
+
+ this.connectedInfo = null
+ this.oidcUser = null
+ this.authenticated = false
+ this.accessDenied = false
}
public isAccessDenied(): boolean {
@@ -124,9 +128,7 @@ export class UserState implements IUserState {
public isAuthenticated(): boolean {
return this.authenticated && (
- // Either we have a basic auth token
Cookies.get('token') !== undefined ||
- // Or we have a valid OIDC token
(this.oidcUser !== null &&
this.oidcUser.expires_at !== undefined &&
this.oidcUser.expires_at * 1000 > Date.now())
@@ -153,22 +155,16 @@ export class UserState implements IUserState {
return connectionInfo
}
- /**
- * Check if a token is a valid JWT format
- */
private isValidJWT(token: string): boolean {
try {
- // Check if token has the JWT format (3 parts separated by dots)
const parts = token.split('.');
if (parts.length !== 3) {
return false;
}
- // Try to decode the header and payload
const header = JSON.parse(atob(parts[0]));
const payload = JSON.parse(atob(parts[1]));
- // Check for required JWT claims
return !!(header.alg && payload.iss && payload.aud);
} catch (error) {
return false;
@@ -29,7 +30,6 @@
You can try again or use an alternative login method:
-
-
-
-
Error: {{ currentOidcError.error }}
@@ -81,22 +80,16 @@
-
- 
-
-
-
-
-
-
-
Continue with {{ state?.providerDisplayName || state?.matchedProvider }} @@ -134,46 +124,45 @@
-
-
+
-
-
-
+
-
-
+ Username / Email: {{ login }}
-
-
-
No authentication method found for this email domain.
@@ -187,7 +176,6 @@
Initializing...
@@ -233,42 +221,35 @@ import { StructuresStates } from "@/states/index" } }) export default class Login extends Vue { - // Use the authentication service private auth = new AuthenticationService(); - // Form data get login() { return this.auth.login; } set login(value: string) { this.auth.login = value; } get password() { return this.auth.password; } set password(value: string) { this.auth.password = value; } - // State from service get state() { return this.auth.state; } get shouldShowLoginForm() { return this.auth.shouldShowLoginForm; } get isLoginValid() { return this.auth.isLoginValid; } get isPasswordValid() { return this.auth.isPasswordValid; } get currentOidcError() { return this.auth.currentOidcError; } - // Computed properties for template get showPassword() { return this.state.showPassword; } set showPassword(value: boolean) { this.auth.updateState({ showPassword: value }); } - // Always show the form immediately - no initialization wait get isInitialized() { - return true; // Always ready to show email form + return true; } - // These will be loaded when needed private _isConfigLoaded: boolean = false; - private _isBasicAuthEnabled: boolean = true; // Default assumption - assume basic auth is available + private _isBasicAuthEnabled: boolean = true; get isConfigLoaded() { return this._isConfigLoaded; } get isBasicAuthEnabled() { return this._isBasicAuthEnabled; } - // Debug method to check current state get debugInfo() { return { emailEntered: this.state?.emailEntered, @@ -283,21 +264,17 @@ export default class Login extends Vue { private userState: IUserState = StructuresStates.getUserState() async mounted() { - // Focus the email input immediately - no waiting for initialization this.$nextTick(() => { this.focusEmailInput(); }); - // Load basic config in background (non-blocking) this.loadBasicConfig(); - // Check if we're returning from an OIDC login with an error if (this.$route.query.error) { this.handleOidcError(); return; } - // Check if we're returning from an OIDC login if (this.$route.query.code && this.$route.query.state) { this.handleOidcCallback(); } @@ -305,7 +282,6 @@ export default class Login extends Vue { private async loadBasicConfig() { console.log('Loading basic config...'); - // Load basic configuration in the background without blocking UI try { this._isBasicAuthEnabled = await this.auth.checkBasicAuthEnabled(); this._isConfigLoaded = true; @@ -361,13 +337,11 @@ export default class Login extends Vue { if (isRetryable) { this.auth.showRetryOption(oidcError); - // Keep current email and provider info for retry this.auth.updateState({ emailEntered: true, showPassword: false }); } else { - // For non-retryable errors, reset to email input this.auth.resetToEmail(); } } @@ -386,13 +360,10 @@ export default class Login extends Vue { const { referer, provider } = stateInfo; const userManager = await createUserManager(provider); - // Complete the OIDC login const user = await userManager.signinRedirectCallback(); - // Store the user info in your state management await this.userState.handleOidcLogin(user); - // Redirect to the original destination or default const redirectPath = referer || '/applications'; await CONTINUUM_UI.navigate(redirectPath); } catch (error: unknown) { @@ -403,7 +374,6 @@ export default class Login extends Vue { this.displayAlert('OIDC callback failed'); } - // Reset form to email input after OIDC callback error this.auth.resetToEmail(); } finally { this.auth.setOidcCallbackLoading(false); @@ -441,7 +411,6 @@ export default class Login extends Vue { this.displayAlert('Unknown login error') } - // Reset form to email input after authentication error this.auth.resetToEmail(); } finally { this.auth.setLoading(false); @@ -469,42 +438,24 @@ export default class Login extends Vue { this.auth.setLoading(true); try { - const authMethod = await this.auth.determineAuthMethod(this.login); - console.log('Auth method determined:', authMethod); // Debug log + console.log('Proceeding to password step for email:', this.login); + this.auth.updateState({ + emailEntered: true, + showPassword: true, + matchedProvider: null, + providerDisplayName: '', + showRetryOption: false, + showErrorDetails: false + }); - if (authMethod.shouldUseOidc && authMethod.matchedProvider) { - // Automatically redirect to OIDC login when provider is found - console.log('OIDC provider found, automatically redirecting to:', authMethod.matchedProvider); - console.log('About to call handleOidcLogin...'); - // Don't show provider selection UI - just redirect directly - await this.handleOidcLogin(authMethod.matchedProvider); - console.log('handleOidcLogin completed, returning early'); - return; // Exit early to prevent any further UI updates - } else if (authMethod.fallbackToBasicAuth) { - // Only show password if explicitly marked for fallback (no OIDC providers or no match found) - console.log('Falling back to basic auth - no OIDC provider found'); - this.auth.resetToPassword(null, ''); - } else { - // OIDC is enabled but something went wrong - reset form and show error - console.log('OIDC enabled but no provider found - resetting form'); - this.auth.resetToEmail(); - this.displayAlert('Unable to determine authentication method. Please try again or contact support.'); - } + this.$nextTick(() => { + this.focusPasswordInput(); + }); } catch (error) { - console.error('Error determining authentication method:', error); - // OIDC failed - reset form and show error, don't fallback to password - console.log('OIDC error occurred - resetting form and showing error'); - this.auth.resetToEmail(); - this.displayAlert('Authentication service error. Please try again or contact support.'); + console.error('Error in email submit:', error); + this.displayAlert('Error processing email. Please try again.'); } finally { this.auth.setLoading(false); - - // Focus password input when it becomes visible - if (this.state.showPassword) { - this.$nextTick(() => { - this.focusPasswordInput(); - }); - } } } @@ -532,7 +483,6 @@ export default class Login extends Vue { private usePasswordInstead() { this.auth.clearRetryOption(); - // Explicitly show password input when user chooses to use password instead of OIDC this.auth.updateState({ emailEntered: true, showPassword: true, @@ -582,12 +532,7 @@ export default class Login extends Vue { private async handleOidcLogin(provider: string) { console.log('handleOidcLogin called with provider:', provider); console.log('Current loading state:', this.state.loading); - - // Don't check loading state here since we're already in a loading context from handleEmailSubmit - // if (this.state.loading) { - // console.log('Loading is true, returning early'); - // return; - // } + console.log('Starting OIDC flow (loading already set)...'); @@ -596,20 +541,16 @@ export default class Login extends Vue { const userManager = await createUserManager(provider); console.log('User manager created successfully'); - // Create state object with provider and referer information console.log('Creating OIDC state...'); const state = await this.auth.createOidcState(this.referer, provider); console.log('OIDC state created:', state); - // Start OIDC login with login_hint to pre-fill email const signinOptions: any = { state }; - // Add login_hint if we have an email to pre-fill if (this.login) { signinOptions.login_hint = this.login; console.log('Added login_hint:', this.login); - // Some providers also support domain_hint for better UX const emailDomain = this.login.split('@')[1]; if (emailDomain) { signinOptions.domain_hint = emailDomain; @@ -625,10 +566,8 @@ export default class Login extends Vue { console.error('OIDC login failed:', error); this.displayAlert(`OIDC login failed: ${error instanceof Error ? error.message : 'Unknown error'}`); - // Reset form state to allow user to try again this.auth.resetToEmail(); } - // Note: Loading state is managed by the calling handleEmailSubmit method } } \ No newline at end of file diff --git a/structures-frontend-next/src/states/IApplicationState.ts b/structures-frontend-next/src/states/IApplicationState.ts index ff9ff152b..0ba7ffbb5 100644 --- a/structures-frontend-next/src/states/IApplicationState.ts +++ b/structures-frontend-next/src/states/IApplicationState.ts @@ -97,7 +97,6 @@ class ApplicationState implements IApplicationState { public async loadAllApplications(): Promise