Replace passport with account references (#50)

forem · Mar 9, 2022 · e36127f · e36127f
1 parent 8926bba
commit e36127f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Sources/ForemWebView/URL+ForemUtilities.swift b/Sources/ForemWebView/URL+ForemUtilities.swift
@@ -8,8 +8,8 @@ public extension URL {
  self.absoluteString.range(of: URL.faceBookRegex, options: .regularExpression) != nil
  }
 
- // Forem Passport Auth
- var isForemPassportAuth: Bool { self.absoluteString.hasPrefix("https://passport.forem.com/oauth") }
+ // Forem Account Auth
+ var isForemAccountAuth: Bool { self.absoluteString.hasPrefix("https://account.forem.com/oauth") }
 
  // GitHub OAuth paths including 2FA + error pages
  var isGithubAuth: Bool {
@@ -46,7 +46,7 @@ public extension URL {
  return true
  }
 
- if isForemPassportAuth {
+ if isForemAccountAuth {
  return true
  }
 

diff --git a/Tests/ForemWebViewTests/ForemWebViewTests.swift b/Tests/ForemWebViewTests/ForemWebViewTests.swift
@@ -65,7 +65,7 @@ final class ForemWebViewTests: XCTestCase {
  "https://m.facebook.com/v4.0/dialog/oauth",
  "https://m.facebook.com/v6.0/dialog/oauth",
  "https://m.facebook.com/login.php?skip_api_login=1&api_key=asdf",
- "https://passport.forem.com/oauth/authorize?client_id=IBex_ltWo0tiuoB9CgHt7LCrwTuG5rlwhphjzQdf1RA&redirect_uri=https%3A%2F%2Fgggames.visualcosita.com%2Fusers%2Fauth%2Fforem%2Fcallback&response_type=code&state=de3f6b0c4cac41fdb9abf5409ce2f24e2d743245ca37a53a"
+ "https://account.forem.com/oauth/authorize?client_id=IBex_ltWo0tiuoB9CgHt7LCrwTuG5rlwhphjzQdf1RA&redirect_uri=https%3A%2F%2Fgggames.visualcosita.com%2Fusers%2Fauth%2Fforem%2Fcallback&response_type=code&state=de3f6b0c4cac41fdb9abf5409ce2f24e2d743245ca37a53a"
  ]
  for urlString in urlStrings {
  if let url = URL(string: urlString) {

diff --git a/Tests/ForemWebViewTests/URL+ForemUtilitiesTests.swift b/Tests/ForemWebViewTests/URL+ForemUtilitiesTests.swift
@@ -8,7 +8,7 @@ class URL_ForemUtilitiesTests: XCTestCase {
  ("testIsGoogleAuth", testIsGithubAuth),
  ("testIsGithubAuth", testIsGoogleAuth),
  ("testIsFacebookAuth", testIsFacebookAuth),
- ("testIsForemPassportAuth", testIsForemPassportAuth),
+ ("testIsForemAccountAuth", testIsForemAccountAuth),
  ("testIsTwitterAuth", testIsTwitterAuth),
  ]
  static let faker = Faker()
@@ -42,8 +42,8 @@ class URL_ForemUtilitiesTests: XCTestCase {
  "https://m.facebook.com/login.php?skip_api_login=1&api_key=asdf",
  ]
 
- static let passportUrlStrings = [
- "https://passport.forem.com/oauth/authorize?client_id=IBex_ltWo0tiuoB9CgHt7LCrwTuG5rlwhphjzQdf1RA&redirect_uri=https%3A%2F%2Fgggames.visualcosita.com%2Fusers%2Fauth%2Fforem%2Fcallback&response_type=code&state=de3f6b0c4cac41fdb9abf5409ce2f24e2d743245ca37a53a"
+ static let foremAccountUrlStrings = [
+ "https://account.forem.com/oauth/authorize?client_id=IBex_ltWo0tiuoB9CgHt7LCrwTuG5rlwhphjzQdf1RA&redirect_uri=https%3A%2F%2Fgggames.visualcosita.com%2Fusers%2Fauth%2Fforem%2Fcallback&response_type=code&state=de3f6b0c4cac41fdb9abf5409ce2f24e2d743245ca37a53a"
  ]
 
  static let googleUrlStrings = [
@@ -60,7 +60,7 @@ class URL_ForemUtilitiesTests: XCTestCase {
  """,
  ]
 
- static let urlStrings = githubUrlStrings + twitterUrlStrings + facebookUrlStrings + passportUrlStrings + googleUrlStrings
+ static let urlStrings = githubUrlStrings + twitterUrlStrings + facebookUrlStrings + foremAccountUrlStrings + googleUrlStrings
 
  func testIsOauthURL() {
  for urlString in URL_ForemUtilitiesTests.urlStrings {
@@ -100,10 +100,10 @@ class URL_ForemUtilitiesTests: XCTestCase {
  }
  }
 
- func testIsForemPassportAuth() {
- for urlString in URL_ForemUtilitiesTests.passportUrlStrings {
+ func testIsForemAccountAuth() {
+ for urlString in URL_ForemUtilitiesTests.foremAccountUrlStrings {
  if let url = URL(string: urlString) {
- XCTAssertTrue(url.isForemPassportAuth, "String didn't match as Auth URL: \(urlString)")
+ XCTAssertTrue(url.isForemAccountAuth, "String didn't match as Auth URL: \(urlString)")
  }
  }
  }