diff options
| author | Jeroen Wijenbergh <jeroenwijenbergh@protonmail.com> | 2022-04-19 15:02:45 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-04-19 15:02:45 +0200 |
| commit | 723ecacc8528be0e96db42392f1781ddf5894bea (patch) | |
| tree | 1debf1d6d0c50adb32939db3cc84e5130d1fb818 /src/fsm.go | |
| parent | 5f40a8d10a17182f744cb7ac11087d170dd49560 (diff) | |
Profiles: Implement basic functionality for sending a profile_id
Diffstat (limited to 'src/fsm.go')
| -rw-r--r-- | src/fsm.go | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -23,6 +23,9 @@ const ( // Authenticated means the OAuth process has finished and the user is now authenticated with the server AUTHENTICATED + // Ask profile means the go code is asking for a profile selection from the ui + ASK_PROFILE + // Connected means the user has been connected to the server CONNECTED ) @@ -37,6 +40,8 @@ func (s FSMStateID) String() string { return "Chosen_Server" case OAUTH_STARTED: return "OAuth_Started" + case ASK_PROFILE: + return "Ask_Profile" case AUTHENTICATED: return "Authenticated" case CONNECTED: @@ -88,19 +93,21 @@ func (eduvpn *VPNState) writeGraph() { f.WriteString(graph) } -func (eduvpn *VPNState) GoTransition(newState FSMStateID, data string) bool { +func (eduvpn *VPNState) GoTransition(newState FSMStateID, data string) (bool, string) { ok := eduvpn.HasTransition(newState) + received := "" + if ok { oldState := eduvpn.FSM.Current eduvpn.FSM.Current = newState if eduvpn.Debug { eduvpn.writeGraph() } - eduvpn.StateCallback(oldState.String(), newState.String(), data) + received = eduvpn.StateCallback(oldState.String(), newState.String(), data) } - return ok + return ok, received } func (eduvpn *VPNState) generateDotGraph() string { @@ -141,7 +148,8 @@ func (eduvpn *VPNState) InitializeFSM() { NO_SERVER: {{CHOSEN_SERVER, "User chooses a server"}}, CHOSEN_SERVER: {{AUTHENTICATED, "Found tokens in config"}, {OAUTH_STARTED, "No tokens found in config"}}, OAUTH_STARTED: {{AUTHENTICATED, "User authorizes with browser"}}, - AUTHENTICATED: {{CONNECTED, "OS reports connected"}, {OAUTH_STARTED, "Re-authenticate with OAuth"}}, + AUTHENTICATED: {{CONNECTED, "OS reports connected"}, {OAUTH_STARTED, "Re-authenticate with OAuth"}, {ASK_PROFILE, "Connect, multiple profiles detected"}}, + ASK_PROFILE: {{CONNECTED, "OS reports connected"}}, CONNECTED: {{AUTHENTICATED, "OS reports disconnected"}}, }, Current: DEREGISTERED, |