don't overwrite access token in secrets file; use state instead

If access token is provided in secrets file at startup time, should
copy into runtime state.

Author: yasunariw

lib/action.ml

@@ -236,7 +236,7 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
   let process_slack_oauth (ctx : Context.t) args =
     try%lwt
       let secrets = Context.get_secrets_exn ctx in
-      match secrets.slack_access_token with
+      match ctx.state.slack_access_token with
       | Some _ -> Lwt.return "ok"
       | None ->
       match Slack.validate_state ?oauth_state:secrets.slack_oauth_state ~args with
@@ -245,9 +245,18 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
       match List.Assoc.find args "code" ~equal:String.equal with
       | None -> action_error "argument `code` not found in slack authorization request"
       | Some code ->
-        ( match%lwt Slack_api.update_access_token_of_context ~ctx ~code with
+        ( match%lwt Slack_api.access_token_of_code ~ctx ~code with
         | Error e -> action_error e
-        | Ok () -> Lwt.return "ok"
+        | Ok access_token ->
+          State.set_slack_access_token ctx.state access_token;
+          ( match ctx.state_filepath with
+          | None -> Lwt.return "ok"
+          | Some path ->
+            ( match%lwt State.save ctx.state path with
+            | Ok () -> Lwt.return "ok"
+            | Error e -> action_error e
+            )
+          )
         )
     with
     | Yojson.Json_error msg ->

lib/api.ml

@@ -11,5 +11,5 @@ end
 module type Slack = sig
   val send_notification : ctx:Context.t -> msg:post_message_req -> (unit, string) Result.t Lwt.t
 
-  val update_access_token_of_context : ctx:Context.t -> code:string -> (unit, string) Result.t Lwt.t
+  val access_token_of_code : ctx:Context.t -> code:string -> (string, string) Result.t Lwt.t
 end

lib/api_local.ml

@@ -20,19 +20,25 @@ module Github : Api.Github = struct
     | Ok file -> Lwt.return @@ Ok (Github_j.api_commit_of_string file)
 end
 
+module Slack_base : Api.Slack = struct
+  let send_notification ~ctx:_ ~msg:_ = Lwt.return @@ Error "undefined for local setup"
+
+  let access_token_of_code ~ctx:_ ~code:_ = Lwt.return @@ Error "undefined for local setup"
+end
+
 module Slack : Api.Slack = struct
   let send_notification ~ctx:_ ~msg =
     let json = msg |> Slack_j.string_of_post_message_req |> Yojson.Basic.from_string |> Yojson.Basic.pretty_to_string in
     Stdio.printf "will notify #%s\n" msg.channel;
     Stdio.printf "%s\n" json;
     Lwt.return @@ Ok ()
 
-  let update_access_token_of_context ~ctx:_ ~code:_ =
-    Stdio.printf "will generate token\n";
-    Lwt.return @@ Ok ()
+  let access_token_of_code ~ctx:_ ~code = Lwt.return @@ Ok (Printf.sprintf "token of code %s" code)
 end
 
 module Slack_simple : Api.Slack = struct
+  include Slack_base
+
   let log = Log.from "slack"
 
   let send_notification ~ctx:_ ~(msg : Slack_t.post_message_req) =
@@ -42,11 +48,11 @@ module Slack_simple : Api.Slack = struct
       | Some s -> Printf.sprintf " with %S" s
       );
     Lwt.return @@ Ok ()
-
-  let update_access_token_of_context ~ctx:_ ~code:_ = Lwt.return @@ Error "undefined for local setup"
 end
 
 module Slack_json : Api.Slack = struct
+  include Slack_base
+
   let log = Log.from "slack"
 
   let send_notification ~ctx:_ ~msg =
@@ -57,6 +63,4 @@ module Slack_json : Api.Slack = struct
     log#info "%s" (Uri.to_string url);
     log#info "%s" json;
     Lwt.return @@ Ok ()
-
-  let update_access_token_of_context ~ctx:_ ~code:_ = Lwt.return @@ Error "undefined for local setup"
 end

lib/api_remote.ml

@@ -102,14 +102,4 @@ module Slack : Api.Slack = struct
         | None, None -> Lwt.return @@ Error "an unknown error occurred while getting access token"
         )
       )
-
-  let update_access_token_of_context ~ctx ~code =
-    let secrets = Context.get_secrets_exn ctx in
-    match%lwt access_token_of_code ~ctx ~code with
-    | Error e -> Lwt.return @@ Error e
-    | Ok access_token ->
-      let secrets = { secrets with slack_access_token = Some access_token } in
-      ctx.secrets <- Some secrets;
-      let data = Config_j.string_of_secrets secrets |> Yojson.Basic.from_string |> Yojson.Basic.pretty_to_string in
-      Lwt.return @@ write_to_local_file ~data ctx.secrets_filepath
 end

lib/context.ml

@@ -86,6 +86,12 @@ let refresh_state ctx =
       | Error e -> fmt_error "error while getting local file: %s\nfailed to get state from file %s" e path
       | Ok file ->
         let state = State_j.state_of_string file in
+        let secrets = get_secrets_exn ctx in
+        begin
+          match secrets.slack_access_token with
+          | None -> ()
+          | Some token -> State.set_slack_access_token ctx.state token
+        end;
         Ok { ctx with state }
     end
     else Ok ctx

lib/state.atd

@@ -14,5 +14,6 @@ type pipeline_statuses = branch_statuses map_as_object
 
 (* The serializable runtime state of the bot *)
 type state = {
-  pipeline_statuses <ocaml mutable>: pipeline_statuses
+  pipeline_statuses <ocaml mutable>: pipeline_statuses;
+  ?slack_access_token <ocaml mutable>: string nullable;
 }

lib/state.ml

@@ -2,7 +2,7 @@ open Base
 open Common
 open Devkit
 
-let empty : State_t.state = { pipeline_statuses = StringMap.empty }
+let empty : State_t.state = { pipeline_statuses = StringMap.empty; slack_access_token = None }
 
 let refresh_pipeline_status (state : State_t.state) ~pipeline ~(branches : Github_t.branch list) ~status =
   let update_pipeline_status branch_statuses =
@@ -12,6 +12,8 @@ let refresh_pipeline_status (state : State_t.state) ~pipeline ~(branches : Githu
   in
   state.pipeline_statuses <- Map.update state.pipeline_statuses pipeline ~f:update_pipeline_status
 
+let set_slack_access_token (state : State_t.state) access_token = state.slack_access_token <- Some access_token
+
 let log = Log.from "state"
 
 let save state path =