Commit eacfae24 authored by Thomas Markiewicz's avatar Thomas Markiewicz

Fixed log in with librem.one accounts, removed Account menu, and switched to...

Fixed log in with librem.one accounts, removed Account menu, and switched to our fork of PIA's client-library-apple
parent 41001eb4
......@@ -6,6 +6,8 @@ Version 0.1.1 released to App Store on 2019-04-xx
* Fixed bug that would leave spinner and LOG IN button disabled when user login fails
* Tweaked placement of logo on the login screen so that it doesn't overlap the top notch on newer iPhones
* Changed URL Type identifier to one.librem.tunnel and URL scheme to libremtunnel
* Removed "Account" menu
* Fixed log in with librem.one accounts
Version 0.1.0 released to App Store on 2019-04-10
-------------------------------------------------
......
This diff is collapsed.
......@@ -43,7 +43,7 @@ extension AccountProvider {
let migrationDone = Client.preferences.authMigrationSuccess
var forceRefreshToken = force
if migrationDone != true {
if migrationDone != true && currentUser!.credentials.isReseller != true {
forceRefreshToken = true
}
......
......@@ -148,7 +148,7 @@ class LibremOneWelcomeViewController: UIViewController, UITextFieldDelegate {
private func logInToPIA(_ libremOneUser: LibremOneUser) {
let credentials = Credentials(username: libremOneUser.tunnelUser, password: libremOneUser.tunnelPassword)
let credentials = Credentials(username: libremOneUser.tunnelUser, password: libremOneUser.tunnelPassword, email: libremOneUser.username)
let request = LoginRequest(credentials: credentials)
accountProvider.login(with: request) { (user, error) in
......
......@@ -60,7 +60,7 @@ class MenuViewController: AutolayoutViewController {
private lazy var allItems: [[Item]] = [
[
.selectRegion,
.account,
//.account,
.settings,
.logout
], [
......
......@@ -5,6 +5,7 @@ use_frameworks!
# Libraries
$git_root = "https://github.com/pia-foss"
$git_root_library = "https://github.com/t0mmar"
$library_pod = 'PIALibrary'
$library_repo = 'client-library-apple'
......@@ -26,7 +27,7 @@ end
def library_by_git(sha)
$library_subspecs.each { |name|
pod "#{$library_pod}/#{name}", :git => "#{$git_root}/#{$library_repo}", :commit => sha
pod "#{$library_pod}/#{name}", :git => "#{$git_root_library}/#{$library_repo}", :commit => sha
}
end
......@@ -53,7 +54,7 @@ end
def shared_main_pods
pod 'AlamofireImage'
#library_by_path('')
library_by_git('746333f')
library_by_git('83563b20cb9e296a13269912c7e05b30f8c48645')
#library_by_version('~> 1.1.3')
end
......
......@@ -26,7 +26,7 @@ PODS:
- GoogleUtilities/Environment (~> 5.3)
- GoogleUtilities/UserDefaults (~> 5.3)
- FXPageControl (1.5)
- Gloss (2.0.1)
- Gloss (2.1.0)
- GoogleAppMeasurement (5.3.0):
- GoogleUtilities/AppDelegateSwizzler (~> 5.2)
- GoogleUtilities/MethodSwizzler (~> 5.2)
......@@ -105,10 +105,10 @@ DEPENDENCIES:
- HockeySDK
- iRate
- MBProgressHUD
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `746333f`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `746333f`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `746333f`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `746333f`)
- PIALibrary/Library (from `https://github.com/t0mmar/client-library-apple`, commit `83563b20cb9e296a13269912c7e05b30f8c48645`)
- PIALibrary/Mock (from `https://github.com/t0mmar/client-library-apple`, commit `83563b20cb9e296a13269912c7e05b30f8c48645`)
- PIALibrary/UI (from `https://github.com/t0mmar/client-library-apple`, commit `83563b20cb9e296a13269912c7e05b30f8c48645`)
- PIALibrary/VPN (from `https://github.com/t0mmar/client-library-apple`, commit `83563b20cb9e296a13269912c7e05b30f8c48645`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `269d6d1`)
- SideMenu (= 3.1.5)
- SwiftyJSON
......@@ -141,16 +141,16 @@ SPEC REPOS:
EXTERNAL SOURCES:
PIALibrary:
:commit: 746333f
:git: https://github.com/pia-foss/client-library-apple
:commit: 83563b20cb9e296a13269912c7e05b30f8c48645
:git: https://github.com/t0mmar/client-library-apple
PIATunnel:
:commit: 269d6d1
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
PIALibrary:
:commit: 746333f
:git: https://github.com/pia-foss/client-library-apple
:commit: 83563b20cb9e296a13269912c7e05b30f8c48645
:git: https://github.com/t0mmar/client-library-apple
PIATunnel:
:commit: 269d6d1
:git: https://github.com/pia-foss/tunnel-apple
......@@ -165,7 +165,7 @@ SPEC CHECKSUMS:
FirebaseCore: d16552f06821489ce1affe2e5e3e5593402ddfe3
FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
FXPageControl: 97620412515365d10a3282ec0660f49f6401a8f0
Gloss: 1e8743f8de1fbe14a97f220ff901cba91ae5f8f8
Gloss: 13ab6b4b0ff4cb2448466edc957479b1bccea8ba
GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727
GoogleUtilities: abb092d2c12e817fa3e0e7b274987dd72fb86ec3
HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b
......@@ -181,6 +181,6 @@ SPEC CHECKSUMS:
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: f67c25a75b7545b24fc1a89668fe567eb642d265
PODFILE CHECKSUM: 3a5da0f04897ce81d21d4e648fb176d22e6ebfd1
COCOAPODS: 1.5.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment