From c18366401ee53f48df5e0ec49b26c56e06b7eac6 Mon Sep 17 00:00:00 2001 From: Thomas Schank Date: Fri, 14 Jul 2017 15:49:15 +0200 Subject: [PATCH] 0.7.3 Extend auth-info with type, show info when connected as ApiClient --- app/dev/releases.json | 2 +- app/prod/releases.json | 2 +- electron_front/src/all/madek/app/front/connection.cljs | 4 +++- jvm_main/src/madek/app/server/connection.clj | 3 ++- releases.yml | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/dev/releases.json b/app/dev/releases.json index 8d02f8d..d707d35 100644 --- a/app/dev/releases.json +++ b/app/dev/releases.json @@ -1 +1 @@ -[{"version_major":0,"version_minor":7,"version_patch":2,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename from \"Madek Exporter\" to \"Madek-Exporter\"\n\nFixes\n=====\n\n* Fix sign in as API-client.\n* Hide secrets by default: do not show \"internal\" connection parameters\n (password etc) in connection panel.\n"},{"version_major":0,"version_minor":6,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Improve the UX of the sign-in page: swapping tags deletes existing sign in info.\n\nFixes\n=====\n\n* Fix sign in with login and password.\n"},{"version_major":0,"version_minor":5,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename the application from \"Madek APP\" to \"Madek Exporter\".\n* Include release info.\n\nFixes\n=====\n\n* Fix export of meta-data of the Type MetaDatum::TextType.\n* Disconnect on the connection page will now delete the saved token, too.\n* Fix spelling and unnecessary involved language in many places.\n"}] \ No newline at end of file +[{"version_major":0,"version_minor":7,"version_patch":3,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename from \"Madek Exporter\" to \"Madek-Exporter\"\n\nFixes\n=====\n\n* Fix sign in as API-client.\n* Extend auth-info with type, show auth-info when connected as ApiClient.\n* Hide secrets by default: do not show \"internal\" connection parameters\n (password etc) in connection panel.\n"},{"version_major":0,"version_minor":6,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Improve the UX of the sign-in page: swapping tags deletes existing sign in info.\n\nFixes\n=====\n\n* Fix sign in with login and password.\n"},{"version_major":0,"version_minor":5,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename the application from \"Madek APP\" to \"Madek Exporter\".\n* Include release info.\n\nFixes\n=====\n\n* Fix export of meta-data of the Type MetaDatum::TextType.\n* Disconnect on the connection page will now delete the saved token, too.\n* Fix spelling and unnecessary involved language in many places.\n"}] \ No newline at end of file diff --git a/app/prod/releases.json b/app/prod/releases.json index 8d02f8d..d707d35 100644 --- a/app/prod/releases.json +++ b/app/prod/releases.json @@ -1 +1 @@ -[{"version_major":0,"version_minor":7,"version_patch":2,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename from \"Madek Exporter\" to \"Madek-Exporter\"\n\nFixes\n=====\n\n* Fix sign in as API-client.\n* Hide secrets by default: do not show \"internal\" connection parameters\n (password etc) in connection panel.\n"},{"version_major":0,"version_minor":6,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Improve the UX of the sign-in page: swapping tags deletes existing sign in info.\n\nFixes\n=====\n\n* Fix sign in with login and password.\n"},{"version_major":0,"version_minor":5,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename the application from \"Madek APP\" to \"Madek Exporter\".\n* Include release info.\n\nFixes\n=====\n\n* Fix export of meta-data of the Type MetaDatum::TextType.\n* Disconnect on the connection page will now delete the saved token, too.\n* Fix spelling and unnecessary involved language in many places.\n"}] \ No newline at end of file +[{"version_major":0,"version_minor":7,"version_patch":3,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename from \"Madek Exporter\" to \"Madek-Exporter\"\n\nFixes\n=====\n\n* Fix sign in as API-client.\n* Extend auth-info with type, show auth-info when connected as ApiClient.\n* Hide secrets by default: do not show \"internal\" connection parameters\n (password etc) in connection panel.\n"},{"version_major":0,"version_minor":6,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Improve the UX of the sign-in page: swapping tags deletes existing sign in info.\n\nFixes\n=====\n\n* Fix sign in with login and password.\n"},{"version_major":0,"version_minor":5,"version_patch":0,"version_pre":null,"version_build":null,"name":null,"description":"\nChanges\n=======\n\n* Rename the application from \"Madek APP\" to \"Madek Exporter\".\n* Include release info.\n\nFixes\n=====\n\n* Fix export of meta-data of the Type MetaDatum::TextType.\n* Disconnect on the connection page will now delete the saved token, too.\n* Fix spelling and unnecessary involved language in many places.\n"}] \ No newline at end of file diff --git a/electron_front/src/all/madek/app/front/connection.cljs b/electron_front/src/all/madek/app/front/connection.cljs index b65bc97..7d9eb26 100644 --- a/electron_front/src/all/madek/app/front/connection.cljs +++ b/electron_front/src/all/madek/app/front/connection.cljs @@ -193,7 +193,9 @@ [:div.panel.panel-body [:p.text-success "Your are connected to " [:code (-> @connection* :url)] - " as " [:code [:em (-> @connection* :email_address)]] "."]]]]) + " as " [:code [:em (-> @connection* :auth-info :type)]] " " + [:em (or (-> @connection* :auth-info :email_address presence) + (-> @connection* :auth-info :login presence))] "."]]]]) (defn connection-pending-component [] [:div.pending diff --git a/jvm_main/src/madek/app/server/connection.clj b/jvm_main/src/madek/app/server/connection.clj index 657559e..3db0b24 100644 --- a/jvm_main/src/madek/app/server/connection.clj +++ b/jvm_main/src/madek/app/server/connection.clj @@ -49,7 +49,8 @@ (assoc-in db [:connection] conn-params)) (merge (select-keys connect-body [:url]) - {:http-options http-options} + {:http-options http-options + :auth-info auth-info} (select-keys auth-info [:login :email_address]))) {:status 202}))))) (catch Exception e diff --git a/releases.yml b/releases.yml index 8d6d7ed..d2cf3de 100644 --- a/releases.yml +++ b/releases.yml @@ -1,8 +1,8 @@ -##### 0.7.2 ####################################################################### +##### 0.7.3 ####################################################################### - version_major: 0 version_minor: 7 - version_patch: 2 + version_patch: 3 version_pre: NULL version_build: NULL name: NULL @@ -18,6 +18,7 @@ ===== * Fix sign in as API-client. + * Extend auth-info with type, show auth-info when connected as ApiClient. * Hide secrets by default: do not show "internal" connection parameters (password etc) in connection panel.