@noatgnu/cupcake-core 1.3.14 → 1.3.15

package/fesm2022/noatgnu-cupcake-core.mjs

@@ -165,7 +165,10 @@ const authInterceptor = (req, next) => {
         req.url.includes('/auth/token/') ||
         req.url.includes('/auth/orcid/') ||
         req.url.includes('/auth/register/') ||
-        req.url.includes('/site-config/public/')) {
+        req.url.includes('/auth/exchange-code/') ||
+        req.url.includes('/site-config/public/') ||
+        req.url.includes('/users/auth_config/') ||
+        req.url.includes('/users/registration_status/')) {
         return next(req);
     }
     const token = localStorage.getItem('ccvAccessToken');
@@ -441,13 +444,19 @@ class AuthService {
             return null;
         }
     }
-    initiateORCIDLogin() {
-        return this.http.get(`${this.apiUrl}/auth/orcid/login/`)
+    initiateORCIDLogin(rememberMe = false) {
+        const params = rememberMe ? '?remember_me=true' : '';
+        return this.http.get(`${this.apiUrl}/auth/orcid/login/${params}`)
             .pipe(map(response => ({
             authorizationUrl: response.authorization_url,
             state: response.state
         })));
     }
+    exchangeAuthCode(authCode) {
+        return this.http.post(`${this.apiUrl}/auth/exchange-code/`, {
+            auth_code: authCode
+        }).pipe(tap$1(response => this.setAuthData(response)));
+    }
     handleORCIDCallback(code, state, rememberMe = false) {
         const params = new URLSearchParams({ code, state, remember_me: rememberMe.toString() });
         return this.http.get(`${this.apiUrl}/auth/orcid/callback/?${params}`)
@@ -504,6 +513,9 @@ class AuthService {
     getRefreshToken() {
         return localStorage.getItem('ccvRefreshToken');
     }
+    handleExternalLogin(response) {
+        this.setAuthData(response);
+    }
     setAuthData(response) {
         const accessToken = response.accessToken || response.access_token || response.access;
         const refreshToken = response.refreshToken || response.refresh_token || response.refresh;
@@ -863,10 +875,10 @@ class ApiService {
     }
     // Authentication configuration
     getAuthConfig() {
-        return this.http.get(`${this.apiUrl}/users/auth_config/`);
+        return this.get(`${this.apiUrl}/users/auth_config/`);
     }
     getRegistrationStatus() {
-        return this.http.get(`${this.apiUrl}/users/registration_status/`);
+        return this.get(`${this.apiUrl}/users/registration_status/`);
     }
     // ===================================================================
     // PASSWORD MANAGEMENT METHODS
@@ -2414,6 +2426,7 @@ class LoginComponent {
     returnUrl = '/';
     ngOnInit() {
         this.loadAuthConfig();
+        this.handleHashParams();
         this.route.queryParams.subscribe(params => {
             this.returnUrl = this.cleanReturnUrl(params['returnUrl']) || '/';
             if (params['code'] && params['state']) {
@@ -2435,6 +2448,46 @@ class LoginComponent {
             }
         });
     }
+    handleHashParams() {
+        const hash = window.location.hash;
+        const queryIndex = hash.indexOf('?');
+        if (queryIndex === -1)
+            return;
+        const queryString = hash.substring(queryIndex + 1);
+        const params = new URLSearchParams(queryString);
+        const authCode = params.get('auth_code');
+        const errorParam = params.get('error');
+        if (errorParam) {
+            this.error.set(`ORCID authentication failed: ${errorParam}`);
+            this.cleanHashParams();
+            return;
+        }
+        if (authCode) {
+            this.loading.set(true);
+            this.error.set(null);
+            this.cleanHashParams();
+            this.authService.exchangeAuthCode(authCode).subscribe({
+                next: () => {
+                    this.success.set('Login successful!');
+                    setTimeout(() => {
+                        this.navigateToReturnUrl();
+                    }, 1000);
+                },
+                error: (error) => {
+                    this.loading.set(false);
+                    this.error.set(error.error?.error || error.error?.detail || 'Failed to complete authentication.');
+                }
+            });
+        }
+    }
+    cleanHashParams() {
+        const hash = window.location.hash;
+        const queryIndex = hash.indexOf('?');
+        if (queryIndex !== -1) {
+            const cleanHash = hash.substring(0, queryIndex);
+            window.history.replaceState(null, '', window.location.pathname + cleanHash);
+        }
+    }
     /**
      * Navigate to return URL, properly handling query parameters
      */
@@ -2540,7 +2593,8 @@ class LoginComponent {
     loginWithORCID() {
         this.loading.set(true);
         this.error.set(null);
-        this.authService.initiateORCIDLogin().subscribe({
+        const rememberMe = this.loginForm.get('rememberMe')?.value || false;
+        this.authService.initiateORCIDLogin(rememberMe).subscribe({
             next: (response) => {
                 sessionStorage.setItem('orcid_state', response.state);
                 window.location.href = response.authorizationUrl;
@@ -2593,8 +2647,14 @@ class LoginComponent {
     /**
      * Computed signals for UI display logic
      */
-    shouldShowOrcidLogin = computed(() => this.authConfig()?.orcidLoginEnabled === true, ...(ngDevMode ? [{ debugName: "shouldShowOrcidLogin" }] : []));
-    shouldShowRegistration = computed(() => this.registrationStatus()?.registrationEnabled === true, ...(ngDevMode ? [{ debugName: "shouldShowRegistration" }] : []));
+    shouldShowOrcidLogin = computed(() => {
+        const config = this.siteConfigService.configSubject.value;
+        return config.enableOrcidLogin === true || this.authConfig()?.orcidLoginEnabled === true;
+    }, ...(ngDevMode ? [{ debugName: "shouldShowOrcidLogin" }] : []));
+    shouldShowRegistration = computed(() => {
+        const config = this.siteConfigService.configSubject.value;
+        return config.allowUserRegistration === true || this.registrationStatus()?.registrationEnabled === true;
+    }, ...(ngDevMode ? [{ debugName: "shouldShowRegistration" }] : []));
     shouldShowRegularLogin = computed(() => this.authConfig()?.regularLoginEnabled !== false, ...(ngDevMode ? [{ debugName: "shouldShowRegularLogin" }] : []));
     registrationMessage = computed(() => this.registrationStatus()?.message || 'Registration is currently enabled', ...(ngDevMode ? [{ debugName: "registrationMessage" }] : []));
     rememberMeDuration = computed(() => {