Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
liberty
tunnel
liberty-tunnel-ios
Commits
0518f7a0
Commit
0518f7a0
authored
Feb 01, 2019
by
Jose Blaya
Browse files
Refactor the process to update the auth token
parent
701f3edf
Changes
3
Hide whitespace changes
Inline
Side-by-side
PIA VPN/AccountProvider+Refresh.swift
View file @
0518f7a0
...
...
@@ -21,7 +21,8 @@ extension AccountProvider {
//Disconnect the VPN (if it's trying to reconnect)
forceRefreshToken
=
true
if
!
Client
.
providers
.
vpnProvider
.
isVPNConnected
{
if
Client
.
providers
.
vpnProvider
.
vpnStatus
==
.
connecting
||
Client
.
providers
.
vpnProvider
.
vpnStatus
==
.
disconnecting
{
Client
.
providers
.
vpnProvider
.
disconnect
({
[
weak
self
]
error
in
guard
let
_
=
error
as?
ClientError
else
{
self
?
.
refreshAccount
(
force
:
forceRefreshToken
)
...
...
PIA VPN/AppPreferences.swift
View file @
0518f7a0
...
...
@@ -119,7 +119,7 @@ class AppPreferences {
}
private
func
refreshAPIToken
()
{
if
Client
.
pr
oviders
.
accountProvider
.
isLoggedIn
{
if
Client
.
pr
eferences
.
authMigrationSuccess
==
false
{
Client
.
providers
.
accountProvider
.
refreshAndLogoutUnauthorized
(
force
:
true
)
}
}
...
...
@@ -138,18 +138,17 @@ class AppPreferences {
defaults
.
removeObject
(
forKey
:
"LoggedUsername"
)
defaults
.
synchronize
()
}
refreshAPIToken
()
}
func
migrate
()
{
let
oldVersion
=
defaults
.
string
(
forKey
:
Entries
.
version
)
defaults
.
set
(
AppPreferences
.
currentVersion
,
forKey
:
Entries
.
version
)
guard
(
oldVersion
==
nil
)
else
{
if
oldVersion
==
"4.0"
{
refreshAPIToken
()
}
else
if
oldVersion
!=
"4.0"
&&
oldVersion
!=
AppPreferences
.
currentVersion
{
if
oldVersion
!=
AppPreferences
.
currentVersion
||
!
Client
.
preferences
.
authMigrationSuccess
{
//First time for each update or if the auth token has not been updated
migrateAPItoV2
()
refreshAPIToken
()
}
return
}
...
...
PIA VPN/Bootstrapper.swift
View file @
0518f7a0
...
...
@@ -42,14 +42,14 @@ class Bootstrapper {
// Load the database first
Client
.
database
=
Client
.
Database
(
team
:
AppConstants
.
teamId
,
group
:
AppConstants
.
appGroup
)
AppPreferences
.
shared
.
migrate
()
// Check if should clean the account after delete the app and install again
if
Client
.
providers
.
accountProvider
.
shouldCleanAccount
{
//If first install, we need to ensure we don't have data from previous sessions in the Secure Keychain
Client
.
providers
.
accountProvider
.
cleanDatabase
()
}
AppPreferences
.
shared
.
migrate
()
// PIALibrary
guard
let
bundledRegionsURL
=
AppConstants
.
Regions
.
bundleURL
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment