Merge pull request #996 from nsemets/fix/merge-conflicts-pbs-26-9

Merged `develop` into `pbs-26-9`

Author: brianjgeiger

CHANGELOG

@@ -2,6 +2,21 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.10.1 (2026-05-15)
+====================
+
+* Hotfix to take users to the links they clicked instead of the dashboard
+
+26.10.0 (2026-05-07)
+====================
+
+* OSF4I In-progress SSO Project - FE Piece
+
+26.9.2 (2026-05-06)
+===================
+
+* Hotfix to avoid errors on creating preprint versions
+
 26.9.1 (2026-04-28)
 ===================
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "osf",
-  "version": "26.9.1",
+  "version": "26.10.1",
   "scripts": {
     "ng": "ng",
     "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

package.json

@@ -10,6 +10,7 @@ import { Router } from '@angular/router';
 import { SENTRY_TOKEN } from '@core/provider/sentry.provider';
 import { AuthService } from '@core/services/auth.service';
 import { MaintenanceModeService } from '@core/services/maintenance-mode.service';
+import { UserSelectors } from '@core/store/user';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 
@@ -22,6 +23,7 @@ import {
 } from '@testing/providers/maintenance-mode.service.mock';
 import { RouterMockBuilder, RouterMockType } from '@testing/providers/router-provider.mock';
 import { SentryMock, SentryMockType } from '@testing/providers/sentry-provider.mock';
+import { provideMockStore } from '@testing/providers/store-provider.mock';
 import { ToastServiceMock, ToastServiceMockType } from '@testing/providers/toast-provider.mock';
 import { ViewOnlyLinkHelperMock, ViewOnlyLinkHelperMockType } from '@testing/providers/view-only-link-helper.mock';
 
@@ -37,7 +39,12 @@ describe('errorInterceptor', () => {
   let viewOnlyHelperMock: ViewOnlyLinkHelperMockType;
   let sentryMock: SentryMockType;
 
-  function setup(platformId: 'browser' | 'server' = 'browser', viewOnly = false, routerUrl = '/dashboard') {
+  function setup(
+    platformId: 'browser' | 'server' = 'browser',
+    viewOnly = false,
+    routerUrl = '/dashboard',
+    isAuthenticated = false
+  ) {
     router = RouterMockBuilder.create().withUrl(routerUrl).withNavigate(vi.fn().mockResolvedValue(true)).build();
     toastServiceMock = ToastServiceMock.simple();
     loaderServiceMock = new LoaderServiceMock();
@@ -50,6 +57,9 @@ describe('errorInterceptor', () => {
       providers: [
         provideOSFCore(),
         provideLoaderServiceMock(loaderServiceMock),
+        provideMockStore({
+          selectors: [{ selector: UserSelectors.isAuthenticated, value: isAuthenticated }],
+        }),
         MockProvider(Router, router),
         MockProvider(ToastService, toastServiceMock),
         MockProvider(AuthService, authServiceMock),
@@ -115,15 +125,30 @@ describe('errorInterceptor', () => {
     expect(toastServiceMock.showError).not.toHaveBeenCalled();
   });
 
-  it('should logout on 401 in browser when not view-only', async () => {
-    setup('browser', false);
+  it('should navigate to sign in on 401 in browser when anonymous and not view-only', async () => {
+    setup('browser', false, '/dashboard', false);
+    const request = createRequest('/api/v2/nodes/abc');
+    const error = new HttpErrorResponse({ status: 401, error: {}, url: request.url });
+
+    const caught = await runInterceptor(request, error);
+
+    expect(caught?.status).toBe(401);
+    expect(authServiceMock.navigateToSignIn).toHaveBeenCalled();
+    expect(authServiceMock.logout).not.toHaveBeenCalled();
+    expect(loaderServiceMock.hide).not.toHaveBeenCalled();
+    expect(toastServiceMock.showError).not.toHaveBeenCalled();
+  });
+
+  it('should logout on 401 in browser when authenticated and not view-only', async () => {
+    setup('browser', false, '/dashboard', true);
     const request = createRequest('/api/v2/nodes/abc');
     const error = new HttpErrorResponse({ status: 401, error: {}, url: request.url });
 
     const caught = await runInterceptor(request, error);
 
     expect(caught?.status).toBe(401);
-    expect(authServiceMock.logout).toHaveBeenCalled();
+    expect(authServiceMock.logout).toHaveBeenCalledWith(window.location.href);
+    expect(authServiceMock.navigateToSignIn).not.toHaveBeenCalled();
     expect(loaderServiceMock.hide).not.toHaveBeenCalled();
     expect(toastServiceMock.showError).not.toHaveBeenCalled();
   });

src/app/core/interceptors/error.interceptor.spec.ts

@@ -1,3 +1,5 @@
+import { Store } from '@ngxs/store';
+
 import { throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
@@ -11,6 +13,7 @@ import { MaintenanceResponse } from '@core/models/maintenance-response.model';
 import { SENTRY_TOKEN } from '@core/provider/sentry.provider';
 import { AuthService } from '@core/services/auth.service';
 import { MaintenanceModeService } from '@core/services/maintenance-mode.service';
+import { UserSelectors } from '@core/store/user';
 import { LoaderService } from '@osf/shared/services/loader.service';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
@@ -26,6 +29,7 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => {
   const sentry = inject(SENTRY_TOKEN);
   const platformId = inject(PLATFORM_ID);
   const viewOnlyHelper = inject(ViewOnlyLinkHelperService);
+  const store = inject(Store);
 
   return next(req).pipe(
     catchError((error: HttpErrorResponse) => {
@@ -69,7 +73,11 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => {
       if (error.status === 401) {
         if (!viewOnlyHelper.hasViewOnlyParam(router)) {
           if (isPlatformBrowser(platformId)) {
-            authService.logout();
+            if (store.selectSnapshot(UserSelectors.isAuthenticated)) {
+              authService.logout(window.location.href);
+            } else {
+              authService.navigateToSignIn();
+            }
           }
         }
         return throwError(() => error);

src/app/core/interceptors/error.interceptor.ts

@@ -41,8 +41,14 @@ export class AuthService {
     }
 
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
-    window.location.href = loginUrl;
+
+    const serviceUrl = new URL(`${this.webUrl}/login`);
+    serviceUrl.searchParams.set('next', window.location.href);
+
+    const loginUrl = new URL(`${this.casUrl}/login`);
+    loginUrl.searchParams.set('service', serviceUrl.toString());
+
+    window.location.href = loginUrl.toString();
   }
 
   navigateToOrcidSignIn(): void {
@@ -79,7 +85,7 @@ export class AuthService {
 
     if (isPlatformBrowser(this.platformId)) {
       this.cookieService.deleteAll();
-      window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(nextUrl || '/')}`;
+      window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent(nextUrl || `${window.location.origin}/`)}`;
     }
   }
 

src/app/core/services/auth.service.ts

@@ -186,7 +186,9 @@ export class PreprintDetailsComponent implements OnInit, OnDestroy {
     const preprint = this.preprint();
     if (!preprint) return false;
 
-    return this.hasAdminAccess() && preprint.datePublished && preprint.isLatestVersion;
+    const preprintIsRejected = preprint.reviewsState === ReviewsState.Rejected;
+
+    return this.hasAdminAccess() && (preprint.datePublished || preprintIsRejected) && preprint.isLatestVersion;
   });
 
   editButtonVisible = computed(() => {

src/app/features/preprints/pages/preprint-details/preprint-details.component.ts

@@ -37,6 +37,7 @@ describe('ProfileInformationComponent', () => {
       },
       institutionalRequestAccessEnabled: true,
       logoPath: 'logo.png',
+      sso_availability: 'Public',
     },
   ];
 

src/app/features/profile/components/profile-information/profile-information.component.spec.ts

@@ -64,6 +64,7 @@ describe('AddComponentDialogComponent', () => {
       assets: { logo: '', logo_rounded: '', banner: '' },
       institutionalRequestAccessEnabled: false,
       logoPath: '',
+      sso_availability: 'Public',
     },
     {
       id: 'inst-2',
@@ -76,6 +77,7 @@ describe('AddComponentDialogComponent', () => {
       assets: { logo: '', logo_rounded: '', banner: '' },
       institutionalRequestAccessEnabled: false,
       logoPath: '',
+      sso_availability: 'Public',
     },
   ];
 
@@ -91,6 +93,7 @@ describe('AddComponentDialogComponent', () => {
       assets: { logo: '', logo_rounded: '', banner: '' },
       institutionalRequestAccessEnabled: false,
       logoPath: '',
+      sso_availability: 'Public',
     },
   ];
 

src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.spec.ts

@@ -68,6 +68,7 @@ describe('AffiliatedInstitutionSelectComponent', () => {
       },
       institutionalRequestAccessEnabled: false,
       logoPath: '/logos/unavailable.png',
+      sso_availability: 'Unavailable',
     };
 
     fixture.componentRef.setInput('institutions', mockInstitutions);
@@ -134,6 +135,7 @@ describe('AffiliatedInstitutionSelectComponent', () => {
       },
       institutionalRequestAccessEnabled: false,
       logoPath: '/logos/unavailable.png',
+      sso_availability: 'Unavailable',
     };
 
     fixture.componentRef.setInput('institutions', mockInstitutions);
@@ -181,6 +183,7 @@ describe('AffiliatedInstitutionSelectComponent', () => {
       },
       institutionalRequestAccessEnabled: false,
       logoPath: '/logos/unavailable.png',
+      sso_availability: 'Unavailable',
     };
 
     fixture.componentRef.setInput('institutions', mockInstitutions);