Skip to content

Migrate authentication to LabsPlatformSwift #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Migrate authentication to LabsPlatformSwift #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5eee73e
Begin integrating LabsPlatformSwift into PM
jonathanmelitski Feb 27, 2025
bff361e
Begin rewriting network requests
jonathanmelitski Feb 27, 2025
759a080
Start implementing platform auth
jonathanmelitski Mar 2, 2025
7a66d9c
Continue updating API Calls (I have no idea how to test this)
jonathanmelitski Mar 5, 2025
4ed617f
Finish network calls
jonathanmelitski Mar 12, 2025
4c7c7e0
Merge branch 'jon0/ios-17' into jon0/platform
jonathanmelitski Mar 12, 2025
fd4215d
Fix authentication flow (for the 19th or 20th time)
jonathanmelitski Mar 19, 2025
ef9b77d
add LabsPlatformSwift as a live dependency
jonathanmelitski Apr 11, 2025
fddb9cf
Remove LabsLoginController
jonathanmelitski Apr 13, 2025
b409b8b
Side quest to remove OAuth2NetworkManager and LabsLoginController
jonathanmelitski Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions PennMobile.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

329 changes: 0 additions & 329 deletions PennMobile/Auth/OAuth2NetworkManager.swift
View file
Open in desktop

This file was deleted.

20 changes: 2 additions & 18 deletions PennMobile/Clubs/TicketingAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,8 @@ class TicketingAPI {
return URL(string: "\(baseURL)/api/tickets/\(pathComponent)/")
}

func getSession() async throws -> URLSession {
guard let accessToken = try? await OAuth2NetworkManager.instance.getAccessToken() else {
throw NetworkingError.authenticationError
}

// HACK: iOS doesn't preserve Authorization headers during redirects
// (It also doesn't support setting Authorization headers in general apparently)
let config = URLSessionConfiguration.default
config.httpAdditionalHeaders = [
"Authorization": "Bearer \(accessToken.value)",
"X-Authorization": "Bearer \(accessToken.value)"
]

return URLSession(configuration: config)
}

func getTicket(id: String) async throws -> Ticket? {
let session = try await getSession()
let session = try await URLSession(authenticationMode: .accessToken)

guard let url = ticketUrl(forId: id) else {
return nil
Expand All @@ -76,7 +60,7 @@ class TicketingAPI {
}

@discardableResult func updateAttendance(id: String, to attended: Bool) async throws -> Ticket {
let session = try await getSession()
let session = try await URLSession(authenticationMode: .accessToken)

guard let url = ticketUrl(forId: id) else {
throw ScannedTicket.InvalidReason.notFound
Expand Down
Loading