@@ -11,6 +11,8 @@

                  :aws-sdk/services/sts

                  :cells

                  :fset

+                 :dexador

+                 :quri

                  :cxml

                  :daydreamer

                  :fwoar-lisputils

@@ -67,17 +67,23 @@

 (defgeneric execute-action (action interface)

   (:method ((action (eql :|Open Web Console|)) (interface mfa-tool))

-    (open-url (signin-url interface)))

+    (let* ((credentials (current-credentials interface))

+           (parser (fw.lu:new 'sts-result-handler credentials))

+           (federation-url (url parser))

+           (signin-token (gethash "SigninToken"

+                                  (yason:parse

+                                   (dexador:get federation-url)))))

+      (open-url (url-from-signin-token signin-token))))

   (:method ((action (eql :|Authorize iTerm|)) (interface mfa-tool))

-    (uiop:run-program (format nil "osascript '~a'" 

-                              (probe-file 

-                               (merge-pathnames (make-pathname :name "AuthorizeShell" :type "scpt") 

+    (uiop:run-program (format nil "osascript '~a'"

+                              (probe-file

+                               (merge-pathnames (make-pathname :name "AuthorizeShell" :type "scpt")

                                                 (bundle-resource-root))))))

   (:method ((action (eql :|Cloudformation Stacks|)) (interface mfa-tool))

-   (let ((stack-interface (make-instance 'mfa-tool.stack:stack-interface

-                                         :credentials (current-credentials interface))))

-     (mfa-tool.store:dispatch stack-interface :|Get Stacks|)

-     (capi:display stack-interface)))

+    (let ((stack-interface (make-instance 'mfa-tool.stack:stack-interface

+                                          :credentials (current-credentials interface))))

+      (mfa-tool.store:dispatch stack-interface :|Get Stacks|)

+      (capi:display stack-interface)))

   (:method ((action (eql :|Lisp REPL|)) (interface mfa-tool))

     (capi:contain (make-instance 'capi:listener-pane)

                   :best-width 1280

@@ -171,11 +177,11 @@

         *accounts* (reprocess-accounts (load-accounts accounts))

         aws:*session* (mfa-tool.credential-provider:make-aws-session))

   (ubiquitous:restore :cj.mfa-tool)

-  (interface :default-account 

+  (interface :default-account

              (ubiquitous:value :default-account)))

 (defun start-in-repl

-    (&optional (accounts (asdf:system-relative-pathname :aws-access "accounts"

+    (&optional (accounts (asdf:system-relative-pathname :aws-access "assets/accounts"

                                                         :type "json")))

   (run accounts))

@@ -33,21 +33,24 @@

                                     (yason:encode params s))

                                   :space-to-plus t)))

-(cells:defmodel 

-    sts-result-handler ()

-  ((api-result :initarg :api-result :accessor api-result :initform (cells:c-in nil))

-   (credentials :reader credentials

-                :initform (cells:c? (serapeum:assocdr "Credentials" (^api-result)

-                                                      :test 'equal)))

+(cells:defmodel sts-result-handler ()

+  ((credentials :accessor credentials :initarg :credentials

+                :initform (cells:c-in nil))

    (session-id :reader session-id

-               :initform (cells:c? (serapeum:assocadr "AccessKeyId" (^credentials)

-                                                      :test 'equal)))

+               :initform (cells:c? (typecase (^credentials)

+                                     (aws:credentials (aws-sdk/credentials/base:credentials-access-key-id (^credentials)))

+                                     (cons (serapeum:assocadr "AccessKeyId" (^credentials)

+                                                              :test 'equal)))))

    (session-key :reader session-key 

-                :initform (cells:c? (serapeum:assocadr "SecretAccessKey" (^credentials)

-                                                       :test 'equal)))

+                :initform (cells:c? (typecase (^credentials)

+                                      (aws:credentials (aws-sdk/credentials/base:credentials-secret-access-key (^credentials)))

+                                      (cons (serapeum:assocadr "SecretAccessKey" (^credentials)

+                                                               :test 'equal)))))

    (session-token :reader session-token 

-                  :initform (cells:c? (serapeum:assocadr "SessionToken" (^credentials)

-                                                         :test 'equal)))

+                  :initform (cells:c? (typecase (^credentials)

+                                        (aws:credentials (aws-sdk/credentials/base:credentials-session-token (^credentials)))

+                                        (cons (serapeum:assocadr "SessionToken" (^credentials)

+                                                                 :test 'equal)))))

    (url-params :reader url-params 

                :initform (cells:c? (fw.lu:alist-string-hash-table

                                     `(("sessionId" . ,(^session-id))

@@ -93,8 +96,10 @@

                                      :test-function (lambda (c)

                                                       (and (find-restart 'continue)

                                                            (typep c 'aws:no-credentials)))))

-    (let* ((api-result (cells:c-in (do-auth user role token)))

-           (parser (make-instance 'sts-result-handler :api-result api-result))

+    (let* ((api-result (do-auth user role token))

+           (parser (make-instance 'sts-result-handler

+                                  :credentials (serapeum:assocdr "Credentials" api-result

+                                                                 :test 'equal)))

            (federation-url (url parser))

            (signin-token (gethash "SigninToken" 

                                   (yason:parse

@@ -11,4 +11,6 @@

                 #:cj-organization-role-arn

                 #:cj-developer-role

                 #:arn-for)

-  (:export :main))

+  (:export :main

+   :url

+           :sts-result-handler))