Migrate authentication to LabsPlatformSwift #600

jonathanmelitski · 2025-04-11T21:21:27Z

LabsPlatformSwift is a new package that can handle the authentication flow with the Penn Labs Platform server. It handles the general authentication flow and all network-related requests to the Penn Labs servers (all network requests have been rewritten).

The package has a lot of functionality. Analytics are at the crux of this package but are for a future PR.

JHawk0224

This is amazing!

For the status code comments, I don't think they need to be changed, I just wanted to point them out.

On an overall note, I see when logging in that the ProgressView we had inserted over the login sheet is no longer there (action is still disabled though preventing stale web request - ty). Is it possible we can add it back? Ik it's Penn's fault for being slow, but otherwise there's no indication something is happening.

Also, when testing, I just logged in but it brought be to the Login page after a successful login. Then clicking again doesn't do anything, see below video. Not sure why it's happening, but should be fixed.

weird-behavior.mov

Note that I am not done testing, so I will be continuing to add comments, but I thought I would share this review for now.

JHawk0224 · 2025-04-13T23:39:14Z

PennMobile/GSR-Booking/Controllers/GSRController.swift

@@ -235,15 +236,7 @@ extension GSRController: GSRBookable {

                    alertController.addAction(UIAlertAction(title: "Ok", style: .cancel, handler: {_ in }))
                    alertController.addAction(UIAlertAction(title: "Login", style: .default, handler: { _ in
-                        let llc = LabsLoginController { (_) in
-                            DispatchQueue.main.async {
-                                self.submitBooking(for: GSRBooking(gid: gid, startTime: first.startTime, endTime: last.endTime, id: id, roomName: roomName))


What did this do? I would guess it's a completion for once the user is logged in, but in that case isn't the same logic needed after logging in with LabsPlatform?

Preference I think. My thought is that one could opt for logging in, then immediately booking after, but I don't think that's a requirement. Also, I think this is such an edge case because the number of steps you'd need to go through to reach this case (you can't view availability as a guest) is a bit far-fetched. I think it's okay to prompt for a login, then have them hit the submit button again, though I can look into adding a continuation function like this in LabsPlatformSwift

That makes sense. You're right, I don't see the need to include it if it should be impossible to not be logged in on the book screen in the first place.

JHawk0224 · 2025-04-13T23:41:03Z

PennMobile/Login/LabsLoginController.swift

-            if accountID == nil {
-                FirebaseAnalyticsManager.shared.trackEvent(action: "Attempt Login", result: "Failed Login", content: "Failed Login")
-            } else {
-                FirebaseAnalyticsManager.shared.trackEvent(action: "Attempt Login", result: "Successful Login", content: "Successful Login")


Can we add back in tracking for these in the new auth flow? I know we're missing a ton of logging as it stands, but while we're modifying this stuff I feel like it makes sense to keep.

Yes I agree, also with the current issues with analytics I'm questioning how much we should be writing. (it has a max of 20gb lol and we will definitely fill that very quickly)

That's fair. I know it's kinda weird to have two analytics things going on at once, but I also think it would be nice to actually flush out all the Firebase logs too at some point.

JHawk0224 · 2025-04-13T23:44:31Z

PennMobile/More Tab/PAC Code/PacCodeViewController.swift

-import UIKit
-import PennMobileShared
-
-class PacCodeViewController: UIViewController, ShowsAlertForError, IndicatorEnabled {


I will make another PR soon that recreates this in SwiftUI btw

This is big

JHawk0224 · 2025-04-13T23:46:39Z

PennMobile/Setup + Navigation/ControllerModel.swift

-    var moreFeatures: [Feature] {
-        get {
-            let tabPreferences = UserDefaults.standard.getTabPreferences()
-            return dynamicFeatures.filter { !tabPreferences.contains($0) } + [.about]


Wait are these not being used by the SwiftUI More tab?

Best I could tell, the dynamic features panel was rewritten in swiftUI already, will confirm

JHawk0224 · 2025-04-14T13:42:25Z

PennMobile/General/Networking + Analytics/UserDBManager.swift

-        OAuth2NetworkManager.instance.getAccessToken { (token) in
-            guard let token = token else { return }
-
+        Task {
            let url = URL(string: "https://pennmobile.org/api/login")!


Is this loginToBackend function still needed? It looks like it's only ever called in the apps initialization (which wouldn't make sense for logging in and out)

You are correct; it would appear that it's no longer needed. I'm guessing I removed usages of it first, then rewrote that function anyways when I was writing in the new API calls.

Do you think it should be deleted?

Yes if it's not being used then it should be deleted

JHawk0224 · 2025-04-14T14:45:27Z

PennMobile/Login/LabsLoginController.swift

-            if successful {
-                UserDefaults.standard.setLastLogin()
-            }
-            UserDefaults.standard.storeCookies()


I'm assuming we don't need to store cookies anymore and LabsPlatform handles everything?

actually an incredible catch, forgot that HTTPCookieStorage doesn't persist through restarts, which is what LabsPlatform is currently doing. Yes it is handled by LabsPlatform (albeit evidently not to a full capacity) and will fix. Btw I'm going to PR my changes to LabsPlatformSwift just to add a reference.

JHawk0224 · 2025-04-14T14:47:24Z

PennMobile/Login/LoggedOutView.swift

@@ -7,11 +7,13 @@
 //

 import SwiftUI
+import LabsPlatformSwift

 struct LoggedOutView: View {
    @EnvironmentObject var authManager: AuthManager
    @Environment(\.colorScheme) var colorScheme
    @State var isPresentingLoginSheet = false


Can you delete isPresentingLoginSheet? It's no longer being used

JHawk0224 · 2025-04-14T14:48:34Z

PennMobile/Login/LoggedOutView.swift

-        .sheet(isPresented: $isPresentingLoginSheet) {
-            LabsLoginView { success in
-                if success {
-                    authManager.determineInitialState()


Just trying to understand the new flow, but where is the equivalent to this in the new version? (on login success)

Handled in AuthManager@78, the LabsPlatform library calls that function whenever global (logged in/logged out) auth state changes, so it will inherently be called on a successful login.

JHawk0224 · 2025-04-14T14:55:38Z

PennMobile/Setup + Navigation/RootViewController.swift

-        OAuth2NetworkManager.instance.clearRefreshToken()
-        OAuth2NetworkManager.instance.clearCurrentAccessToken()
+        if let platform = LabsPlatform.shared {
+            platform.logoutPlatform()


LabsPlatform.shared?.logoutPlatform()?

I am a good Swift developer.

Lol I was being very nitpicky, it just didn't match the use of LabsPlatform.shared?.loginWithPlatform()

JHawk0224 · 2025-04-14T14:56:54Z

PennMobile/Setup + Navigation/RootViewController.swift

@@ -146,8 +147,9 @@ class RootViewController: UIViewController, NotificationRequestable, ShowsAlert
    func clearAccountData() {


What's the difference between this and the AuthManager's clearAccountData?

jonathanmelitski · 2025-04-14T15:54:30Z

This is amazing!

For the status code comments, I don't think they need to be changed, I just wanted to point them out.

On an overall note, I see when logging in that the ProgressView we had inserted over the login sheet is no longer there (action is still disabled though preventing stale web request - ty). Is it possible we can add it back? Ik it's Penn's fault for being slow, but otherwise there's no indication something is happening.

Also, when testing, I just logged in but it brought be to the Login page after a successful login. Then clicking again doesn't do anything, see below video. Not sure why it's happening, but should be fixed.

weird-behavior.mov
Note that I am not done testing, so I will be continuing to add comments, but I thought I would share this review for now.

my thought/initial guess, the client id you're using isn't setup for the auth flow that I've been using. Oversight on my part, and it reminds me that this will need to be fixed prior to deployment.

JHawk0224 · 2025-04-14T20:09:40Z

This is amazing!
For the status code comments, I don't think they need to be changed, I just wanted to point them out.
On an overall note, I see when logging in that the ProgressView we had inserted over the login sheet is no longer there (action is still disabled though preventing stale web request - ty). Is it possible we can add it back? Ik it's Penn's fault for being slow, but otherwise there's no indication something is happening.
Also, when testing, I just logged in but it brought be to the Login page after a successful login. Then clicking again doesn't do anything, see below video. Not sure why it's happening, but should be fixed.
weird-behavior.mov
Note that I am not done testing, so I will be continuing to add comments, but I thought I would share this review for now.

my thought/initial guess, the client id you're using isn't setup for the auth flow that I've been using. Oversight on my part, and it reminds me that this will need to be fixed prior to deployment.

Ok I will test again when I get a chance.

JHawk0224 · 2025-04-14T20:13:58Z

This is amazing!
For the status code comments, I don't think they need to be changed, I just wanted to point them out.
On an overall note, I see when logging in that the ProgressView we had inserted over the login sheet is no longer there (action is still disabled though preventing stale web request - ty). Is it possible we can add it back? Ik it's Penn's fault for being slow, but otherwise there's no indication something is happening.
Also, when testing, I just logged in but it brought be to the Login page after a successful login. Then clicking again doesn't do anything, see below video. Not sure why it's happening, but should be fixed.
weird-behavior.mov
Note that I am not done testing, so I will be continuing to add comments, but I thought I would share this review for now.

my thought/initial guess, the client id you're using isn't setup for the auth flow that I've been using. Oversight on my part, and it reminds me that this will need to be fixed prior to deployment.

Also re adding ProgressView for authentication with penn, it should be really easy. Basically just changing AuthWebView.swift in LabsPlatformSwift to use

ZStack {
    AuthWebViewRepresentable(url: url, redirect: redirect, isLoading: $isLoading, completion: callback)

    if isLoading {
        Color.black.opacity(0.1)
            .ignoresSafeArea()

        ProgressView()
            .tint(nil)
            .scaleEffect(1.6)
            .frame(width: 100, height: 100)
            .background(.thickMaterial)
            .cornerRadius(16)
    }
}

jonathanmelitski added 8 commits February 26, 2025 19:28

Begin integrating LabsPlatformSwift into PM

5eee73e

Begin rewriting network requests

bff361e

Start implementing platform auth

759a080

Continue updating API Calls (I have no idea how to test this)

7a66d9c

Finish network calls

4ed617f

Merge branch 'jon0/ios-17' into jon0/platform

4c7c7e0

Fix authentication flow (for the 19th or 20th time)

fd4215d

add LabsPlatformSwift as a live dependency

ef9b77d

jonathanmelitski requested review from anli5005 and JHawk0224 April 11, 2025 21:21

jonathanmelitski added 2 commits April 13, 2025 13:03

Remove LabsLoginController

fddb9cf

Side quest to remove OAuth2NetworkManager and LabsLoginController

b409b8b

JHawk0224 requested changes Apr 14, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate authentication to LabsPlatformSwift #600

Migrate authentication to LabsPlatformSwift #600

jonathanmelitski commented Apr 11, 2025

JHawk0224 left a comment •

edited

Loading

JHawk0224 Apr 13, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

JHawk0224 Apr 13, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

JHawk0224 Apr 13, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 13, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

JHawk0224 Apr 14, 2025

jonathanmelitski Apr 14, 2025 •

edited

Loading

JHawk0224 Apr 14, 2025 •

edited

Loading

JHawk0224 Apr 14, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

jonathanmelitski Apr 14, 2025

JHawk0224 Apr 14, 2025

JHawk0224 Apr 14, 2025

jonathanmelitski commented Apr 14, 2025 •

edited

Loading

JHawk0224 commented Apr 14, 2025

JHawk0224 commented Apr 14, 2025 •

edited

Loading

		@@ -146,8 +147,9 @@ class RootViewController: UIViewController, NotificationRequestable, ShowsAlert
		func clearAccountData() {

Migrate authentication to LabsPlatformSwift #600

Are you sure you want to change the base?

Migrate authentication to LabsPlatformSwift #600

Conversation

jonathanmelitski commented Apr 11, 2025

JHawk0224 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonathanmelitski Apr 14, 2025 • edited Loading

Choose a reason for hiding this comment

JHawk0224 Apr 14, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonathanmelitski commented Apr 14, 2025 • edited Loading

JHawk0224 commented Apr 14, 2025

JHawk0224 commented Apr 14, 2025 • edited Loading

JHawk0224 left a comment •

edited

Loading

jonathanmelitski Apr 14, 2025 •

edited

Loading

JHawk0224 Apr 14, 2025 •

edited

Loading

jonathanmelitski commented Apr 14, 2025 •

edited

Loading

JHawk0224 commented Apr 14, 2025 •

edited

Loading