Add details on Policy for Service Account (#132)

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>

.github/workflows/go.yml

@@ -18,21 +18,19 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Build on ${{ matrix.os }}
         env:
           GO111MODULE: on
           GOOS: linux
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
-          $(go env GOPATH)/bin/golangci-lint run --timeout=5m --config ./.golangci.yml
-          go mod vendor
-          go test -v -race ./...
+          make verifiers
+          make test
           make mcs

.golangci.yml

@@ -1,4 +1,7 @@
 linters-settings:
+  golint:
+    min-confidence: 0
+
   misspell:
     locale: US
 
@@ -14,4 +17,8 @@ linters:
     - gosimple
     - deadcode
     - unparam
+    - unused
     - structcheck
+
+service:
+  golangci-lint-version: 1.21.0 # use the fixed version to not introduce new linters unexpectedly

CREDITS

@@ -940,6 +940,33 @@ https://github.com/Azure/go-autorest
 
 ================================================================
 
+github.com/BurntSushi/toml
+https://github.com/BurntSushi/toml
+----------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) 2013 TOML authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+================================================================
+
 github.com/PuerkitoBio/purell
 https://github.com/PuerkitoBio/purell
 ----------------------------------------------------------------
@@ -1148,33 +1175,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ================================================================
 
-github.com/baiyubin/aliyun-sts-go-sdk
-https://github.com/baiyubin/aliyun-sts-go-sdk
-----------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) Aliyun.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-================================================================
-
 github.com/bcicen/jstream
 https://github.com/bcicen/jstream
 ----------------------------------------------------------------
@@ -7113,34 +7113,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================
 
-github.com/gorilla/websocket
-https://github.com/gorilla/websocket
-----------------------------------------------------------------
-Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================
-
 github.com/grpc-ecosystem/go-grpc-middleware
 https://github.com/grpc-ecosystem/go-grpc-middleware
 ----------------------------------------------------------------
@@ -13042,33 +13014,6 @@ SOFTWARE.
 
 ================================================================
 
-github.com/mattn/go-colorable
-https://github.com/mattn/go-colorable
-----------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2016 Yasuhiro Matsumoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-================================================================
-
 github.com/mattn/go-ieproxy
 https://github.com/mattn/go-ieproxy
 ----------------------------------------------------------------
@@ -13113,21 +13058,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ================================================================
 
-github.com/mattn/go-isatty
-https://github.com/mattn/go-isatty
-----------------------------------------------------------------
-Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
-
-MIT License (Expat)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-================================================================
-
 github.com/mattn/go-runewidth
 https://github.com/mattn/go-runewidth
 ----------------------------------------------------------------
@@ -14107,422 +14037,6 @@ https://github.com/minio/minio
 
 ================================================================
 
-github.com/minio/minio
-https://github.com/minio/minio
-----------------------------------------------------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-================================================================
-
-github.com/minio/minio-go/v6
-https://github.com/minio/minio-go/v6
-----------------------------------------------------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-================================================================
-
 github.com/minio/minio-go/v6
 https://github.com/minio/minio-go/v6
 ----------------------------------------------------------------
@@ -19918,33 +19432,6 @@ THE SOFTWARE.
 
 ================================================================
 
-github.com/sirupsen/logrus
-https://github.com/sirupsen/logrus
-----------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-================================================================
-
 github.com/smartystreets/assertions
 https://github.com/smartystreets/assertions
 ----------------------------------------------------------------
@@ -21538,8 +21025,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================
 
-golang.org/x/crypto
-https://golang.org/x/crypto
+golang.org/x/mod
+https://golang.org/x/mod
 ----------------------------------------------------------------
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -21802,6 +21289,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================
 
+golang.org/x/xerrors
+https://golang.org/x/xerrors
+----------------------------------------------------------------
+Copyright (c) 2019 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================
+
 google.golang.org/api
 https://google.golang.org/api
 ----------------------------------------------------------------
@@ -22762,203 +22282,6 @@ third-party archives.
 
 ================================================================
 
-gopkg.in/ini.v1
-https://gopkg.in/ini.v1
-----------------------------------------------------------------
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright 2014 Unknwon
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-================================================================
-
 gopkg.in/jcmturner/aescts.v1
 https://gopkg.in/jcmturner/aescts.v1
 ----------------------------------------------------------------

Makefile

@@ -6,7 +6,23 @@ default: mcs
 .PHONY: mcs
 mcs:
 	@echo "Building mcs binary to './mcs'"
-	@(CGO_ENABLED=0 go build -trimpath --tags=kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
+	@(GO111MODULE=on CGO_ENABLED=0 go build -trimpath --tags=kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
+
+getdeps:
+	@mkdir -p ${GOPATH}/bin
+	@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.27.0)
+
+verifiers: getdeps fmt lint
+
+fmt:
+	@echo "Running $@ check"
+	@GO111MODULE=on gofmt -d cmd/
+	@GO111MODULE=on gofmt -d pkg/
+
+lint:
+	@echo "Running $@ check"
+	@GO111MODULE=on ${GOPATH}/bin/golangci-lint cache clean
+	@GO111MODULE=on ${GOPATH}/bin/golangci-lint run --timeout=5m --config ./.golangci.yml
 
 install: mcs
 	@echo "Installing mcs binary to '$(GOPATH)/bin/mcs'"
@@ -21,11 +37,11 @@ assets:
 	@(cd portal-ui; yarn install; make build-static; cd ..)
 
 test:
-	@(go test -race -v github.com/minio/mcs/restapi/...)
-	@(go test -race -v github.com/minio/mcs/pkg/auth/...)
+	@(GO111MODULE=on go test -race -v github.com/minio/mcs/restapi/...)
+	@(GO111MODULE=on go test -race -v github.com/minio/mcs/pkg/...)
 
 coverage:
-	@(go test -v -coverprofile=coverage.out github.com/minio/mcs/restapi/... && go tool cover -html=coverage.out && open coverage.html)
+	@(GO111MODULE=on go test -v -coverprofile=coverage.out github.com/minio/mcs/restapi/... && go tool cover -html=coverage.out && open coverage.html)
 
 clean:
 	@echo "Cleaning up all the generated files"

README.md

@@ -14,31 +14,30 @@ $ mc admin user add myminio mcs YOURMCSSECRET
 $ set -o history
 ```
 
-2. Create a policy for `mcs`
+2. Create a policy for `mcs` with access to everything (for testing and debugging)
 
 ```
 $ cat > mcsAdmin.json << EOF
 {
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Action": [
-        "admin:*"
-      ],
-      "Effect": "Allow",
-      "Sid": ""
-    },
-    {
-      "Action": [
-        "s3:*"
-      ],
-      "Effect": "Allow",
-      "Resource": [
-        "arn:aws:s3:::*"
-      ],
-      "Sid": ""
-    }
-  ]
+	"Version": "2012-10-17",
+	"Statement": [{
+			"Action": [
+				"admin:*"
+			],
+			"Effect": "Allow",
+			"Sid": ""
+		},
+		{
+			"Action": [
+                "s3:*"
+			],
+			"Effect": "Allow",
+			"Resource": [
+				"arn:aws:s3:::*"
+			],
+			"Sid": ""
+		}
+	]
 }
 EOF
 $ mc admin policy add myminio mcsAdmin mcsAdmin.json
@@ -50,6 +49,49 @@ $ mc admin policy add myminio mcsAdmin mcsAdmin.json
 $ mc admin policy set myminio mcsAdmin user=mcs
 ```
 
+
+### Note
+Additionally, you can create policies to limit the privileges for `mcs` users, for example, if you want the user to only have access to dashboard, buckets, notifications and watch page, the policy should look like this:
+```
+{
+	"Version": "2012-10-17",
+	"Statement": [{
+			"Action": [
+				"admin:ServerInfo",
+			],
+			"Effect": "Allow",
+			"Sid": ""
+		},
+		{
+			"Action": [
+				"s3:ListenBucketNotification",
+				"s3:PutBucketNotification",
+				"s3:GetBucketNotification",
+				"s3:ListMultipartUploadParts",
+				"s3:ListBucketMultipartUploads",
+				"s3:ListBucket",
+				"s3:HeadBucket",
+				"s3:GetObject",
+				"s3:GetBucketLocation",
+				"s3:AbortMultipartUpload",
+				"s3:CreateBucket",
+				"s3:PutObject",
+				"s3:DeleteObject",
+				"s3:DeleteBucket",
+				"s3:PutBucketPolicy",
+				"s3:DeleteBucketPolicy",
+				"s3:GetBucketPolicy"
+			],
+			"Effect": "Allow",
+			"Resource": [
+				"arn:aws:s3:::*"
+			],
+			"Sid": ""
+		}
+	]
+}
+```
+
 ## Run MCS server
 To run the server:
 

go.mod

@@ -17,8 +17,8 @@ require (
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/json-iterator/go v1.1.9
 	github.com/minio/cli v1.22.0
-	github.com/minio/mc v0.0.0-20200515191050-09c31c4ab28c
-	github.com/minio/minio v0.0.0-20200501193630-d1c8e9f31ba0
+	github.com/minio/mc v0.0.0-20200515235434-3b479cf92ed6
+	github.com/minio/minio v0.0.0-20200516011754-9cac385aecdb
 	github.com/minio/minio-go/v6 v6.0.56-0.20200502013257-a81c8c13cc3f
 	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
 	github.com/satori/go.uuid v1.2.0

go.sum

@@ -239,6 +239,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -338,12 +339,16 @@ github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eT
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/cpuid v1.2.2 h1:1xAgYebNnsb9LKCdLOvFWtAxGU/33mjJtyOVbmUa0Us=
 github.com/klauspost/cpuid v1.2.2/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid v1.2.4 h1:EBfaK0SWSwk+fgk6efYFWdzl8MwRWoOO1gkmiaTXPW4=
+github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM=
 github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/readahead v1.3.1 h1:QqXNYvm+VvqYcbrRT4LojUciM0XrznFRIDrbHiJtu/0=
 github.com/klauspost/readahead v1.3.1/go.mod h1:AH9juHzNH7xqdqFHrMRSHeH2Ps+vFf+kblDqzPFiLJg=
 github.com/klauspost/reedsolomon v1.9.3 h1:N/VzgeMfHmLc+KHMD1UL/tNkfXAt8FnUqlgXGIduwAY=
 github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
+github.com/klauspost/reedsolomon v1.9.7 h1:+azeqnT4iNG9UEcWC+7utJ4xXQ9S8pSlkZor0DOArEQ=
+github.com/klauspost/reedsolomon v1.9.7/go.mod h1:+8WD025Xpby8/kG5h/HDPIFhiiuGEtZOKw+5Y4drAD8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -399,15 +404,14 @@ github.com/minio/highwayhash v1.0.0 h1:iMSDhgUILCr0TNm8LWlSjF8N0ZIj2qbO8WHp6Q/J2
 github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc=
 github.com/minio/lsync v1.0.1 h1:AVvILxA976xc27hstd1oR+X9PQG0sPSom1MNb1ImfUs=
 github.com/minio/lsync v1.0.1/go.mod h1:tCFzfo0dlvdGl70IT4IAK/5Wtgb0/BrTmo/jE8pArKA=
-github.com/minio/mc v0.0.0-20200515191050-09c31c4ab28c h1:G4ZTNwiiJ73folxqNXZpWQofxus2fGJG7hKxYNrtvRM=
-github.com/minio/mc v0.0.0-20200515191050-09c31c4ab28c/go.mod h1:U3Jgk0bcSjn+QPUMisrS6nxCWOoQ6rYWSvLCB30apuU=
+github.com/minio/mc v0.0.0-20200515235434-3b479cf92ed6 h1:2SrKe2vLDLwvnYkYrJelrzyGW8t/8HCbr9yDsw+8XSI=
+github.com/minio/mc v0.0.0-20200515235434-3b479cf92ed6/go.mod h1:U3Jgk0bcSjn+QPUMisrS6nxCWOoQ6rYWSvLCB30apuU=
 github.com/minio/minio v0.0.0-20200421050159-282c9f790a03/go.mod h1:zBua5AiljGs1Irdl2XEyiJjvZVCVDIG8gjozzRBcVlw=
-github.com/minio/minio v0.0.0-20200501193630-d1c8e9f31ba0 h1:QxIz36O01LbKqJiz6HKeKCOC2afgydspkpahQ807msY=
-github.com/minio/minio v0.0.0-20200501193630-d1c8e9f31ba0/go.mod h1:Vhlqz7Se0EgpgFiVxpvzF4Zz/h2LMx+EPKH96Aera5U=
+github.com/minio/minio v0.0.0-20200516011754-9cac385aecdb h1:CQC7D3UDnUycuxhwImcVhMSLet/RbShosAnYcvMtEB8=
+github.com/minio/minio v0.0.0-20200516011754-9cac385aecdb/go.mod h1:wymaytM/HELuwdz7BGZHmQ3XKq2SxPsLeGxyOCaCLiA=
 github.com/minio/minio-go/v6 v6.0.53 h1:8jzpwiOzZ5Iz7/goFWqNZRICbyWYShbb5rARjrnSCNI=
 github.com/minio/minio-go/v6 v6.0.53/go.mod h1:DIvC/IApeHX8q1BAMVCXSXwpmrmM+I+iBvhvztQorfI=
-github.com/minio/minio-go/v6 v6.0.55-0.20200424204115-7506d2996b22 h1:nZEve4vdUhwHBoV18zRvPDgjL6NYyDJE5QJvz3l9bRs=
-github.com/minio/minio-go/v6 v6.0.55-0.20200424204115-7506d2996b22/go.mod h1:KQMM+/44DSlSGSQWSfRrAZ12FVMmpWNuX37i2AX0jfI=
+github.com/minio/minio-go/v6 v6.0.55-0.20200425081427-89eebdef2af0/go.mod h1:KQMM+/44DSlSGSQWSfRrAZ12FVMmpWNuX37i2AX0jfI=
 github.com/minio/minio-go/v6 v6.0.56-0.20200502013257-a81c8c13cc3f h1:ifHrI8+exqLi5RztIWWKS5k+Wu+W7DJisVXwNaCH2zs=
 github.com/minio/minio-go/v6 v6.0.56-0.20200502013257-a81c8c13cc3f/go.mod h1:KQMM+/44DSlSGSQWSfRrAZ12FVMmpWNuX37i2AX0jfI=
 github.com/minio/parquet-go v0.0.0-20200414234858-838cfa8aae61 h1:pUSI/WKPdd77gcuoJkSzhJ4wdS8OMDOsOu99MtpXEQA=
@@ -609,11 +613,19 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.11.0 h1:gSmpCfs+R47a4yQPAI4xJ0IPDLTRGXskm6UelqNXpqE=
 go.uber.org/zap v1.11.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
+go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 golang.org/x/arch v0.0.0-20190909030613-46d78d1859ac/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -622,6 +634,7 @@ golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -637,6 +650,9 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -717,8 +733,11 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190914235951-31e00f45c22e h1:nOOVVcLC+/3MeovP40q5lCiWmP1Z1DaN8yn8ngU63hw=
 golang.org/x/tools v0.0.0-20190914235951-31e00f45c22e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 h1:Xvf3ZQTm5bjXPxhI7g+dwqsCqadK1rcNtwtszuatetk=
 golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -788,4 +807,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

models/session_response.go

@@ -36,6 +36,9 @@ import (
 // swagger:model sessionResponse
 type SessionResponse struct {
 
+	// pages
+	Pages []string `json:"pages"`
+
 	// status
 	// Enum: [ok]
 	Status string `json:"status,omitempty"`

pkg/acl/endpoints.go

@@ -0,0 +1,278 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package acl
+
+import iampolicy "github.com/minio/minio/pkg/iam/policy"
+
+// endpoints definition
+var (
+	configuration   = "/configurations-list"
+	users           = "/users"
+	groups          = "/groups"
+	iamPolicies     = "/policies"
+	dashboard       = "/dashboard"
+	profiling       = "/profiling"
+	trace           = "/trace"
+	logs            = "/logs"
+	watch           = "/watch"
+	notifications   = "/notification-endpoints"
+	buckets         = "/buckets"
+	bucketDetails   = "/buckets/:bucketName"
+	serviceAccounts = "/service-accounts"
+)
+
+type ConfigurationActionSet struct {
+	actionTypes iampolicy.ActionSet
+	actions     iampolicy.ActionSet
+}
+
+// configurationActionSet contains the list of admin actions required for this endpoint to work
+var configurationActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ConfigUpdateAdminAction,
+	),
+}
+
+// logsActionSet contains the list of admin actions required for this endpoint to work
+var logsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ConsoleLogAdminAction,
+	),
+}
+
+// dashboardActionSet contains the list of admin actions required for this endpoint to work
+var dashboardActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ServerInfoAdminAction,
+	),
+}
+
+// groupsActionSet contains the list of admin actions required for this endpoint to work
+var groupsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ListGroupsAdminAction,
+		iampolicy.AddUserToGroupAdminAction,
+		//iampolicy.GetGroupAdminAction,
+		iampolicy.EnableGroupAdminAction,
+		iampolicy.DisableGroupAdminAction,
+	),
+}
+
+// iamPoliciesActionSet contains the list of admin actions required for this endpoint to work
+var iamPoliciesActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.GetPolicyAdminAction,
+		iampolicy.DeletePolicyAdminAction,
+		iampolicy.CreatePolicyAdminAction,
+		iampolicy.AttachPolicyAdminAction,
+		iampolicy.ListUserPoliciesAdminAction,
+	),
+}
+
+// profilingActionSet contains the list of admin actions required for this endpoint to work
+var profilingActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ProfilingAdminAction,
+	),
+}
+
+// traceActionSet contains the list of admin actions required for this endpoint to work
+var traceActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.TraceAdminAction,
+	),
+}
+
+// usersActionSet contains the list of admin actions required for this endpoint to work
+var usersActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ListUsersAdminAction,
+		iampolicy.CreateUserAdminAction,
+		iampolicy.DeleteUserAdminAction,
+		iampolicy.GetUserAdminAction,
+		iampolicy.EnableUserAdminAction,
+		iampolicy.DisableUserAdminAction,
+	),
+}
+
+// watchActionSet contains the list of admin actions required for this endpoint to work
+var watchActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ListenBucketNotificationAction,
+	),
+}
+
+// notificationsActionSet contains the list of admin actions required for this endpoint to work
+var notificationsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ListenBucketNotificationAction,
+		iampolicy.PutBucketNotificationAction,
+		iampolicy.GetBucketNotificationAction,
+	),
+}
+
+// bucketsActionSet contains the list of admin actions required for this endpoint to work
+var bucketsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllActions,
+	),
+	actions: iampolicy.NewActionSet(
+		// Read access to buckets
+		iampolicy.ListMultipartUploadPartsAction,
+		iampolicy.ListBucketMultipartUploadsAction,
+		iampolicy.ListBucketAction,
+		iampolicy.HeadBucketAction,
+		iampolicy.GetObjectAction,
+		iampolicy.GetBucketLocationAction,
+		// Write access to buckets
+		iampolicy.AbortMultipartUploadAction,
+		iampolicy.CreateBucketAction,
+		iampolicy.PutObjectAction,
+		iampolicy.DeleteObjectAction,
+		iampolicy.DeleteBucketAction,
+		// Assign bucket policies
+		iampolicy.PutBucketPolicyAction,
+		iampolicy.DeleteBucketPolicyAction,
+		iampolicy.GetBucketPolicyAction,
+	),
+}
+
+// serviceAccountsActionSet contains the list of admin actions required for this endpoint to work
+var serviceAccountsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(),
+	actions:     iampolicy.NewActionSet(),
+}
+
+// endpointRules contains the mapping between endpoints and ActionSets, additional rules can be added here
+var endpointRules = map[string]ConfigurationActionSet{
+	configuration:   configurationActionSet,
+	users:           usersActionSet,
+	groups:          groupsActionSet,
+	iamPolicies:     iamPoliciesActionSet,
+	dashboard:       dashboardActionSet,
+	profiling:       profilingActionSet,
+	trace:           traceActionSet,
+	logs:            logsActionSet,
+	watch:           watchActionSet,
+	notifications:   notificationsActionSet,
+	buckets:         bucketsActionSet,
+	bucketDetails:   bucketsActionSet,
+	serviceAccounts: serviceAccountsActionSet,
+}
+
+// GetActionsStringFromPolicy extract the admin/s3 actions from a given policy and return them in []string format
+//
+// ie:
+//	{
+//		"Version": "2012-10-17",
+//		"Statement": [{
+//				"Action": [
+//					"admin:ServerInfo",
+//					"admin:CreatePolicy",
+//					"admin:GetUser"
+//				],
+//				...
+//			},
+//			{
+//				"Action": [
+//					"s3:ListenBucketNotification",
+//					"s3:PutBucketNotification"
+//				],
+//				...
+//			}
+//		]
+//	}
+// Will produce an array like: ["admin:ServerInfo", "admin:CreatePolicy", "admin:GetUser", "s3:ListenBucketNotification", "s3:PutBucketNotification"]\
+func GetActionsStringFromPolicy(policy *iampolicy.Policy) []string {
+	var actions []string
+	for _, statement := range policy.Statements {
+		// We only care about allowed actions
+		if statement.Effect.IsAllowed(true) {
+			for _, action := range statement.Actions.ToSlice() {
+				actions = append(actions, string(action))
+			}
+		}
+	}
+	return actions
+}
+
+// actionsStringToActionSet convert a given string array to iampolicy.ActionSet structure
+// this avoids ending with duplicate actions
+func actionsStringToActionSet(actions []string) iampolicy.ActionSet {
+	actionsSet := iampolicy.ActionSet{}
+	for _, action := range actions {
+		actionsSet.Add(iampolicy.Action(action))
+	}
+	return actionsSet
+}
+
+// GetAuthorizedEndpoints return a list of allowed endpoint based on a provided *iampolicy.Policy
+// ie: pages the user should have access based on his current privileges
+func GetAuthorizedEndpoints(actions []string) []string {
+	if len(actions) == 0 {
+		return []string{}
+	}
+	// Prepare new ActionSet structure that will hold all the user actions
+	userAllowedAction := actionsStringToActionSet(actions)
+	allowedEndpoints := []string{}
+	for endpoint, rules := range endpointRules {
+		// check if user policy matches s3:* or admin:* typesIntersection
+		endpointActionTypes := rules.actionTypes
+		typesIntersection := endpointActionTypes.Intersection(userAllowedAction)
+		if len(typesIntersection) == len(endpointActionTypes.ToSlice()) {
+			allowedEndpoints = append(allowedEndpoints, endpoint)
+			continue
+		}
+		// check if user policy matches explicitly defined endpoint required actions
+		endpointRequiredActions := rules.actions
+		actionsIntersection := endpointRequiredActions.Intersection(userAllowedAction)
+		if len(actionsIntersection) == len(endpointRequiredActions.ToSlice()) {
+			allowedEndpoints = append(allowedEndpoints, endpoint)
+		}
+	}
+	return allowedEndpoints
+}

pkg/acl/endpoints_test.go

@@ -0,0 +1,138 @@
+// This file is part of MinIO Orchestrator
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package acl
+
+import (
+	"reflect"
+	"testing"
+
+	iampolicy "github.com/minio/minio/pkg/iam/policy"
+)
+
+func TestGetAuthorizedEndpoints(t *testing.T) {
+	type args struct {
+		actions []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want int
+	}{
+		{
+			name: "dashboard endpoint",
+			args: args{
+				[]string{"admin:ServerInfo"},
+			},
+			want: 2,
+		},
+		{
+			name: "policies endpoint",
+			args: args{
+				[]string{
+					"admin:CreatePolicy",
+					"admin:DeletePolicy",
+					"admin:GetPolicy",
+					"admin:AttachUserOrGroupPolicy",
+					"admin:ListUserPolicies",
+				},
+			},
+			want: 2,
+		},
+		{
+			name: "all admin endpoints",
+			args: args{
+				[]string{
+					"admin:*",
+				},
+			},
+			want: 10,
+		},
+		{
+			name: "all s3 endpoints",
+			args: args{
+				[]string{
+					"s3:*",
+				},
+			},
+			want: 4,
+		},
+		{
+			name: "all admin and s3 endpoints",
+			args: args{
+				[]string{
+					"admin:*",
+					"s3:*",
+				},
+			},
+			want: 13,
+		},
+		{
+			name: "no endpoints",
+			args: args{
+				[]string{},
+			},
+			want: 0,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetAuthorizedEndpoints(tt.args.actions); !reflect.DeepEqual(len(got), tt.want) {
+				t.Errorf("GetAuthorizedEndpoints() = %v, want %v", len(got), tt.want)
+			}
+		})
+	}
+}
+
+func TestGetActionsStringFromPolicy(t *testing.T) {
+	type args struct {
+		policy *iampolicy.Policy
+	}
+	tests := []struct {
+		name string
+		args args
+		want int
+	}{
+		{
+			name: "parse ReadOnly policy",
+			args: args{
+				policy: &iampolicy.ReadOnly,
+			},
+			want: 2,
+		},
+		{
+			name: "parse WriteOnly policy",
+			args: args{
+				policy: &iampolicy.WriteOnly,
+			},
+			want: 1,
+		},
+		{
+			name: "parse AdminDiagnostics policy",
+			args: args{
+				policy: &iampolicy.AdminDiagnostics,
+			},
+			want: 6,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetActionsStringFromPolicy(tt.args.policy); !reflect.DeepEqual(len(got), tt.want) {
+				t.Errorf("GetActionsStringFromPolicy() = %v, want %v", len(got), tt.want)
+			}
+		})
+	}
+}

pkg/auth/jwt.go

@@ -37,7 +37,7 @@ import (
 )
 
 var (
-	errAuthentication = errors.New("Authentication failed, check your access credentials")
+	errAuthentication = errors.New("authentication failed, check your access credentials")
 	errNoAuthToken    = errors.New("JWT token missing")
 	errReadingToken   = errors.New("JWT internal data is malformed")
 	errClaimsFormat   = errors.New("encrypted jwt claims not in the right format")
@@ -57,6 +57,7 @@ type DecryptedClaims struct {
 	AccessKeyID     string
 	SecretAccessKey string
 	SessionToken    string
+	Actions         []string
 }
 
 // JWTAuthenticate takes a jwt, decode it, extract claims and validate the signature
@@ -93,9 +94,9 @@ func JWTAuthenticate(token string) (*DecryptedClaims, error) {
 
 // NewJWTWithClaimsForClient generates a new jwt with claims based on the provided STS credentials, first
 // encrypts the claims and the sign them
-func NewJWTWithClaimsForClient(credentials *credentials.Value, audience string) (string, error) {
+func NewJWTWithClaimsForClient(credentials *credentials.Value, actions []string, audience string) (string, error) {
 	if credentials != nil {
-		encryptedClaims, err := encryptClaims(credentials.AccessKeyID, credentials.SecretAccessKey, credentials.SessionToken)
+		encryptedClaims, err := encryptClaims(credentials.AccessKeyID, credentials.SecretAccessKey, credentials.SessionToken, actions)
 		if err != nil {
 			return "", err
 		}
@@ -112,8 +113,8 @@ func NewJWTWithClaimsForClient(credentials *credentials.Value, audience string)
 
 // encryptClaims() receives the 3 STS claims, concatenate them and encrypt them using AES-GCM
 // returns a base64 encoded ciphertext
-func encryptClaims(accessKeyID, secretAccessKey, sessionToken string) (string, error) {
-	payload := []byte(fmt.Sprintf("%s:%s:%s", accessKeyID, secretAccessKey, sessionToken))
+func encryptClaims(accessKeyID, secretAccessKey, sessionToken string, actions []string) (string, error) {
+	payload := []byte(fmt.Sprintf("%s#%s#%s#%s", accessKeyID, secretAccessKey, sessionToken, strings.Join(actions, ",")))
 	ciphertext, err := encrypt(payload)
 	if err != nil {
 		return "", err
@@ -133,16 +134,18 @@ func decryptClaims(ciphertext string) (*DecryptedClaims, error) {
 		log.Println(err)
 		return nil, errClaimsFormat
 	}
-	s := strings.Split(string(plaintext), ":")
+	s := strings.Split(string(plaintext), "#")
 	// Validate that the decrypted string has the right format "accessKeyID:secretAccessKey:sessionToken"
-	if len(s) != 3 {
+	if len(s) != 4 {
 		return nil, errClaimsFormat
 	}
-	accessKeyID, secretAccessKey, sessionToken := s[0], s[1], s[2]
+	accessKeyID, secretAccessKey, sessionToken, actions := s[0], s[1], s[2], s[3]
+	actionsList := strings.Split(actions, ",")
 	return &DecryptedClaims{
 		AccessKeyID:     accessKeyID,
 		SecretAccessKey: secretAccessKey,
 		SessionToken:    sessionToken,
+		Actions:         actionsList,
 	}, nil
 }
 

pkg/auth/jwt_test.go

@@ -37,14 +37,14 @@ func TestNewJWTWithClaimsForClient(t *testing.T) {
 	funcAssert := assert.New(t)
 	// Test-1 : NewJWTWithClaimsForClient() is generated correctly without errors
 	function := "NewJWTWithClaimsForClient()"
-	jwt, err := NewJWTWithClaimsForClient(creds, audience)
+	jwt, err := NewJWTWithClaimsForClient(creds, []string{""}, audience)
 	if err != nil || jwt == "" {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err)
 	}
 	// saving jwt for future tests
 	goodToken = jwt
 	// Test-2 : NewJWTWithClaimsForClient() throws error because of empty credentials
-	if _, err = NewJWTWithClaimsForClient(nil, audience); err != nil {
+	if _, err = NewJWTWithClaimsForClient(nil, []string{""}, audience); err != nil {
 		funcAssert.Equal("provided credentials are empty", err.Error())
 	}
 }
@@ -63,7 +63,7 @@ func TestJWTAuthenticate(t *testing.T) {
 	}
 	// Test-2 : JWTAuthenticate() return an error because of a tampered jwt
 	if _, err := JWTAuthenticate(badToken); err != nil {
-		funcAssert.Equal("Authentication failed, check your access credentials", err.Error())
+		funcAssert.Equal("authentication failed, check your access credentials", err.Error())
 	}
 	// Test-3 : JWTAuthenticate() return an error because of an empty jwt
 	if _, err := JWTAuthenticate(""); err != nil {

portal-ui/src/Routes.tsx

@@ -35,7 +35,7 @@ const isLoggedIn = () => {
 };
 
 const mapState = (state: AppState) => ({
-  loggedIn: state.system.loggedIn
+  loggedIn: state.system.loggedIn,
 });
 
 const connector = connect(mapState, { userLoggedIn });

portal-ui/src/common/api/index.ts

@@ -24,8 +24,8 @@ export class API {
     return request(method, url)
       .set("Authorization", `Bearer ${token}`)
       .send(data)
-      .then(res => res.body)
-      .catch(err => {
+      .then((res) => res.body)
+      .catch((err) => {
         // if we get unauthorized, kick out the user
         if (err.status === 401) {
           storage.removeItem("token");

portal-ui/src/common/utils.ts

@@ -14,7 +14,17 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+export const units = [
+  "B",
+  "KiB",
+  "MiB",
+  "GiB",
+  "TiB",
+  "PiB",
+  "EiB",
+  "ZiB",
+  "YiB",
+];
 export const niceBytes = (x: string) => {
   let l = 0,
     n = parseInt(x, 10) || 0;

portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx

@@ -30,49 +30,50 @@ import AddBucket from "./AddBucket";
 import DeleteBucket from "./DeleteBucket";
 import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
 import { CreateIcon } from "../../../../icons";
+import { niceBytes } from "../../../../common/utils";
 
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
 
     addSideBar: {
       width: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
-    }
+      boxShadow: "0px 3px 6px #00000012",
+    },
   });
 
 interface IListBucketsProps {
@@ -108,7 +109,7 @@ class ListBuckets extends React.Component<
     rowsPerPage: 10,
     deleteOpen: false,
     selectedBucket: "",
-    filterBuckets: ""
+    filterBuckets: "",
   };
 
   fetchRecords() {
@@ -122,7 +123,7 @@ class ListBuckets extends React.Component<
             loading: false,
             records: res.buckets || [],
             totalRecords: !res.buckets ? 0 : res.total,
-            error: ""
+            error: "",
           });
           // if we get 0 results, and page > 0 , go down 1 page
           if (
@@ -174,7 +175,7 @@ class ListBuckets extends React.Component<
       rowsPerPage,
       deleteOpen,
       selectedBucket,
-      filterBuckets
+      filterBuckets,
     } = this.state;
 
     const offset = page * rowsPerPage;
@@ -196,7 +197,7 @@ class ListBuckets extends React.Component<
 
     const tableActions = [
       { type: "view", to: `/buckets`, sendOnlyId: true },
-      { type: "delete", onClick: confirmDeleteBucket, sendOnlyId: true }
+      { type: "delete", onClick: confirmDeleteBucket, sendOnlyId: true },
     ];
 
     const displayParsedDate = (date: string) => {
@@ -249,9 +250,9 @@ class ListBuckets extends React.Component<
               className={classes.searchField}
               id="search-resource"
               label=""
-              onChange={val => {
+              onChange={(val) => {
                 this.setState({
-                  filterBuckets: val.target.value
+                  filterBuckets: val.target.value,
                 });
               }}
               InputProps={{
@@ -260,7 +261,7 @@ class ListBuckets extends React.Component<
                   <InputAdornment position="start">
                     <SearchIcon />
                   </InputAdornment>
-                )
+                ),
               }}
             />
             <Button
@@ -269,7 +270,7 @@ class ListBuckets extends React.Component<
               startIcon={<CreateIcon />}
               onClick={() => {
                 this.setState({
-                  addScreenOpen: true
+                  addScreenOpen: true,
                 });
               }}
             >
@@ -287,8 +288,13 @@ class ListBuckets extends React.Component<
                 {
                   label: "Creation Date",
                   elementKey: "creation_date",
-                  renderFunction: displayParsedDate
-                }
+                  renderFunction: displayParsedDate,
+                },
+                {
+                  label: "Size",
+                  elementKey: "size",
+                  renderFunction: niceBytes,
+                },
               ]}
               isLoading={loading}
               records={filteredRecords}
@@ -302,11 +308,11 @@ class ListBuckets extends React.Component<
                 page: page,
                 SelectProps: {
                   inputProps: { "aria-label": "rows per page" },
-                  native: true
+                  native: true,
                 },
                 onChangePage: handleChangePage,
                 onChangeRowsPerPage: handleChangeRowsPerPage,
-                ActionsComponent: MinTablePaginationActions
+                ActionsComponent: MinTablePaginationActions,
               }}
             />
           </Grid>

portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx

@@ -26,7 +26,7 @@ import {
   TableRow,
   Paper,
   Grid,
-  Checkbox
+  Checkbox,
 } from "@material-ui/core";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { TablePaginationActionsProps } from "@material-ui/core/TablePagination/TablePaginationActions";
@@ -84,25 +84,25 @@ const borderColor = "#eaeaea";
 const rowText = {
   fontWeight: 400,
   fontSize: 14,
-  borderColor: borderColor
+  borderColor: borderColor,
 };
 
 const checkBoxBasic = {
   width: 16,
   height: 16,
-  borderRadius: 3
+  borderRadius: 3,
 };
 
 const styles = (theme: Theme) =>
   createStyles({
     dialogContainer: {
-      padding: "12px 26px 22px"
+      padding: "12px 26px 22px",
     },
     paper: {
       display: "flex",
       overflow: "auto",
       flexDirection: "column",
-      padding: "19px 38px"
+      padding: "19px 38px",
     },
     minTableHeader: {
       color: "#393939",
@@ -111,43 +111,43 @@ const styles = (theme: Theme) =>
           fontWeight: 700,
           fontSize: 14,
           paddingBottom: 15,
-          borderColor: borderColor
-        }
-      }
+          borderColor: borderColor,
+        },
+      },
     },
     rowUnselected: {
-      ...rowText
+      ...rowText,
     },
     rowSelected: {
       ...rowText,
-      color: "#201763"
+      color: "#201763",
     },
     paginatorContainer: {
       display: "flex",
       justifyContent: "flex-end",
-      padding: "5px 38px"
+      padding: "5px 38px",
     },
     checkBoxHeader: {
       "&.MuiTableCell-paddingCheckbox": {
-        paddingBottom: 9
-      }
+        paddingBottom: 9,
+      },
     },
     actionsContainer: {
       width: 120,
-      borderColor: borderColor
+      borderColor: borderColor,
     },
     paginatorComponent: {
-      borderBottom: 0
+      borderBottom: 0,
     },
     unCheckedIcon: { ...checkBoxBasic, border: "1px solid #d0d0d0" },
     checkedIcon: {
       ...checkBoxBasic,
       border: "1px solid #201763",
-      backgroundColor: "#201763"
+      backgroundColor: "#201763",
     },
     checkBoxRow: {
-      borderColor: borderColor
-    }
+      borderColor: borderColor,
+    },
   });
 
 // Function that renders Title Columns
@@ -221,7 +221,7 @@ const TableWrapper = ({
   idField,
   classes,
   stickyHeader = false,
-  paginatorConfig
+  paginatorConfig,
 }: TableWrapperProps) => {
   return (
     <Grid item xs={12}>

portal-ui/src/screens/Console/Configurations/ConfigurationPanels/ConfigurationsList.tsx

@@ -35,36 +35,36 @@ interface IListConfiguration {
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     strongText: {
-      fontWeight: 700
+      fontWeight: 700,
     },
     keyName: {
-      marginLeft: 5
+      marginLeft: 5,
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
+      boxShadow: "0px 3px 6px #00000012",
     },
     iconText: {
-      lineHeight: "24px"
-    }
+      lineHeight: "24px",
+    },
   });
 
 const ConfigurationsList = ({ classes }: IListConfiguration) => {
   const [editScreenOpen, setEditScreenOpen] = useState(false);
   const [selectedConfiguration, setSelectedConfiguration] = useState({
     configuration_id: "",
-    configuration_label: ""
+    configuration_label: "",
   });
   const [error, setError] = useState("");
   const [filter, setFilter] = useState("");
@@ -81,12 +81,12 @@ const ConfigurationsList = ({ classes }: IListConfiguration) => {
           setSelectedConfiguration(element);
           setEditScreenOpen(true);
         }
-      }
-    }
+      },
+    },
   ];
 
   const filteredRecords: IConfigurationElement[] = configurationElements.filter(
-    elementItem =>
+    (elementItem) =>
       elementItem.configuration_id
         .toLocaleLowerCase()
         .includes(filter.toLocaleLowerCase())
@@ -117,7 +117,7 @@ const ConfigurationsList = ({ classes }: IListConfiguration) => {
             className={classes.searchField}
             id="search-resource"
             label=""
-            onChange={event => {
+            onChange={(event) => {
               setFilter(event.target.value);
             }}
             InputProps={{
@@ -126,7 +126,7 @@ const ConfigurationsList = ({ classes }: IListConfiguration) => {
                 <InputAdornment position="start">
                   <SearchIcon />
                 </InputAdornment>
-              )
+              ),
             }}
           />
         </Grid>
@@ -137,7 +137,7 @@ const ConfigurationsList = ({ classes }: IListConfiguration) => {
           <TableWrapper
             itemActions={tableActions}
             columns={[
-              { label: "Configuration", elementKey: "configuration_id" }
+              { label: "Configuration", elementKey: "configuration_id" },
             ]}
             isLoading={false}
             records={filteredRecords}

portal-ui/src/screens/Console/Configurations/ConfigurationPanels/WebhookPanel.tsx

@@ -44,29 +44,29 @@ interface IWebhook {
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     strongText: {
-      fontWeight: 700
+      fontWeight: 700,
     },
     keyName: {
-      marginLeft: 5
+      marginLeft: 5,
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
+      boxShadow: "0px 3px 6px #00000012",
     },
     iconText: {
-      lineHeight: "24px"
-    }
+      lineHeight: "24px",
+    },
   });
 
 const panels = {
@@ -77,8 +77,8 @@ const panels = {
     apiURL: "",
     configuration: {
       configuration_id: "logger_webhook",
-      configuration_label: "Logger Webhook"
-    }
+      configuration_label: "Logger Webhook",
+    },
   },
   audit: {
     main: "audit",
@@ -87,9 +87,9 @@ const panels = {
     apiURL: "",
     configuration: {
       configuration_id: "audit_webhook",
-      configuration_label: "Audit Webhook"
-    }
-  }
+      configuration_label: "Audit Webhook",
+    },
+  },
 };
 
 const WebhookPanel = ({ match, classes }: IWebhookPanel) => {
@@ -107,15 +107,15 @@ const WebhookPanel = ({ match, classes }: IWebhookPanel) => {
     return null;
   }
 
-  const filteredRecords: IWebhook[] = webhooks.filter(elementItem =>
+  const filteredRecords: IWebhook[] = webhooks.filter((elementItem) =>
     elementItem.name.toLocaleLowerCase().includes(filter.toLocaleLowerCase())
   );
 
   const tableActions = [
     {
       type: "edit",
-      onClick: () => {}
-    }
+      onClick: () => {},
+    },
   ];
 
   return (
@@ -144,7 +144,7 @@ const WebhookPanel = ({ match, classes }: IWebhookPanel) => {
             className={classes.searchField}
             id="search-resource"
             label=""
-            onChange={event => {
+            onChange={(event) => {
               setFilter(event.target.value);
             }}
             InputProps={{
@@ -153,7 +153,7 @@ const WebhookPanel = ({ match, classes }: IWebhookPanel) => {
                 <InputAdornment position="start">
                   <SearchIcon />
                 </InputAdornment>
-              )
+              ),
             }}
           />
           <Button

portal-ui/src/screens/Console/Configurations/utils.ts

@@ -31,34 +31,34 @@ export const configurationElements: IConfigurationElement[] = [
   { configuration_id: "cache", configuration_label: "Cache Configuration" },
   {
     configuration_id: "compression",
-    configuration_label: "Compression Configuration"
+    configuration_label: "Compression Configuration",
   },
   { configuration_id: "etcd", configuration_label: "Etcd Configuration" },
   {
     configuration_id: "identity_openid",
-    configuration_label: "Identity Openid Configuration"
+    configuration_label: "Identity Openid Configuration",
   },
   {
     configuration_id: "identity_ldap",
-    configuration_label: "Identity LDAP Configuration"
+    configuration_label: "Identity LDAP Configuration",
   },
   {
     configuration_id: "policy_opa",
-    configuration_label: "Policy OPA Configuration"
+    configuration_label: "Policy OPA Configuration",
   },
   {
     configuration_id: "kms_vault",
-    configuration_label: "KMS Vault Configuration"
+    configuration_label: "KMS Vault Configuration",
   },
   { configuration_id: "kms_kes", configuration_label: "KMS KES Configuration" },
   {
     configuration_id: "logger_webhook",
-    configuration_label: "Logger Webhook Configuration"
+    configuration_label: "Logger Webhook Configuration",
   },
   {
     configuration_id: "audit_webhook",
-    configuration_label: "Audit Webhook Configuration"
-  }
+    configuration_label: "Audit Webhook Configuration",
+  },
 ];
 
 export const fieldsConfigurations: any = {
@@ -68,7 +68,7 @@ export const fieldsConfigurations: any = {
       required: true,
       label: "name",
       tooltip: 'Name of the location of the server e.g. "us-west-rack2"',
-      type: "string"
+      type: "string",
     },
     {
       name: "comment",
@@ -76,8 +76,8 @@ export const fieldsConfigurations: any = {
       label: "comment",
       tooltip: "You can add a comment to this setting",
       type: "string",
-      multiline: true
-    }
+      multiline: true,
+    },
   ],
   cache: [
     {
@@ -86,21 +86,21 @@ export const fieldsConfigurations: any = {
       label: "Drives",
       tooltip:
         'Mountpoints e.g. "/optane1" or "/optane2", you can write one per field',
-      type: "csv"
+      type: "csv",
     },
     {
       name: "expiry",
       required: false,
       label: "Expiry",
       tooltip: 'Cache expiry duration in days e.g. "90"',
-      type: "number"
+      type: "number",
     },
     {
       name: "quota",
       required: false,
       label: "Quota",
       tooltip: 'Limit cache drive usage in percentage e.g. "90"',
-      type: "number"
+      type: "number",
     },
     {
       name: "exclude",
@@ -108,28 +108,28 @@ export const fieldsConfigurations: any = {
       label: "Exclude",
       tooltip:
         'Wildcard exclusion patterns e.g. "bucket/*.tmp" or "*.exe", you can write one per field',
-      type: "csv"
+      type: "csv",
     },
     {
       name: "after",
       required: false,
       label: "After",
       tooltip: "Minimum number of access before caching an object",
-      type: "number"
+      type: "number",
     },
     {
       name: "watermark_low",
       required: false,
       label: "Watermark Low",
       tooltip: "Watermark Low",
-      type: "number"
+      type: "number",
     },
     {
       name: "watermark_high",
       required: false,
       label: "Watermark High",
       tooltip: "Watermark High",
-      type: "number"
+      type: "number",
     },
     {
       name: "comment",
@@ -137,8 +137,8 @@ export const fieldsConfigurations: any = {
       label: "Comment",
       tooltip: "You can add a comment to this setting",
       type: "string",
-      multiline: true
-    }
+      multiline: true,
+    },
   ],
   compression: [
     {
@@ -147,7 +147,7 @@ export const fieldsConfigurations: any = {
       label: "Extensions",
       tooltip:
         'Extensions to compress e.g. ".txt",".log" or ".csv", you can write one per field',
-      type: "csv"
+      type: "csv",
     },
     {
       name: "mime_types",
@@ -155,8 +155,8 @@ export const fieldsConfigurations: any = {
       label: "Mime Types",
       tooltip:
         'Mime types e.g. "text/*","application/json" or "application/xml", you can write one per field',
-      type: "csv"
-    }
+      type: "csv",
+    },
   ],
   etcd: [
     {
@@ -165,35 +165,35 @@ export const fieldsConfigurations: any = {
       label: "Endpoints",
       tooltip:
         'List of etcd endpoints e.g. "http://localhost:2379", you can write one per field',
-      type: "csv"
+      type: "csv",
     },
     {
       name: "path_prefix",
       required: false,
       label: "Path Prefix",
       tooltip: 'namespace prefix to isolate tenants e.g. "customer1/"',
-      type: "string"
+      type: "string",
     },
     {
       name: "coredns_path",
       required: false,
       label: "Coredns Path",
       tooltip: 'Shared bucket DNS records, default is "/skydns"',
-      type: "string"
+      type: "string",
     },
     {
       name: "client_cert",
       required: false,
       label: "Client Cert",
       tooltip: "Client cert for mTLS authentication",
-      type: "string"
+      type: "string",
     },
     {
       name: "client_cert_key",
       required: false,
       label: "Client Cert Key",
       tooltip: "Client cert key for mTLS authentication",
-      type: "string"
+      type: "string",
     },
     {
       name: "comment",
@@ -201,8 +201,8 @@ export const fieldsConfigurations: any = {
       label: "Comment",
       tooltip: "You can add a comment to this setting",
       type: "string",
-      multiline: true
-    }
+      multiline: true,
+    },
   ],
   identity_openid: [
     {
@@ -210,28 +210,28 @@ export const fieldsConfigurations: any = {
       required: false,
       label: "Config URL",
       tooltip: "Config URL for Client ID configuration",
-      type: "string"
+      type: "string",
     },
     {
       name: "client_id",
       required: false,
       label: "Client ID",
-      type: "string"
+      type: "string",
     },
     {
       name: "claim_name",
       required: false,
       label: "Claim Name",
       tooltip: "Claim Name",
-      type: "string"
+      type: "string",
     },
     {
       name: "claim_prefix",
       required: false,
       label: "Claim Prefix",
       tooltip: "Claim Prefix",
-      type: "string"
-    }
+      type: "string",
+    },
   ],
   identity_ldap: [
     {
@@ -239,7 +239,7 @@ export const fieldsConfigurations: any = {
       required: true,
       label: "Server ADDR",
       tooltip: 'AD/LDAP server address e.g. "myldapserver.com:636"',
-      type: "string"
+      type: "string",
     },
     {
       name: "username_format",
@@ -247,7 +247,7 @@ export const fieldsConfigurations: any = {
       label: "Username Format",
       tooltip:
         'List of username bind DNs e.g. "uid=%s","cn=accounts","dc=myldapserver" or "dc=com", you can write one per field',
-      type: "csv"
+      type: "csv",
     },
     {
       name: "username_search_filter",
@@ -255,7 +255,7 @@ export const fieldsConfigurations: any = {
       label: "Username Search Filter",
       tooltip:
         'User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"',
-      type: "string"
+      type: "string",
     },
     {
       name: "group_search_filter",
@@ -263,21 +263,21 @@ export const fieldsConfigurations: any = {
       label: "Group Search Filter",
       tooltip:
         'Search filter for groups e.g. "(&(objectclass=groupOfNames)(memberUid=%s))"',
-      type: "string"
+      type: "string",
     },
     {
       name: "username_search_base_dn",
       required: false,
       label: "Username Search Base DN",
       tooltip: "List of username search DNs, you can write one per field",
-      type: "csv"
+      type: "csv",
     },
     {
       name: "group_name_attribute",
       required: false,
       label: "Group Name Attribute",
       tooltip: 'Search attribute for group name e.g. "cn"',
-      type: "string"
+      type: "string",
     },
     {
       name: "sts_expiry",
@@ -285,7 +285,7 @@ export const fieldsConfigurations: any = {
       label: "STS Expiry",
       tooltip:
         'temporary credentials validity duration in s,m,h,d. Default is "1h"',
-      type: "string"
+      type: "string",
     },
     {
       name: "tls_skip_verify",
@@ -293,7 +293,7 @@ export const fieldsConfigurations: any = {
       label: "TLS Skip Verify",
       tooltip:
         'Trust server TLS without verification, defaults to "off" (verify)',
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "server_insecure",
@@ -301,7 +301,7 @@ export const fieldsConfigurations: any = {
       label: "Server Insecure",
       tooltip:
         'Allow plain text connection to AD/LDAP server, defaults to "off"',
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "comment",
@@ -309,28 +309,28 @@ export const fieldsConfigurations: any = {
       label: "Comment",
       tooltip: "Optionally add a comment to this setting",
       type: "string",
-      multiline: true
-    }
+      multiline: true,
+    },
   ],
   policy_opa: [
     {
       name: "url",
       required: true,
       label: "OPA URL",
-      type: "string"
+      type: "string",
     },
     {
       name: "auth_token",
       required: true,
       label: "Auth Token",
-      type: "string"
+      type: "string",
     },
     {
       name: "policy_opa",
       required: true,
       label: "Policy OPA",
-      type: "string"
-    }
+      type: "string",
+    },
   ],
   kms_vault: [],
   kms_kes: [],
@@ -339,29 +339,29 @@ export const fieldsConfigurations: any = {
       name: "endpoint",
       required: true,
       label: "Endpoint",
-      type: "string"
+      type: "string",
     },
     {
       name: "auth_token",
       required: true,
       label: "Auth Token",
-      type: "string"
-    }
+      type: "string",
+    },
   ],
   audit_webhook: [
     {
       name: "endpoint",
       required: true,
       label: "Endpoint",
-      type: "string"
+      type: "string",
     },
     {
       name: "auth_token",
       required: true,
       label: "Auth Token",
-      type: "string"
-    }
-  ]
+      type: "string",
+    },
+  ],
 };
 
 const commonFields = [
@@ -371,7 +371,7 @@ const commonFields = [
     required: true,
 
     tooltip: "staging dir for undelivered messages e.g. '/home/events'",
-    type: "string"
+    type: "string",
   },
   {
     name: "queue-limit",
@@ -379,15 +379,15 @@ const commonFields = [
     required: false,
 
     tooltip: "maximum limit for undelivered messages, defaults to '10000'",
-    type: "number"
+    type: "number",
   },
   {
     name: "comment",
     label: "Comment",
     required: false,
     type: "string",
-    multiline: true
-  }
+    multiline: true,
+  },
 ];
 
 export const notificationEndpointsFields: any = {
@@ -398,77 +398,77 @@ export const notificationEndpointsFields: any = {
       required: true,
 
       tooltip: "comma separated list of Kafka broker addresses",
-      type: "string"
+      type: "string",
     },
     {
       name: "topic",
       label: "Topic",
       tooltip: "Kafka topic used for bucket notifications",
-      type: "string"
+      type: "string",
     },
     {
       name: "sasl_username",
       label: "SASL Username",
       tooltip: "username for SASL/PLAIN or SASL/SCRAM authentication",
-      type: "string"
+      type: "string",
     },
     {
       name: "sasl_password",
       label: "SASL Password",
       tooltip: "password for SASL/PLAIN or SASL/SCRAM authentication",
-      type: "string"
+      type: "string",
     },
     {
       name: "sasl_mechanism",
       label: "SASL Mechanism",
       tooltip: "sasl authentication mechanism, default 'PLAIN'",
-      type: "string"
+      type: "string",
     },
     {
       name: "tls_client_auth",
       label: "TLS Client Auth",
       tooltip:
         "clientAuth determines the Kafka server's policy for TLS client auth",
-      type: "string"
+      type: "string",
     },
     {
       name: "sasl",
       label: "SASL",
       tooltip: "set to 'on' to enable SASL authentication",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "tls",
       label: "TLS",
       tooltip: "set to 'on' to enable TLS",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "tls_skip_verify",
       label: "TLS skip verify",
       tooltip:
         'trust server TLS without verification, defaults to "on" (verify)',
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "client_tls_cert",
       label: "client TLS cert",
       tooltip: "path to client certificate for mTLS auth",
-      type: "path"
+      type: "path",
     },
     {
       name: "client_tls_key",
       label: "client TLS key",
       tooltip: "path to client key for mTLS auth",
-      type: "path"
+      type: "path",
     },
     {
       name: "version",
       label: "Version",
       tooltip: "specify the version of the Kafka cluster e.g '2.2.0'",
-      type: "string"
+      type: "string",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyAmqp]: [
     {
@@ -477,68 +477,68 @@ export const notificationEndpointsFields: any = {
       label: "url",
       tooltip:
         "AMQP server endpoint e.g. `amqp://myuser:mypassword@localhost:5672`",
-      type: "url"
+      type: "url",
     },
     {
       name: "exchange",
       label: "exchange",
       tooltip: "name of the AMQP exchange",
-      type: "string"
+      type: "string",
     },
     {
       name: "exchange_type",
       label: "exchange_type",
       tooltip: "AMQP exchange type",
-      type: "string"
+      type: "string",
     },
     {
       name: "routing_key",
       label: "routing_key",
       tooltip: "routing key for publishing",
-      type: "string"
+      type: "string",
     },
     {
       name: "mandatory",
       label: "mandatory",
       tooltip:
         "quietly ignore undelivered messages when set to 'off', default is 'on'",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "durable",
       label: "durable",
       tooltip:
         "persist queue across broker restarts when set to 'on', default is 'off'",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "no_wait",
       label: "no_wait",
       tooltip:
         "non-blocking message delivery when set to 'on', default is 'off'",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "internal",
       label: "internal",
       tooltip:
         "set to 'on' for exchange to be not used directly by publishers, but only when bound to other exchanges",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "auto_deleted",
       label: "auto_deleted",
       tooltip:
         "auto delete queue when set to 'on', when there are no consumers",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "delivery_mode",
       label: "delivery_mode",
       tooltip: "set to '1' for non-persistent or '2' for persistent queue",
-      type: "number"
+      type: "number",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyRedis]: [
     {
@@ -546,22 +546,22 @@ export const notificationEndpointsFields: any = {
       required: true,
       label: "address",
       tooltip: "Redis server's address. For example: `localhost:6379`",
-      type: "address"
+      type: "address",
     },
     {
       name: "key",
       required: true,
       label: "key",
       tooltip: "Redis key to store/update events, key is auto-created",
-      type: "string"
+      type: "string",
     },
     {
       name: "password",
       label: "password",
       tooltip: "Redis server password",
-      type: "string"
+      type: "string",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyMqtt]: [
     {
@@ -569,46 +569,46 @@ export const notificationEndpointsFields: any = {
       required: true,
       label: "broker",
       tooltip: "MQTT server endpoint e.g. `tcp://localhost:1883`",
-      type: "uri"
+      type: "uri",
     },
     {
       name: "topic",
       required: true,
       label: "topic",
       tooltip: "name of the MQTT topic to publish",
-      type: "string"
+      type: "string",
     },
     {
       name: "username",
       label: "username",
       tooltip: "MQTT username",
-      type: "string"
+      type: "string",
     },
     {
       name: "password",
       label: "password",
       tooltip: "MQTT password",
-      type: "string"
+      type: "string",
     },
     {
       name: "qos",
       label: "qos",
       tooltip: "set the quality of service priority, defaults to '0'",
-      type: "number"
+      type: "number",
     },
     {
       name: "keep_alive_interval",
       label: "keep_alive_interval",
       tooltip: "keep-alive interval for MQTT connections in s,m,h,d",
-      type: "duration"
+      type: "duration",
     },
     {
       name: "reconnect_interval",
       label: "reconnect_interval",
       tooltip: "reconnect interval for MQTT connections in s,m,h,d",
-      type: "duration"
+      type: "duration",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyNats]: [
     {
@@ -616,95 +616,95 @@ export const notificationEndpointsFields: any = {
       required: true,
       label: "address",
       tooltip: "NATS server address e.g. '0.0.0.0:4222'",
-      type: "address"
+      type: "address",
     },
     {
       name: "subject",
       required: true,
       label: "subject",
       tooltip: "NATS subscription subject",
-      type: "string"
+      type: "string",
     },
     {
       name: "username",
       label: "username",
       tooltip: "NATS username",
-      type: "string"
+      type: "string",
     },
     {
       name: "password",
       label: "password",
       tooltip: "NATS password",
-      type: "string"
+      type: "string",
     },
     {
       name: "token",
       label: "token",
       tooltip: "NATS token",
-      type: "string"
+      type: "string",
     },
     {
       name: "tls",
       label: "tls",
       tooltip: "set to 'on' to enable TLS",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "tls_skip_verify",
       label: "tls_skip_verify",
       tooltip:
         'trust server TLS without verification, defaults to "on" (verify)',
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "ping_interval",
       label: "ping_interval",
       tooltip: "client ping commands interval in s,m,h,d. Disabled by default",
-      type: "duration"
+      type: "duration",
     },
     {
       name: "streaming",
       label: "streaming",
       tooltip: "set to 'on', to use streaming NATS server",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "streaming_async",
       label: "streaming_async",
       tooltip: "set to 'on', to enable asynchronous publish",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "streaming_max_pub_acks_in_flight",
       label: "streaming_max_pub_acks_in_flight",
       tooltip: "number of messages to publish without waiting for ACKs",
-      type: "number"
+      type: "number",
     },
     {
       name: "streaming_cluster_id",
       label: "streaming_cluster_id",
       tooltip: "unique ID for NATS streaming cluster",
-      type: "string"
+      type: "string",
     },
     {
       name: "cert_authority",
       label: "cert_authority",
       tooltip: "path to certificate chain of the target NATS server",
-      type: "string"
+      type: "string",
     },
     {
       name: "client_cert",
       label: "client_cert",
       tooltip: "client cert for NATS mTLS auth",
-      type: "string"
+      type: "string",
     },
     {
       name: "client_key",
       label: "client_key",
       tooltip: "client cert key for NATS mTLS auth",
-      type: "string"
+      type: "string",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyElasticsearch]: [
     {
@@ -713,7 +713,7 @@ export const notificationEndpointsFields: any = {
       label: "url",
       tooltip:
         "Elasticsearch server's address, with optional authentication info",
-      type: "url"
+      type: "url",
     },
     {
       name: "index",
@@ -721,7 +721,7 @@ export const notificationEndpointsFields: any = {
       label: "index",
       tooltip:
         "Elasticsearch index to store/update events, index is auto-created",
-      type: "string"
+      type: "string",
     },
     {
       name: "format",
@@ -729,9 +729,9 @@ export const notificationEndpointsFields: any = {
       label: "format",
       tooltip:
         "'namespace' reflects current bucket/object list and 'access' reflects a journal of object operations, defaults to 'namespace'",
-      type: "enum"
+      type: "enum",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyWebhooks]: [
     {
@@ -740,15 +740,15 @@ export const notificationEndpointsFields: any = {
       label: "endpoint",
       tooltip:
         "webhook server endpoint e.g. http://localhost:8080/minio/events",
-      type: "url"
+      type: "url",
     },
     {
       name: "auth_token",
       label: "auth_token",
       tooltip: "opaque string or JWT authorization token",
-      type: "string"
+      type: "string",
     },
-    ...commonFields
+    ...commonFields,
   ],
   [notifyNsq]: [
     {
@@ -756,34 +756,34 @@ export const notificationEndpointsFields: any = {
       required: true,
       label: "nsqd_address",
       tooltip: "NSQ server address e.g. '127.0.0.1:4150'",
-      type: "address"
+      type: "address",
     },
     {
       name: "topic",
       required: true,
       label: "topic",
       tooltip: "NSQ topic",
-      type: "string"
+      type: "string",
     },
     {
       name: "tls",
       label: "tls",
       tooltip: "set to 'on' to enable TLS",
-      type: "on|off"
+      type: "on|off",
     },
     {
       name: "tls_skip_verify",
       label: "tls_skip_verify",
       tooltip:
         'trust server TLS without verification, defaults to "on" (verify)',
-      type: "on|off"
+      type: "on|off",
     },
-    ...commonFields
-  ]
+    ...commonFields,
+  ],
 };
 
 export const removeEmptyFields = (formFields: IElementValue[]) => {
-  const nonEmptyFields = formFields.filter(field => field.value !== "");
+  const nonEmptyFields = formFields.filter((field) => field.value !== "");
 
   return nonEmptyFields;
 };

portal-ui/src/screens/Console/Console.tsx

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React from "react";
+import React, { useEffect } from "react";
 import clsx from "clsx";
 import {
   createStyles,
@@ -28,7 +28,6 @@ import Box from "@material-ui/core/Box";
 import Typography from "@material-ui/core/Typography";
 import Container from "@material-ui/core/Container";
 import Link from "@material-ui/core/Link";
-
 import history from "../../history";
 import {
   Redirect,
@@ -64,6 +63,8 @@ import WebhookPanel from "./Configurations/ConfigurationPanels/WebhookPanel";
 import Trace from "./Trace/Trace";
 import Logs from "./Logs/Logs";
 import Watch from "./Watch/Watch";
+import { ISessionResponse } from "./types";
+import { saveSessionResponse } from "./actions";
 
 function Copyright() {
   return (
@@ -172,18 +173,6 @@ const styles = (theme: Theme) =>
     },
   });
 
-const mapState = (state: AppState) => ({
-  open: state.system.sidebarOpen,
-  needsRestart: state.system.serverNeedsRestart,
-  isServerLoading: state.system.serverIsLoading,
-});
-
-const connector = connect(mapState, {
-  setMenuOpen,
-  serverNeedsRestart,
-  serverIsLoading,
-});
-
 interface IConsoleProps {
   open: boolean;
   needsRestart: boolean;
@@ -193,143 +182,206 @@ interface IConsoleProps {
   setMenuOpen: typeof setMenuOpen;
   serverNeedsRestart: typeof serverNeedsRestart;
   serverIsLoading: typeof serverIsLoading;
+  saveSessionResponse: typeof saveSessionResponse;
+  session: ISessionResponse;
 }
 
-class Console extends React.Component<
-  IConsoleProps & RouteComponentProps & StyledProps & ThemedComponentProps
-  > {
-  componentDidMount(): void {
+const Console = ({
+  classes,
+  open,
+  needsRestart,
+  isServerLoading,
+  serverNeedsRestart,
+  serverIsLoading,
+  saveSessionResponse,
+  session,
+}: IConsoleProps) => {
+  useEffect(() => {
     api
       .invoke("GET", `/api/v1/session`)
       .then((res) => {
-        console.log(res);
+        saveSessionResponse(res);
       })
       .catch((err) => {
         storage.removeItem("token");
         history.push("/");
       });
-  }
+  }, [saveSessionResponse]);
 
-  restartServer() {
-    this.props.serverIsLoading(true);
+  const restartServer = () => {
+    serverIsLoading(true);
     api
       .invoke("POST", "/api/v1/service/restart", {})
       .then((res) => {
         console.log("success restarting service");
         console.log(res);
-        this.props.serverIsLoading(false);
-        this.props.serverNeedsRestart(false);
+        serverIsLoading(false);
+        serverNeedsRestart(false);
       })
       .catch((err) => {
-        this.props.serverIsLoading(false);
+        serverIsLoading(false);
         console.log("failure restarting service");
         console.log(err);
       });
-  }
+  };
 
-  render() {
-    const { classes, open, needsRestart, isServerLoading } = this.props;
-    return (
-      <div className={classes.root}>
-        <CssBaseline />
-        <Drawer
-          variant="permanent"
-          classes={{
-            paper: clsx(classes.drawerPaper, !open && classes.drawerPaperClose),
-          }}
-          open={open}
-        >
-          {/*<div className={classes.toolbarIcon}>*/}
-          {/*  <IconButton*/}
-          {/*    onClick={() => {*/}
-          {/*      this.props.setMenuOpen(false);*/}
-          {/*    }}*/}
-          {/*  >*/}
-          {/*    <ChevronLeftIcon />*/}
-          {/*  </IconButton>*/}
-          {/*</div>*/}
-          {/*<Divider />*/}
+  const allowedPages = session.pages.reduce(
+    (result: any, item: any, index: any) => {
+      result[item] = true;
+      return result;
+    },
+    {}
+  );
+  const routes = [
+    {
+      component: Dashboard,
+      path: "/dashboard",
+    },
+    {
+      component: Buckets,
+      path: "/buckets",
+    },
+    {
+      component: Buckets,
+      path: "/buckets/:bucketName",
+    },
+    {
+      component: Watch,
+      path: "/watch",
+    },
+    {
+      component: Users,
+      path: "/users",
+    },
+    {
+      component: Groups,
+      path: "/groups",
+    },
+    {
+      component: Policies,
+      path: "/policies",
+    },
+    {
+      component: Trace,
+      path: "/trace",
+    },
+    {
+      component: Logs,
+      path: "/logs",
+    },
+    {
+      component: ListNotificationEndpoints,
+      path: "/notification-endpoints",
+    },
+    {
+      component: ConfigurationsList,
+      path: "/configurations-list",
+    },
+    {
+      component: Permissions,
+      path: "/permissions",
+    },
+    {
+      component: ServiceAccounts,
+      path: "/service-accounts",
+    },
+    {
+      component: WebhookPanel,
+      path: "/webhook/logger",
+    },
+    {
+      component: WebhookPanel,
+      path: "/webhook/audit",
+    },
+  ];
+  const allowedRoutes = routes.filter((route: any) => allowedPages[route.path]);
 
-          <Menu />
-        </Drawer>
+  return (
+    <React.Fragment>
+      {session.status == "ok" ? (
+        <div className={classes.root}>
+          <CssBaseline />
+          <Drawer
+            variant="permanent"
+            classes={{
+              paper: clsx(
+                classes.drawerPaper,
+                !open && classes.drawerPaperClose
+              ),
+            }}
+            open={open}
+          >
+            <Menu pages={session.pages} />
+          </Drawer>
 
-        <main className={classes.content}>
-          {needsRestart && (
-            <div className={classes.warningBar}>
-              {isServerLoading ? (
-                <React.Fragment>
-                  The server is restarting.
-                  <LinearProgress />
-                </React.Fragment>
-              ) : (
+          <main className={classes.content}>
+            {needsRestart && (
+              <div className={classes.warningBar}>
+                {isServerLoading ? (
+                  <React.Fragment>
+                    The server is restarting.
+                    <LinearProgress />
+                  </React.Fragment>
+                ) : (
                   <React.Fragment>
                     The instance needs to be restarted for configuration changes
-                  to take effect.{" "}
+                    to take effect.{" "}
                     <Button
                       color="secondary"
                       size="small"
                       onClick={() => {
-                        this.restartServer();
+                        restartServer();
                       }}
                     >
                       Restart
-                  </Button>
+                    </Button>
                   </React.Fragment>
                 )}
-            </div>
-          )}
-          <div className={classes.appBarSpacer} />
-          <Container maxWidth="lg" className={classes.container}>
-            <Router history={history}>
-              <Switch>
-                <Route path="/buckets" component={Buckets} />
-                <Route exact path="/permissions" component={Permissions} />
-                <Route exact path="/policies" component={Policies} />
-                <Route
-                  exact
-                  path="/service_accounts"
-                  component={ServiceAccounts}
-                />
-                <Route exact path="/users" component={Users} />
-                <Route exact path="/dashboard" component={Dashboard} />
-                <Route exct path="/groups" component={Groups} />
-                <Route
-                  exact
-                  path="/notification-endpoints"
-                  component={ListNotificationEndpoints}
-                />
-                <Route
-                  exact
-                  path="/configurations-list"
-                  component={ConfigurationsList}
-                />
-                <Route exact path="/webhook/logger" component={WebhookPanel} />
-                <Route exact path="/webhook/audit" component={WebhookPanel} />
-                <Route exct path="/trace" component={Trace} />
-                <Route exct path="/logs" component={Logs} />
-                <Route exct path="/watch" component={Watch} />
-                <Route exact path="/">
-                  <Redirect to="/dashboard" />
-                </Route>
-                <Route component={NotFoundPage} />
-              </Switch>
-            </Router>
+              </div>
+            )}
+            <div className={classes.appBarSpacer} />
+            <Container maxWidth="lg" className={classes.container}>
+              <Router history={history}>
+                <Switch>
+                  {allowedRoutes.map((route: any) => (
+                    <Route
+                      key={route.path}
+                      exact
+                      path={route.path}
+                      component={route.component}
+                    />
+                  ))}
+                  {allowedRoutes.length > 0 ? (
+                    <Route exact path="/">
+                      <Redirect to={allowedRoutes[0].path} />
+                    </Route>
+                  ) : null}
+                </Switch>
+              </Router>
 
-            <Box pt={4}>
-              <Copyright />
-            </Box>
-          </Container>
-        </main>
-      </div>
-    );
-  }
-}
+              <Box pt={4}>
+                <Copyright />
+              </Box>
+            </Container>
+          </main>
+        </div>
+      ) : null}
+    </React.Fragment>
+  );
+};
 
-// );
+const mapState = (state: AppState) => ({
+  open: state.system.sidebarOpen,
+  needsRestart: state.system.serverNeedsRestart,
+  isServerLoading: state.system.serverIsLoading,
+  session: state.console.session,
+});
 
-export default withRouter(connector(withStyles(styles)(Console)));
-// export default withStyles(styles)(connector(Console));
-// export default compose(
-//     withStyles(styles),
-//     connector
-// )(withRouter(Console))
+const connector = connect(mapState, {
+  setMenuOpen,
+  serverNeedsRestart,
+  serverIsLoading,
+  saveSessionResponse,
+});
+
+export default connector(withStyles(styles)(Console));

portal-ui/src/screens/Console/Groups/Groups.tsx

@@ -26,7 +26,7 @@ import { CreateIcon } from "../../../icons";
 import api from "../../../common/api";
 import { MinTablePaginationActions } from "../../../common/MinTablePaginationActions";
 import { GroupsList } from "./types";
-import { groupsSort } from "../../../utils/sortFunctions";
+import { stringSort } from "../../../utils/sortFunctions";
 import AddGroup from "../Groups/AddGroup";
 import DeleteGroup from "./DeleteGroup";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
@@ -39,50 +39,50 @@ interface IGroupsProps {
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
     addSideBar: {
       width: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     wrapCell: {
       maxWidth: "200px",
       whiteSpace: "normal",
-      wordWrap: "break-word"
+      wordWrap: "break-word",
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
-    }
+      boxShadow: "0px 3px 6px #00000012",
+    },
   });
 
 const Groups = ({ classes }: IGroupsProps) => {
@@ -126,7 +126,7 @@ const Groups = ({ classes }: IGroupsProps) => {
           .then((res: GroupsList) => {
             let resGroups: string[] = [];
             if (res.groups !== null) {
-              resGroups = res.groups.sort(groupsSort);
+              resGroups = res.groups.sort(stringSort);
             }
             setRecords(resGroups);
             const total = !res.total ? 0 : res.total;
@@ -140,7 +140,7 @@ const Groups = ({ classes }: IGroupsProps) => {
               setPage(newPage);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             setError(err);
             isLoading(false);
           });
@@ -162,7 +162,7 @@ const Groups = ({ classes }: IGroupsProps) => {
     }
   };
 
-  const filteredRecords = records.filter(elementItem =>
+  const filteredRecords = records.filter((elementItem) =>
     elementItem.includes(filter)
   );
 
@@ -178,7 +178,7 @@ const Groups = ({ classes }: IGroupsProps) => {
 
   const tableActions = [
     { type: "view", onClick: viewAction },
-    { type: "delete", onClick: deleteAction }
+    { type: "delete", onClick: deleteAction },
   ];
 
   return (
@@ -217,9 +217,9 @@ const Groups = ({ classes }: IGroupsProps) => {
                 <InputAdornment position="start">
                   <SearchIcon />
                 </InputAdornment>
-              )
+              ),
             }}
-            onChange={e => {
+            onChange={(e) => {
               setFilter(e.target.value);
             }}
           />
@@ -255,11 +255,11 @@ const Groups = ({ classes }: IGroupsProps) => {
               page: page,
               SelectProps: {
                 inputProps: { "aria-label": "rows per page" },
-                native: true
+                native: true,
               },
               onChangePage: handleChangePage,
               onChangeRowsPerPage: handleChangeRowsPerPage,
-              ActionsComponent: MinTablePaginationActions
+              ActionsComponent: MinTablePaginationActions,
             }}
           />
         </Grid>

portal-ui/src/screens/Console/Groups/UsersSelectors.tsx

@@ -38,43 +38,43 @@ interface IGroupsProps {
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
     addSideBar: {
       width: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     wrapCell: {
       maxWidth: "200px",
       whiteSpace: "normal",
-      wordWrap: "break-word"
+      wordWrap: "break-word",
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     actionsTray: {
       textAlign: "left",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     filterField: {
       background: "#FFFFFF",
@@ -82,24 +82,24 @@ const styles = (theme: Theme) =>
       borderRadius: 5,
       boxShadow: "0px 3px 6px #00000012",
       width: "100%",
-      zIndex: 500
+      zIndex: 500,
     },
     noFound: {
       textAlign: "center",
-      padding: "10px 0"
+      padding: "10px 0",
     },
     tableContainer: {
-      maxHeight: 250
+      maxHeight: 250,
     },
     stickyHeader: {
-      backgroundColor: "#fff"
-    }
+      backgroundColor: "#fff",
+    },
   });
 
 const UsersSelectors = ({
   classes,
   selectedUsers,
-  setSelectedUsers
+  setSelectedUsers,
 }: IGroupsProps) => {
   //Local States
   const [records, setRecords] = useState<any[]>([]);
@@ -133,7 +133,7 @@ const UsersSelectors = ({
       elements.push(value);
     } else {
       // User has unchecked this field, we need to remove it from the list
-      elements = elements.filter(element => element !== value);
+      elements = elements.filter((element) => element !== value);
     }
     setSelectedUsers(elements);
 
@@ -154,13 +154,13 @@ const UsersSelectors = ({
         setError("");
         isLoading(false);
       })
-      .catch(err => {
+      .catch((err) => {
         setError(err);
         isLoading(false);
       });
   };
 
-  const filteredRecords = records.filter(elementItem =>
+  const filteredRecords = records.filter((elementItem) =>
     elementItem.accessKey.includes(filter)
   );
 
@@ -185,9 +185,9 @@ const UsersSelectors = ({
                       <InputAdornment position="start">
                         <SearchIcon />
                       </InputAdornment>
-                    )
+                    ),
                   }}
-                  onChange={e => {
+                  onChange={(e) => {
                     setFilter(e.target.value);
                   }}
                 />

portal-ui/src/screens/Console/Logs/actions.ts

@@ -33,12 +33,12 @@ export type LogActionTypes = LogMessageReceivedAction | LogResetMessagesAction;
 export function logMessageReceived(message: LogMessage) {
   return {
     type: LOG_MESSAGE_RECEIVED,
-    message: message
+    message: message,
   };
 }
 
 export function logResetMessages() {
   return {
-    type: LOG_RESET_MESSAGES
+    type: LOG_RESET_MESSAGES,
   };
 }

portal-ui/src/screens/Console/Logs/reducers.ts

@@ -17,7 +17,7 @@
 import {
   LOG_MESSAGE_RECEIVED,
   LOG_RESET_MESSAGES,
-  LogActionTypes
+  LogActionTypes,
 } from "./actions";
 import { LogMessage } from "./types";
 
@@ -26,7 +26,7 @@ export interface LogState {
 }
 
 const initialState: LogState = {
-  messages: []
+  messages: [],
 };
 
 export function logReducer(
@@ -37,12 +37,12 @@ export function logReducer(
     case LOG_MESSAGE_RECEIVED:
       return {
         ...state,
-        messages: [...state.messages, action.message]
+        messages: [...state.messages, action.message],
       };
     case LOG_RESET_MESSAGES:
       return {
         ...state,
-        messages: []
+        messages: [],
       };
     default:
       return state;

portal-ui/src/screens/Console/Menu.tsx

@@ -17,8 +17,9 @@
 import React from "react";
 import ListItem from "@material-ui/core/ListItem";
 import ListItemIcon from "@material-ui/core/ListItemIcon";
+import RoomServiceIcon from "@material-ui/icons/RoomService";
 import WebAssetIcon from "@material-ui/icons/WebAsset";
-import CenterFocusWeakIcon from '@material-ui/icons/CenterFocusWeak';
+import CenterFocusWeakIcon from "@material-ui/icons/CenterFocusWeak";
 import ListItemText from "@material-ui/core/ListItemText";
 import { NavLink } from "react-router-dom";
 import { Divider, Typography, withStyles } from "@material-ui/core";
@@ -93,6 +94,7 @@ const connector = connect(mapState, { userLoggedIn });
 interface MenuProps {
   classes: any;
   userLoggedIn: typeof userLoggedIn;
+  pages: string[];
 }
 
 class Menu extends React.Component<MenuProps> {
@@ -114,77 +116,161 @@ class Menu extends React.Component<MenuProps> {
   }
 
   render() {
-    const { classes } = this.props;
+    const { classes, pages } = this.props;
+    const allowedPages = pages.reduce((result: any, item: any, index: any) => {
+      result[item] = true;
+      return result;
+    }, {});
+
+    const menu = [
+      {
+        type: "item",
+        component: NavLink,
+        to: "/dashboard",
+        name: "Dashboard",
+        icon: <DashboardIcon />,
+      },
+      {
+        type: "item",
+        component: NavLink,
+        to: "/buckets",
+        name: "Buckets",
+        icon: <BucketsIcon />,
+      },
+      {
+        type: "item",
+        component: NavLink,
+        to: "/service-accounts",
+        name: "Service Accounts",
+        icon: <RoomServiceIcon />,
+        forceDisplay: true,
+      },
+      {
+        type: "item",
+        component: NavLink,
+        to: "/watch",
+        name: "Watch",
+        icon: <CenterFocusWeakIcon />,
+      },
+      {
+        type: "divider",
+        key: "divider-1",
+      },
+      {
+        type: "title",
+        name: "Admin",
+        component: Typography,
+      },
+      {
+        group: "Admin",
+        type: "item",
+        component: NavLink,
+        to: "/users",
+        name: "Users",
+        icon: <PersonIcon />,
+      },
+      {
+        group: "Admin",
+        type: "item",
+        component: NavLink,
+        to: "/groups",
+        name: "Groups",
+        icon: <UsersIcon />,
+      },
+      {
+        group: "Admin",
+        type: "item",
+        component: NavLink,
+        to: "/policies",
+        name: "IAM Policies",
+        icon: <PermissionIcon />,
+      },
+      {
+        group: "Admin",
+        type: "item",
+        component: NavLink,
+        to: "/trace",
+        name: "Trace",
+        icon: <LoopIcon />,
+      },
+      {
+        group: "Admin",
+        type: "item",
+        component: NavLink,
+        to: "/logs",
+        name: "Console Logs",
+        icon: <WebAssetIcon />,
+      },
+      {
+        type: "title",
+        name: "Configuration",
+        component: Typography,
+      },
+      {
+        group: "Configuration",
+        type: "item",
+        component: NavLink,
+        to: "/notification-endpoints",
+        name: "Lambda Notifications",
+        icon: <NotificationsIcon />,
+      },
+      {
+        group: "Configuration",
+        type: "item",
+        component: NavLink,
+        to: "/configurations-list",
+        name: "Configurations List",
+        icon: <ListAltIcon />,
+      },
+      {
+        type: "divider",
+        key: "divider-2",
+      },
+    ];
+
+    const allowedItems = menu.filter(
+      (item: any) =>
+        allowedPages[item.to] || item.forceDisplay || item.type !== "item"
+    );
+
     return (
       <React.Fragment>
         <div className={classes.logo}>
           <img src={logo} alt="logo" />
         </div>
         <List className={classes.menuList}>
-          <ListItem button component={NavLink} to="/dashboard">
-            <ListItemIcon>
-              <DashboardIcon />
-            </ListItemIcon>
-            <ListItemText primary="Dashboard" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/buckets">
-            <ListItemIcon>
-              <BucketsIcon />
-            </ListItemIcon>
-            <ListItemText primary="Buckets" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/watch">
-            <ListItemIcon>
-              <CenterFocusWeakIcon />
-            </ListItemIcon>
-            <ListItemText primary="Watch" />
-          </ListItem>
-          <Divider />
-          <ListItem component={Typography}>Admin</ListItem>
-          <ListItem button component={NavLink} to="/users">
-            <ListItemIcon>
-              <PersonIcon />
-            </ListItemIcon>
-            <ListItemText primary="Users" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/groups">
-            <ListItemIcon>
-              <UsersIcon />
-            </ListItemIcon>
-            <ListItemText primary="Groups" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/policies">
-            <ListItemIcon>
-              <PermissionIcon />
-            </ListItemIcon>
-            <ListItemText primary="IAM Policies" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/trace">
-            <ListItemIcon>
-              <LoopIcon />
-            </ListItemIcon>
-            <ListItemText primary="Trace" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/logs">
-            <ListItemIcon>
-              <WebAssetIcon />
-            </ListItemIcon>
-            <ListItemText primary="Console Logs" />
-          </ListItem>
-          <ListItem component={Typography}>Configuration</ListItem>
-          <ListItem button component={NavLink} to="/notification-endpoints">
-            <ListItemIcon>
-              <NotificationsIcon />
-            </ListItemIcon>
-            <ListItemText primary="Lambda Notifications" />
-          </ListItem>
-          <ListItem button component={NavLink} to="/configurations-list">
-            <ListItemIcon>
-              <ListAltIcon />
-            </ListItemIcon>
-            <ListItemText primary="Configurations List" />
-          </ListItem>
-          <Divider />
+          {allowedItems.map((page: any) => {
+            switch (page.type) {
+              case "divider": {
+                return <Divider key={page.key} />;
+              }
+              case "item": {
+                return (
+                  <ListItem
+                    key={page.to}
+                    button
+                    component={page.component}
+                    to={page.to}
+                  >
+                    {page.icon && <ListItemIcon>{page.icon}</ListItemIcon>}
+                    {page.name && <ListItemText primary={page.name} />}
+                  </ListItem>
+                );
+              }
+              case "title": {
+                return (
+                  (allowedItems || []).filter(
+                    (item: any) => item.group === page.name
+                  ).length > 0 && (
+                    <ListItem key={page.name} component={page.component}>
+                      {page.name}
+                    </ListItem>
+                  )
+                );
+              }
+              default:
+            }
+          })}
           <ListItem
             button
             onClick={() => {

portal-ui/src/screens/Console/Permissions/AddPermission.tsx

@@ -31,14 +31,14 @@ import {
   Radio,
   RadioGroup,
   Select,
-  TextField
+  TextField,
 } from "@material-ui/core";
 import {
   createStyles,
   lighten,
   makeStyles,
   Theme,
-  withStyles
+  withStyles,
 } from "@material-ui/core/styles";
 import api from "../../../common/api";
 import clsx from "clsx";
@@ -61,21 +61,21 @@ const useToolbarStyles = makeStyles((theme: Theme) =>
   createStyles({
     root: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(1)
+      paddingRight: theme.spacing(1),
     },
     highlight:
       theme.palette.type === "light"
         ? {
             color: theme.palette.secondary.main,
-            backgroundColor: lighten(theme.palette.secondary.light, 0.85)
+            backgroundColor: lighten(theme.palette.secondary.light, 0.85),
           }
         : {
             color: theme.palette.text.primary,
-            backgroundColor: theme.palette.secondary.dark
+            backgroundColor: theme.palette.secondary.dark,
           },
     title: {
-      flex: "1 1 100%"
-    }
+      flex: "1 1 100%",
+    },
   })
 );
 
@@ -90,7 +90,7 @@ const EnhancedTableToolbar = (props: EnhancedTableToolbarProps) => {
   return (
     <Toolbar
       className={clsx(classes.root, {
-        [classes.highlight]: numSelected > 0
+        [classes.highlight]: numSelected > 0,
       })}
     >
       {numSelected > 0 ? (
@@ -122,8 +122,8 @@ const EnhancedTableToolbar = (props: EnhancedTableToolbarProps) => {
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
-    }
+      color: "red",
+    },
   });
 
 interface IAddPermissionContentProps {
@@ -164,7 +164,7 @@ class AddPermissionContent extends React.Component<
     resources: [],
     buckets: [],
     bucketsError: "",
-    loadingBuckets: false
+    loadingBuckets: false,
   };
 
   componentDidMount(): void {
@@ -176,10 +176,10 @@ class AddPermissionContent extends React.Component<
           this.setState({
             loadingBuckets: false,
             buckets: res.buckets,
-            bucketsError: ""
+            bucketsError: "",
           });
         })
-        .catch(err => {
+        .catch((err) => {
           this.setState({ loadingBuckets: false, bucketsError: err });
         });
     });
@@ -190,8 +190,8 @@ class AddPermissionContent extends React.Component<
         name: selectedPermission.name,
         description: selectedPermission.description,
         effect: selectedPermission.effect,
-        resources: selectedPermission.resources.map(r => r.bucket_name),
-        action: selectedPermission.actions[0].type
+        resources: selectedPermission.resources.map((r) => r.bucket_name),
+        action: selectedPermission.actions[0].type,
       });
     }
   }
@@ -204,7 +204,7 @@ class AddPermissionContent extends React.Component<
       resources,
       description,
       effect,
-      action
+      action,
     } = this.state;
     const { selectedPermission } = this.props;
     if (addLoading) {
@@ -219,23 +219,23 @@ class AddPermissionContent extends React.Component<
             description: description,
             effect: effect,
             resources: resources,
-            actions: [action]
+            actions: [action],
           })
-          .then(res => {
+          .then((res) => {
             this.setState(
               {
                 addLoading: false,
-                addError: ""
+                addError: "",
               },
               () => {
                 this.props.closeModalAndRefresh();
               }
             );
           })
-          .catch(err => {
+          .catch((err) => {
             this.setState({
               addLoading: false,
-              addError: err
+              addError: err,
             });
           });
       } else {
@@ -245,23 +245,23 @@ class AddPermissionContent extends React.Component<
             description: description,
             effect: effect,
             resources: resources,
-            actions: [action]
+            actions: [action],
           })
-          .then(res => {
+          .then((res) => {
             this.setState(
               {
                 addLoading: false,
-                addError: ""
+                addError: "",
               },
               () => {
                 this.props.closeModalAndRefresh();
               }
             );
           })
-          .catch(err => {
+          .catch((err) => {
             this.setState({
               addLoading: false,
-              addError: err
+              addError: err,
             });
           });
       }
@@ -280,14 +280,14 @@ class AddPermissionContent extends React.Component<
       name,
       description,
       effect,
-      action
+      action,
     } = this.state;
 
     const handleSelectAllClick = (
       event: React.ChangeEvent<HTMLInputElement>
     ) => {
       if (event.target.checked) {
-        const newSelecteds = buckets.map(n => n.name);
+        const newSelecteds = buckets.map((n) => n.name);
         this.setState({ resources: newSelecteds });
         return;
       }
@@ -432,7 +432,7 @@ class AddPermissionContent extends React.Component<
                               }
                               onChange={handleSelectAllClick}
                               inputProps={{
-                                "aria-label": "select all desserts"
+                                "aria-label": "select all desserts",
                               }}
                             />
                           </TableCell>
@@ -452,7 +452,9 @@ class AddPermissionContent extends React.Component<
                             return (
                               <TableRow
                                 hover
-                                onClick={event => handleClick(event, row.name)}
+                                onClick={(event) =>
+                                  handleClick(event, row.name)
+                                }
                                 role="checkbox"
                                 aria-checked={isItemSelected}
                                 tabIndex={-1}
@@ -500,7 +502,7 @@ class AddPermissionContent extends React.Component<
                     value={action}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                       this.setState({
-                        action: (event.target as HTMLInputElement).value
+                        action: (event.target as HTMLInputElement).value,
                       });
                     }}
                   >

portal-ui/src/screens/Console/ServiceAccounts/AddServiceAccount.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,363 +14,101 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React from "react";
+import React, { useEffect, useState } from "react";
 import Grid from "@material-ui/core/Grid";
+import { UnControlled as CodeMirror } from "react-codemirror2";
 import Typography from "@material-ui/core/Typography";
-import { Button, FormControlLabel, LinearProgress } from "@material-ui/core";
-import {
-  createStyles,
-  lighten,
-  makeStyles,
-  Theme,
-  withStyles
-} from "@material-ui/core/styles";
-import api from "../../../common/api";
-import clsx from "clsx";
-import Table from "@material-ui/core/Table";
-import TableBody from "@material-ui/core/TableBody";
-import TableCell from "@material-ui/core/TableCell";
-import TableContainer from "@material-ui/core/TableContainer";
-import TableHead from "@material-ui/core/TableHead";
-import TablePagination from "@material-ui/core/TablePagination";
-import TableRow from "@material-ui/core/TableRow";
-import Toolbar from "@material-ui/core/Toolbar";
-import Checkbox from "@material-ui/core/Checkbox";
-import IconButton from "@material-ui/core/IconButton";
-import Tooltip from "@material-ui/core/Tooltip";
-import FilterListIcon from "@material-ui/icons/FilterList";
-import { Permission, PermissionList } from "../Permissions/types";
-import {
-  NewServiceAccount,
-  ServiceAccount,
-  ServiceAccountDetails
-} from "./types";
-import Switch from "@material-ui/core/Switch";
+import { Button, LinearProgress, Tooltip } from "@material-ui/core";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
-import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
+import api from "../../../common/api";
+import "codemirror/lib/codemirror.css";
+import "codemirror/theme/material.css";
+import { NewServiceAccount } from "./types";
+import HelpIcon from "@material-ui/icons/Help";
 
-const useToolbarStyles = makeStyles((theme: Theme) =>
-  createStyles({
-    root: {
-      paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(1)
-    },
-    highlight:
-      theme.palette.type === "light"
-        ? {
-            color: theme.palette.secondary.main,
-            backgroundColor: lighten(theme.palette.secondary.light, 0.85)
-          }
-        : {
-            color: theme.palette.text.primary,
-            backgroundColor: theme.palette.secondary.dark
-          },
-    title: {
-      flex: "1 1 100%"
-    }
-  })
-);
-
-interface EnhancedTableToolbarProps {
-  numSelected: number;
-}
-
-const EnhancedTableToolbar = (props: EnhancedTableToolbarProps) => {
-  const classes = useToolbarStyles();
-  const { numSelected } = props;
-
-  return (
-    <Toolbar
-      className={clsx(classes.root, {
-        [classes.highlight]: numSelected > 0
-      })}
-    >
-      {numSelected > 0 ? (
-        <Typography
-          className={classes.title}
-          color="inherit"
-          variant="subtitle1"
-        >
-          {numSelected} selected
-        </Typography>
-      ) : (
-        <Typography className={classes.title} variant="h6" id="tableTitle">
-          Permissions
-        </Typography>
-      )}
-      {numSelected > 0 ? (
-        <span />
-      ) : (
-        <Tooltip title="Filter list">
-          <IconButton aria-label="filter list">
-            <FilterListIcon />
-          </IconButton>
-        </Tooltip>
-      )}
-    </Toolbar>
-  );
-};
+require("codemirror/mode/javascript/javascript");
 
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
-    }
+      color: "red",
+    },
+    jsonPolicyEditor: {
+      minHeight: 400,
+      width: "100%",
+    },
+    codeMirror: {
+      fontSize: 14,
+    },
+    buttonContainer: {
+      textAlign: "right",
+    },
+    ...modalBasic,
   });
 
-interface IAddServiceAccountContentProps {
+interface IAddServiceAccountProps {
   classes: any;
   open: boolean;
   closeModalAndRefresh: (res: NewServiceAccount | null) => void;
-  selectedServiceAccount: ServiceAccount | null;
 }
 
-interface IAddServiceAccountContentState {
-  addLoading: boolean;
-  addError: string;
-  name: string;
-  enabled: boolean;
-  selectedPermissions: Permission[];
-  rowsPerPage: number;
-  page: number;
-  permissions: Permission[];
-  permissionsError: string;
-  loadingPermissions: boolean;
-  loadingServiceAccount: boolean;
-}
+const AddServiceAccount = ({
+  classes,
+  open,
+  closeModalAndRefresh,
+}: IAddServiceAccountProps) => {
+  const [addSending, setAddSending] = useState(false);
+  const [addError, setAddError] = useState("");
+  const [policyDefinition, setPolicyDefinition] = useState("");
 
-class AddServiceAccountContent extends React.Component<
-  IAddServiceAccountContentProps,
-  IAddServiceAccountContentState
-> {
-  state: IAddServiceAccountContentState = {
-    addLoading: false,
-    addError: "",
-    name: "",
-    enabled: true,
-    selectedPermissions: [],
-    rowsPerPage: 5,
-    page: 0,
-    permissions: [],
-    permissionsError: "",
-    loadingPermissions: false,
-    loadingServiceAccount: false
+  useEffect(() => {
+    if (addSending) {
+      api
+        .invoke("POST", "/api/v1/service-accounts", {
+          policy: policyDefinition,
+        })
+        .then((res) => {
+          setAddSending(false);
+          setAddError("");
+          closeModalAndRefresh(res);
+        })
+        .catch((err) => {
+          setAddSending(false);
+          setAddError(err);
+        });
+    }
+  }, [
+    addSending,
+    setAddSending,
+    setAddError,
+    policyDefinition,
+    closeModalAndRefresh,
+  ]);
+
+  const addServiceAccount = (e: React.FormEvent) => {
+    e.preventDefault();
+    setAddSending(true);
   };
 
-  componentDidMount(): void {
-    // load a list of permissions
-    this.setState({ loadingPermissions: true }, () => {
-      api
-        .invoke("GET", `/api/v1/permissions?limit=1000`)
-        .then((res: PermissionList) => {
-          this.setState({
-            loadingPermissions: false,
-            permissions: res.permissions,
-            permissionsError: ""
-          });
-        })
-        .catch(err => {
-          this.setState({ loadingPermissions: false, permissionsError: err });
-        });
-    });
-
-    const { selectedServiceAccount } = this.props;
-    if (selectedServiceAccount !== null) {
-      this.setState({ loadingServiceAccount: true }, () => {
-        api
-          .invoke(
-            "GET",
-            `/api/v1/service_accounts/${selectedServiceAccount.id}`
-          )
-          .then((res: ServiceAccountDetails) => {
-            console.log(res);
-            this.setState({
-              loadingServiceAccount: false,
-              name: selectedServiceAccount.name,
-              enabled: selectedServiceAccount.enabled,
-              selectedPermissions:
-                res.permissions === undefined || res.permissions === null
-                  ? []
-                  : res.permissions
-            });
-          })
-          .catch(err => {
-            this.setState({ loadingServiceAccount: false });
-          });
-      });
-    }
-  }
-
-  saveRecord(event: React.FormEvent) {
-    event.preventDefault();
-    const { name, addLoading, selectedPermissions, enabled } = this.state;
-    const { selectedServiceAccount } = this.props;
-    if (addLoading) {
-      return;
-    }
-    this.setState({ addLoading: true }, () => {
-      if (selectedServiceAccount !== null) {
-        api
-          .invoke(
-            "PUT",
-            `/api/v1/service_accounts/${selectedServiceAccount.id}`,
-            {
-              id: selectedServiceAccount.id,
-              name: name,
-              enabled: enabled,
-              permission_ids: selectedPermissions.map(p => p.id)
-            }
-          )
-          .then(res => {
-            this.setState(
-              {
-                addLoading: false,
-                addError: ""
-              },
-              () => {
-                this.props.closeModalAndRefresh(null);
-              }
-            );
-          })
-          .catch(err => {
-            this.setState({
-              addLoading: false,
-              addError: err
-            });
-          });
-      } else {
-        api
-          .invoke("POST", "/api/v1/service_accounts", {
-            name: name,
-            permission_ids: selectedPermissions.map(p => p.id)
-          })
-          .then((res: NewServiceAccount) => {
-            this.setState(
-              {
-                addLoading: false,
-                addError: ""
-              },
-              () => {
-                this.props.closeModalAndRefresh(res);
-              }
-            );
-          })
-          .catch(err => {
-            this.setState({
-              addLoading: false,
-              addError: err
-            });
-          });
-      }
-    });
-  }
-
-  render() {
-    const {
-      classes,
-      selectedServiceAccount,
-      open,
-      closeModalAndRefresh
-    } = this.props;
-    const {
-      addLoading,
-      addError,
-      page,
-      rowsPerPage,
-      permissions,
-      selectedPermissions,
-      name,
-      loadingServiceAccount
-    } = this.state;
-
-    const handleSelectAllClick = (
-      event: React.ChangeEvent<HTMLInputElement>
-    ) => {
-      if (event.target.checked) {
-        // const newSelecteds = permissions.map(n => n.name);
-        const newSelecteds = [...permissions];
-        this.setState({ selectedPermissions: newSelecteds });
-        return;
-      }
-      this.setState({ selectedPermissions: [] });
-    };
-
-    const handleClick = (
-      event: React.MouseEvent<unknown>,
-      perm: Permission
-    ) => {
-      let newSelected: Permission[] = [...selectedPermissions];
-      if (newSelected.filter(p => p.id === perm.id).length === 0) {
-        newSelected.push(perm);
-      } else {
-        let selectedIndex = -1;
-        for (let i = 0; i < newSelected.length; i++) {
-          if (newSelected[i].id === perm.id) {
-            selectedIndex = i;
-            break;
-          }
-        }
-        if (selectedIndex >= 0) {
-          newSelected = [
-            ...newSelected.slice(0, selectedIndex),
-            ...newSelected.slice(selectedIndex + 1)
-          ];
-        }
-      }
-
-      this.setState({ selectedPermissions: newSelected });
-    };
-
-    const handleChangePage = (event: unknown, newPage: number) => {
-      this.setState({ page: newPage });
-    };
-
-    const handleChangeRowsPerPage = (
-      event: React.ChangeEvent<HTMLInputElement>
-    ) => {
-      this.setState({ page: 0, rowsPerPage: parseInt(event.target.value, 10) });
-    };
-
-    const isSelected = (perm: Permission) =>
-      selectedPermissions.filter(p => p.id === perm.id).length > 0;
-
-    const emptyRows =
-      rowsPerPage -
-      Math.min(rowsPerPage, permissions.length - page * rowsPerPage);
-
-    const handleChange = (name: string) => (
-      event: React.ChangeEvent<HTMLInputElement>
-    ) => {
-      this.setState({ enabled: event.target.checked });
-    };
-
-    return (
-      <ModalWrapper
-        modalOpen={open}
-        onClose={() => {
-          this.setState({ addError: "" }, () => {
-            closeModalAndRefresh(null);
-          });
+  return (
+    <ModalWrapper
+      modalOpen={open}
+      onClose={() => {
+        closeModalAndRefresh(null);
+      }}
+      title={`Create Service Account`}
+    >
+      <form
+        noValidate
+        autoComplete="off"
+        onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
+          addServiceAccount(e);
         }}
-        title={
-          selectedServiceAccount !== null
-            ? "Edit Service Account"
-            : "Create Service Account"
-        }
       >
-        <form
-          noValidate
-          autoComplete="off"
-          onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
-            this.saveRecord(e);
-          }}
-        >
-          <Grid container>
-            {loadingServiceAccount && (
-              <Grid item xs={12}>
-                <LinearProgress />
-              </Grid>
-            )}
+        <Grid container>
+          <Grid item xs={12} className={classes.formScrollable}>
             {addError !== "" && (
               <Grid item xs={12}>
                 <Typography
@@ -383,155 +121,46 @@ class AddServiceAccountContent extends React.Component<
               </Grid>
             )}
             <Grid item xs={12}>
-              <InputBoxWrapper
-                id="service-account-name"
-                name="service-account-name"
-                label="Name"
-                value={name}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  this.setState({ name: e.target.value });
+              <Typography component="h5">
+                Optional Policy
+                <Tooltip
+                  title="A policy that restricts this service account can be attached."
+                  placement="top-start"
+                >
+                  <HelpIcon />
+                </Tooltip>
+              </Typography>
+              <CodeMirror
+                className={classes.codeMirror}
+                options={{
+                  mode: "javascript",
+                  lineNumbers: true,
+                }}
+                onChange={(editor, data, value) => {
+                  setPolicyDefinition(value);
                 }}
               />
             </Grid>
-            <Grid item xs={12}>
-              <div className={classes.root}>
-                <EnhancedTableToolbar
-                  numSelected={selectedPermissions.length}
-                />
-                <TableContainer>
-                  <Table
-                    className={classes.table}
-                    aria-labelledby="tableTitle"
-                    size={"small"}
-                    aria-label="enhanced table"
-                  >
-                    <TableHead>
-                      <TableRow>
-                        <TableCell padding="checkbox">
-                          <Checkbox
-                            indeterminate={
-                              selectedPermissions.length > 0 &&
-                              selectedPermissions.length < permissions.length
-                            }
-                            checked={
-                              selectedPermissions.length > 0 &&
-                              selectedPermissions.length === permissions.length
-                            }
-                            onChange={handleSelectAllClick}
-                            inputProps={{
-                              "aria-label": "select all desserts"
-                            }}
-                          />
-                        </TableCell>
-                        <TableCell>Permission</TableCell>
-                        <TableCell>Description</TableCell>
-                      </TableRow>
-                    </TableHead>
-                    <TableBody>
-                      {permissions
-                        .slice(
-                          page * rowsPerPage,
-                          page * rowsPerPage + rowsPerPage
-                        )
-                        .map((row, index) => {
-                          const isItemSelected = isSelected(row);
-                          const labelId = `enhanced-table-checkbox-${index}`;
-
-                          return (
-                            <TableRow
-                              hover
-                              onClick={event => handleClick(event, row)}
-                              role="checkbox"
-                              aria-checked={isItemSelected}
-                              tabIndex={-1}
-                              key={row.name}
-                              selected={isItemSelected}
-                            >
-                              <TableCell padding="checkbox">
-                                <Checkbox
-                                  checked={isItemSelected}
-                                  inputProps={{ "aria-labelledby": labelId }}
-                                />
-                              </TableCell>
-                              <TableCell id={labelId}>{row.name}</TableCell>
-                              <TableCell>{row.description}</TableCell>
-                            </TableRow>
-                          );
-                        })}
-                      {emptyRows > 0 && (
-                        <TableRow style={{ height: 33 * emptyRows }}>
-                          <TableCell colSpan={6} />
-                        </TableRow>
-                      )}
-                    </TableBody>
-                  </Table>
-                </TableContainer>
-                <TablePagination
-                  rowsPerPageOptions={[5, 10, 25]}
-                  component="div"
-                  count={permissions.length}
-                  rowsPerPage={rowsPerPage}
-                  page={page}
-                  onChangePage={handleChangePage}
-                  onChangeRowsPerPage={handleChangeRowsPerPage}
-                />
-              </div>
-            </Grid>
-            <Grid item xs={12}>
-              <br />
-            </Grid>
-            <Grid item xs={12}>
-              <FormControlLabel
-                control={
-                  <Switch onChange={handleChange("enabled")} value="checkedA" />
-                }
-                label="Enabled"
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <br />
-            </Grid>
-            <Grid item xs={12}>
-              <Button
-                type="submit"
-                variant="contained"
-                color="primary"
-                disabled={addLoading}
-              >
-                Save
-              </Button>
-            </Grid>
-            {addLoading && (
-              <Grid item xs={12}>
-                <LinearProgress />
-              </Grid>
-            )}
           </Grid>
-        </form>
-      </ModalWrapper>
-    );
-  }
-}
+          <Grid item xs={12} className={classes.buttonContainer}>
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              disabled={addSending}
+            >
+              Create
+            </Button>
+          </Grid>
+          {addSending && (
+            <Grid item xs={12}>
+              <LinearProgress />
+            </Grid>
+          )}
+        </Grid>
+      </form>
+    </ModalWrapper>
+  );
+};
 
-const AddServiceAccountWrapper = withStyles(styles)(AddServiceAccountContent);
-
-interface IAddServiceAccountProps {
-  open: boolean;
-  closeModalAndRefresh: (res: NewServiceAccount | null) => void;
-  selectedServiceAccount: ServiceAccount | null;
-}
-
-interface IAddServiceAccountState {}
-
-class AddServiceAccount extends React.Component<
-  IAddServiceAccountProps,
-  IAddServiceAccountState
-> {
-  state: IAddServiceAccountState = {};
-
-  render() {
-    return <AddServiceAccountWrapper {...this.props} />;
-  }
-}
-
-export default AddServiceAccount;
+export default withStyles(styles)(AddServiceAccount);

portal-ui/src/screens/Console/ServiceAccounts/CredentialsPrompt.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -17,20 +17,19 @@
 import React from "react";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { NewServiceAccount } from "./types";
-import {
-  Button,
-  DialogActions,
-  DialogContent,
-  DialogContentText
-} from "@material-ui/core";
+import { Button } from "@material-ui/core";
 import Typography from "@material-ui/core/Typography";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
+import Grid from "@material-ui/core/Grid";
 
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
-    }
+      color: "red",
+    },
+    buttonContainer: {
+      textAlign: "right",
+    },
   });
 
 interface ICredentialsPromptProps {
@@ -40,76 +39,69 @@ interface ICredentialsPromptProps {
   closeModal: () => void;
 }
 
-interface ICredentialsPromptState {}
+const download = (filename: string, text: string) => {
+  let element = document.createElement("a");
+  element.setAttribute(
+    "href",
+    "data:text/plain;charset=utf-8," + encodeURIComponent(text)
+  );
+  element.setAttribute("download", filename);
 
-class CredentialsPrompt extends React.Component<
-  ICredentialsPromptProps,
-  ICredentialsPromptState
-> {
-  state: ICredentialsPromptState = {};
+  element.style.display = "none";
+  document.body.appendChild(element);
 
-  download(filename: string, text: string) {
-    var element = document.createElement("a");
-    element.setAttribute(
-      "href",
-      "data:text/plain;charset=utf-8," + encodeURIComponent(text)
-    );
-    element.setAttribute("download", filename);
+  element.click();
 
-    element.style.display = "none";
-    document.body.appendChild(element);
+  document.body.removeChild(element);
+};
 
-    element.click();
-
-    document.body.removeChild(element);
+const CredentialsPrompt = ({
+  classes,
+  newServiceAccount,
+  open,
+  closeModal,
+}: ICredentialsPromptProps) => {
+  if (!newServiceAccount) {
+    return null;
   }
 
-  render() {
-    const { classes, open, newServiceAccount } = this.props;
-
-    if (newServiceAccount === null) {
-      return <div />;
-    }
-
-    return (
-      <ModalWrapper
-        modalOpen={open}
-        onClose={() => {
-          this.props.closeModal();
-        }}
-        title="New Service Account"
-      >
-        <React.Fragment>
-          <DialogContent>
-            <DialogContentText id="alert-dialog-description">
-              A new service account has been created with the following details:
-              <ul>
-                <li>
-                  <b>Access Key:</b>{" "}
-                  {newServiceAccount.service_account.access_key}
-                </li>
-                <li>
-                  <b>Secret Key:</b> {newServiceAccount.secret_key}
-                </li>
-              </ul>
-              <Typography
-                component="p"
-                variant="body1"
-                className={classes.errorBlock}
-              >
-                Write these down, as this is the only time the secret will be
-                displayed.
-              </Typography>
-            </DialogContentText>
-          </DialogContent>
-          <DialogActions>
+  return (
+    <ModalWrapper
+      modalOpen={open}
+      onClose={() => {
+        closeModal();
+      }}
+      title="New Service Account Created"
+    >
+      <React.Fragment>
+        <Grid container>
+          <Grid item xs={12} className={classes.formScrollable}>
+            A new service account has been created with the following details:
+            <ul>
+              <li>
+                <b>Access Key:</b> {newServiceAccount.accessKey}
+              </li>
+              <li>
+                <b>Secret Key:</b> {newServiceAccount.secretKey}
+              </li>
+            </ul>
+            <Typography
+              component="p"
+              variant="body1"
+              className={classes.errorBlock}
+            >
+              Write these down, as this is the only time the secret will be
+              displayed.
+            </Typography>
+          </Grid>
+          <Grid item xs={12} className={classes.buttonContainer}>
             <Button
               onClick={() => {
-                this.download(
+                download(
                   "credentials.json",
                   JSON.stringify({
-                    access_key: newServiceAccount.service_account.access_key,
-                    secret_key: newServiceAccount.secret_key
+                    access_key: newServiceAccount.accessKey,
+                    secret_key: newServiceAccount.secretKey,
                   })
                 );
               }}
@@ -119,18 +111,18 @@ class CredentialsPrompt extends React.Component<
             </Button>
             <Button
               onClick={() => {
-                this.props.closeModal();
+                closeModal();
               }}
               color="secondary"
               autoFocus
             >
               Done
             </Button>
-          </DialogActions>
-        </React.Fragment>
-      </ModalWrapper>
-    );
-  }
-}
+          </Grid>
+        </Grid>
+      </React.Fragment>
+    </ModalWrapper>
+  );
+};
 
 export default withStyles(styles)(CredentialsPrompt);

portal-ui/src/screens/Console/ServiceAccounts/DeleteServiceAccount.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,152 +14,117 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import React, { useState, useEffect } from "react";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import React from "react";
+import Typography from "@material-ui/core/Typography";
 import {
-    Button,
-    Dialog,
-    DialogActions,
-    DialogContent,
-    DialogContentText,
-    DialogTitle,
-    LinearProgress
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  LinearProgress,
 } from "@material-ui/core";
 import api from "../../../common/api";
-import { ServiceAccount, ServiceAccountsList } from "./types";
-import Typography from "@material-ui/core/Typography";
 
 const styles = (theme: Theme) =>
-    createStyles({
-        errorBlock: {
-            color: "red"
-        },
-        wrapText: {
-            maxWidth: "200px",
-            whiteSpace: "normal",
-            wordWrap: "break-word"
-        }
-    });
+  createStyles({
+    errorBlock: {
+      color: "red",
+    },
+    wrapText: {
+      maxWidth: "200px",
+      whiteSpace: "normal",
+      wordWrap: "break-word",
+    },
+  });
 
 interface IDeleteServiceAccountProps {
-    classes: any;
-    closeDeleteModalAndRefresh: (refresh: boolean) => void;
-    deleteOpen: boolean;
-    selectedServiceAccount: ServiceAccount | null;
+  classes: any;
+  closeDeleteModalAndRefresh: (refresh: boolean) => void;
+  deleteOpen: boolean;
+  selectedServiceAccount: string | null;
 }
 
-interface IDeleteServiceAccountState {
-    deleteLoading: boolean;
-    deleteError: string;
-}
+const DeleteServiceAccount = ({
+  classes,
+  closeDeleteModalAndRefresh,
+  deleteOpen,
+  selectedServiceAccount,
+}: IDeleteServiceAccountProps) => {
+  const [deleteLoading, setDeleteLoading] = useState(false);
+  const [deleteError, setDeleteError] = useState("");
 
-class DeleteServiceAccount extends React.Component<
-    IDeleteServiceAccountProps,
-    IDeleteServiceAccountState
-    > {
-    state: IDeleteServiceAccountState = {
-        deleteLoading: false,
-        deleteError: ""
-    };
-
-    removeRecord() {
-        const { deleteLoading } = this.state;
-        const { selectedServiceAccount } = this.props;
-        if (deleteLoading) {
-            return;
-        }
-        if (selectedServiceAccount == null) {
-            return;
-        }
-        this.setState({ deleteLoading: true }, () => {
-            api
-                .invoke("DELETE", `/api/v1/service_accounts/${selectedServiceAccount.id}`, {
-                    id: selectedServiceAccount.id
-                })
-                .then((res: ServiceAccountsList) => {
-                    this.setState(
-                        {
-                            deleteLoading: false,
-                            deleteError: ""
-                        },
-                        () => {
-                            this.props.closeDeleteModalAndRefresh(true);
-                        }
-                    );
-                })
-                .catch(err => {
-                    this.setState({
-                        deleteLoading: false,
-                        deleteError: err
-                    });
-                });
+  useEffect(() => {
+    if (deleteLoading) {
+      api
+        .invoke("DELETE", `/api/v1/service-accounts/${selectedServiceAccount}`)
+        .then(() => {
+          setDeleteLoading(false);
+          setDeleteError("");
+          closeDeleteModalAndRefresh(true);
+        })
+        .catch((err) => {
+          setDeleteLoading(false);
+          setDeleteError(err);
         });
     }
+  }, [deleteLoading, closeDeleteModalAndRefresh, selectedServiceAccount]);
 
-    render() {
-        const { classes, deleteOpen, selectedServiceAccount } = this.props;
-        const { deleteLoading, deleteError } = this.state;
-
-        if (selectedServiceAccount === null) {
-            return <div />;
-        }
-
-        return (
-            <Dialog
-                open={deleteOpen}
-                onClose={() => {
-                    this.setState({ deleteError: "" }, () => {
-                        this.props.closeDeleteModalAndRefresh(false);
-                    });
-                }}
-                aria-labelledby="alert-dialog-title"
-                aria-describedby="alert-dialog-description"
-            >
-                <DialogTitle id="alert-dialog-title">Delete ServiceAccount</DialogTitle>
-                <DialogContent>
-                    {deleteLoading && <LinearProgress />}
-                    <DialogContentText id="alert-dialog-description">
-                        Are you sure you want to delete service account{" "}
-                        <b className={classes.wrapText}>{selectedServiceAccount.name}</b>?
-                        {deleteError !== "" && (
-                            <React.Fragment>
-                                <br />
-                                <Typography
-                                    component="p"
-                                    variant="body1"
-                                    className={classes.errorBlock}
-                                >
-                                    {deleteError}
-                                </Typography>
-                            </React.Fragment>
-                        )}
-                    </DialogContentText>
-                </DialogContent>
-                <DialogActions>
-                    <Button
-                        onClick={() => {
-                            this.setState({ deleteError: "" }, () => {
-                                this.props.closeDeleteModalAndRefresh(false);
-                            });
-                        }}
-                        color="primary"
-                        disabled={deleteLoading}
-                    >
-                        Cancel
-                    </Button>
-                    <Button
-                        onClick={() => {
-                            this.removeRecord();
-                        }}
-                        color="secondary"
-                        autoFocus
-                    >
-                        Delete
-                    </Button>
-                </DialogActions>
-            </Dialog>
-        );
+  const removeRecord = () => {
+    if (selectedServiceAccount == null) {
+      return;
     }
-}
+
+    setDeleteLoading(true);
+  };
+
+  return (
+    <Dialog
+      open={deleteOpen}
+      onClose={() => {
+        closeDeleteModalAndRefresh(false);
+      }}
+      aria-labelledby="alert-dialog-title"
+      aria-describedby="alert-dialog-description"
+    >
+      <DialogTitle id="alert-dialog-title">Delete ServiceAccount</DialogTitle>
+      <DialogContent>
+        {deleteLoading && <LinearProgress />}
+        <DialogContentText id="alert-dialog-description">
+          Are you sure you want to delete service account{" "}
+          <b className={classes.wrapText}>{selectedServiceAccount}</b>?
+          {deleteError !== "" && (
+            <React.Fragment>
+              <br />
+              <Typography
+                component="p"
+                variant="body1"
+                className={classes.errorBlock}
+              >
+                {deleteError}
+              </Typography>
+            </React.Fragment>
+          )}
+        </DialogContentText>
+      </DialogContent>
+      <DialogActions>
+        <Button
+          onClick={() => {
+            closeDeleteModalAndRefresh(false);
+          }}
+          color="primary"
+          disabled={deleteLoading}
+        >
+          Cancel
+        </Button>
+        <Button onClick={removeRecord} color="secondary" autoFocus>
+          Delete
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
 
 export default withStyles(styles)(DeleteServiceAccount);

portal-ui/src/screens/Console/ServiceAccounts/ServiceAccounts.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,401 +14,295 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React from "react";
+import React, { useState, useEffect } from "react";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import Table from "@material-ui/core/Table";
-import TableBody from "@material-ui/core/TableBody";
-import TableCell from "@material-ui/core/TableCell";
-import TableHead from "@material-ui/core/TableHead";
-import TableRow from "@material-ui/core/TableRow";
-import Paper from "@material-ui/core/Paper";
 import Grid from "@material-ui/core/Grid";
 import api from "../../../common/api";
-import {
-  Button,
-  IconButton,
-  LinearProgress,
-  TableFooter,
-  TablePagination
-} from "@material-ui/core";
+import { Button } from "@material-ui/core";
 import Typography from "@material-ui/core/Typography";
-import {
-  NewServiceAccount,
-  ServiceAccount,
-  ServiceAccountsList
-} from "./types";
+import { NewServiceAccount } from "./types";
 import { MinTablePaginationActions } from "../../../common/MinTablePaginationActions";
-import EditIcon from "@material-ui/icons/Edit";
 import AddServiceAccount from "./AddServiceAccount";
 import DeleteServiceAccount from "./DeleteServiceAccount";
 import CredentialsPrompt from "./CredentialsPrompt";
-import { CreateIcon, DeleteIcon } from "../../../icons";
-import Checkbox from "@material-ui/core/Checkbox";
-import PlayArrowRoundedIcon from "@material-ui/icons/PlayArrowRounded";
+import { CreateIcon } from "../../../icons";
 import TextField from "@material-ui/core/TextField";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
+import TableWrapper from "../Common/TableWrapper/TableWrapper";
+import { stringSort } from "../../../utils/sortFunctions";
 
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
     addSideBar: {
       width: "480px",
       minWidth: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     wrapCell: {
       maxWidth: "200px",
       whiteSpace: "normal",
-      wordWrap: "break-word"
+      wordWrap: "break-word",
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     imageIcon: {
-      height: "100%"
+      height: "100%",
     },
     iconRoot: {
-      textAlign: "center"
+      textAlign: "center",
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
-    }
+      boxShadow: "0px 3px 6px #00000012",
+    },
   });
 
 interface IServiceAccountsProps {
   classes: any;
 }
 
-interface IServiceAccountsState {
-  records: ServiceAccount[];
-  totalRecords: number;
-  loading: boolean;
-  error: string;
-  deleteError: string;
-  addScreenOpen: boolean;
-  page: number;
-  rowsPerPage: number;
-  deleteOpen: boolean;
-  selectedServiceAccount: ServiceAccount | null;
-  showNewCredentials: boolean;
-  newServiceAccount: NewServiceAccount | null;
-}
+const ServiceAccounts = ({ classes }: IServiceAccountsProps) => {
+  const [records, setRecords] = useState<string[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string>("");
+  const [filter, setFilter] = useState<string>("");
+  const [addScreenOpen, setAddScreenOpen] = useState<boolean>(false);
+  const [page, setPage] = useState<number>(0);
+  const [rowsPerPage, setRowsPerPage] = useState<number>(10);
+  const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
+  const [selectedServiceAccount, setSelectedServiceAccount] = useState<
+    string | null
+  >(null);
+  const [showNewCredentials, setShowNewCredentials] = useState<boolean>(false);
+  const [
+    newServiceAccount,
+    setNewServiceAccount,
+  ] = useState<NewServiceAccount | null>(null);
 
-class ServiceAccounts extends React.Component<
-  IServiceAccountsProps,
-  IServiceAccountsState
-> {
-  state: IServiceAccountsState = {
-    records: [],
-    totalRecords: 0,
-    loading: false,
-    error: "",
-    deleteError: "",
-    addScreenOpen: false,
-    page: 0,
-    rowsPerPage: 10,
-    deleteOpen: false,
-    selectedServiceAccount: null,
-    showNewCredentials: false,
-    newServiceAccount: null
-  };
+  useEffect(() => {
+    fetchRecords();
+  }, []);
 
-  fetchRecords() {
-    this.setState({ loading: true }, () => {
-      const { page, rowsPerPage } = this.state;
-      const offset = page * rowsPerPage;
+  useEffect(() => {
+    if (loading) {
       api
-        .invoke(
-          "GET",
-          `/api/v1/service_accounts?offset=${offset}&limit=${rowsPerPage}`
-        )
-        .then((res: ServiceAccountsList) => {
-          this.setState({
-            loading: false,
-            records: res.service_accounts,
-            totalRecords: res.total,
-            error: ""
-          });
+        .invoke("GET", `/api/v1/service-accounts`)
+        .then((res: string[]) => {
+          const serviceAccounts = res.sort(stringSort);
+
+          setLoading(false);
+          setRecords(serviceAccounts);
+          setError("");
+
           // if we get 0 results, and page > 0 , go down 1 page
-          if (
-            (res.service_accounts === undefined ||
-              res.service_accounts == null ||
-              res.service_accounts.length === 0) &&
-            page > 0
-          ) {
+          if ((!serviceAccounts || serviceAccounts.length === 0) && page > 0) {
             const newPage = page - 1;
-            this.setState({ page: newPage }, () => {
-              this.fetchRecords();
-            });
+            setPage(newPage);
+            fetchRecords();
           }
         })
-        .catch(err => {
-          this.setState({ loading: false, error: err });
+        .catch((err) => {
+          setError(err);
+          setLoading(false);
         });
-    });
-  }
-
-  closeAddModalAndRefresh(res: NewServiceAccount | null) {
-    this.setState({ addScreenOpen: false }, () => {
-      this.fetchRecords();
-    });
-    if (res !== null) {
-      this.setState({ showNewCredentials: true, newServiceAccount: res });
     }
-  }
+  }, [loading, setLoading, setRecords, setError, page, setPage]);
 
-  closeDeleteModalAndRefresh(refresh: boolean) {
-    this.setState({ deleteOpen: false }, () => {
-      if (refresh) {
-        this.fetchRecords();
-      }
-    });
-  }
+  const fetchRecords = () => {
+    setLoading(true);
+  };
 
-  componentDidMount(): void {
-    this.fetchRecords();
-  }
+  const closeAddModalAndRefresh = (res: NewServiceAccount | null) => {
+    setAddScreenOpen(false);
+    fetchRecords();
 
-  closeCredentialsModal() {
-    this.setState({ showNewCredentials: false, newServiceAccount: null });
-  }
+    if (res !== null) {
+      setShowNewCredentials(true);
+      setNewServiceAccount(res);
+    }
+  };
 
-  render() {
-    const { classes } = this.props;
-    const {
-      records,
-      totalRecords,
-      addScreenOpen,
-      loading,
-      page,
-      rowsPerPage,
-      deleteOpen,
-      selectedServiceAccount,
-      showNewCredentials,
-      newServiceAccount
-    } = this.state;
+  const closeDeleteModalAndRefresh = (refresh: boolean) => {
+    setDeleteOpen(false);
 
-    const handleChangePage = (event: unknown, newPage: number) => {
-      this.setState({ page: newPage }, () => {
-        this.fetchRecords();
-      });
-    };
+    if (refresh) {
+      fetchRecords();
+    }
+  };
 
-    const handleChangeRowsPerPage = (
-      event: React.ChangeEvent<HTMLInputElement>
-    ) => {
-      const rPP = parseInt(event.target.value, 10);
-      this.setState({ page: 0, rowsPerPage: rPP }, () => {
-        this.fetchRecords();
-      });
-    };
+  const closeCredentialsModal = () => {
+    setShowNewCredentials(false);
+    setNewServiceAccount(null);
+  };
 
-    const confirmDeleteServiceAccount = (
-      selectedServiceAccount: ServiceAccount
-    ) => {
-      this.setState({
-        deleteOpen: true,
-        selectedServiceAccount: selectedServiceAccount
-      });
-    };
+  const handleChangePage = (event: unknown, newPage: number) => {
+    setPage(newPage);
+  };
 
-    const editServiceAccount = (selectedServiceAccount: ServiceAccount) => {
-      this.setState({
-        addScreenOpen: true,
-        selectedServiceAccount: selectedServiceAccount
-      });
-    };
+  const handleChangeRowsPerPage = (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    const rPP = parseInt(event.target.value, 10);
 
-    return (
-      <React.Fragment>
-        {addScreenOpen && (
-          <AddServiceAccount
-            open={addScreenOpen}
-            selectedServiceAccount={selectedServiceAccount}
-            closeModalAndRefresh={(res: NewServiceAccount | null) => {
-              this.closeAddModalAndRefresh(res);
-            }}
-          />
-        )}
-        {deleteOpen && (
-          <DeleteServiceAccount
-            deleteOpen={deleteOpen}
-            selectedServiceAccount={selectedServiceAccount}
-            closeDeleteModalAndRefresh={(refresh: boolean) => {
-              this.closeDeleteModalAndRefresh(refresh);
-            }}
-          />
-        )}
-        {showNewCredentials && (
-          <CredentialsPrompt
-            newServiceAccount={newServiceAccount}
-            open={showNewCredentials}
-            closeModal={() => {
-              this.closeCredentialsModal();
-            }}
-          />
-        )}
-        <Grid container>
-          <Grid item xs={12}>
-            <Typography variant="h6">Service Accounts</Typography>
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12} className={classes.actionsTray}>
-            <TextField
-              placeholder="Search Service Accounts"
-              className={classes.searchField}
-              id="search-resource"
-              label=""
-              InputProps={{
-                disableUnderline: true,
-                startAdornment: (
-                  <InputAdornment position="start">
-                    <SearchIcon />
-                  </InputAdornment>
-                )
-              }}
-            />
-            <Button
-              variant="contained"
-              color="primary"
-              startIcon={<CreateIcon />}
-              onClick={() => {
-                this.setState({
-                  addScreenOpen: true,
-                  selectedServiceAccount: null
-                });
-              }}
-            >
-              Create service account
-            </Button>
-            <Button
-              variant="contained"
-              color="primary"
-              startIcon={<PlayArrowRoundedIcon />}
-              onClick={() => {
-                this.setState({
-                  addScreenOpen: true
-                });
-              }}
-            >
-              Change Access
-            </Button>
-          </Grid>
+    setPage(0);
+    setRowsPerPage(rPP);
+  };
 
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12}>
-            <Paper className={classes.paper}>
-              {loading && <LinearProgress />}
-              {records != null && records.length > 0 ? (
-                <Table size="medium">
-                  <TableHead className={classes.minTableHeader}>
-                    <TableRow>
-                      <TableCell>Select</TableCell>
-                      <TableCell>Name</TableCell>
-                      <TableCell>Access Key</TableCell>
-                      <TableCell>Status</TableCell>
-                      <TableCell align="right">Actions</TableCell>
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {records.map(row => (
-                      <TableRow key={row.name}>
-                        <TableCell padding="checkbox">
-                          <Checkbox
-                            value="secondary"
-                            color="primary"
-                            inputProps={{ "aria-label": "secondary checkbox" }}
-                          />
-                        </TableCell>
-                        <TableCell className={classes.wrapCell}>
-                          {row.name}
-                        </TableCell>
-                        <TableCell>{row.access_key}</TableCell>
-                        <TableCell>
-                          {row.enabled ? "enabled" : "disabled"}
-                        </TableCell>
-                        <TableCell align="right">
-                          <IconButton
-                            aria-label="edit"
-                            onClick={() => {
-                              editServiceAccount(row);
-                            }}
-                          >
-                            <EditIcon />
-                          </IconButton>
-                          <IconButton
-                            aria-label="delete"
-                            onClick={() => {
-                              confirmDeleteServiceAccount(row);
-                            }}
-                          >
-                            <DeleteIcon />
-                          </IconButton>
-                        </TableCell>
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                  <TableFooter>
-                    <TableRow>
-                      <TablePagination
-                        rowsPerPageOptions={[5, 10, 25]}
-                        colSpan={4}
-                        count={totalRecords}
-                        rowsPerPage={rowsPerPage}
-                        page={page}
-                        SelectProps={{
-                          inputProps: { "aria-label": "rows per page" },
-                          native: true
-                        }}
-                        onChangePage={handleChangePage}
-                        onChangeRowsPerPage={handleChangeRowsPerPage}
-                        ActionsComponent={MinTablePaginationActions}
-                      />
-                    </TableRow>
-                  </TableFooter>
-                </Table>
-              ) : (
-                <div>No Service Accounts</div>
-              )}
-            </Paper>
-          </Grid>
+  const confirmDeleteServiceAccount = (selectedServiceAccount: string) => {
+    setSelectedServiceAccount(selectedServiceAccount);
+    setDeleteOpen(true);
+  };
+
+  const tableActions = [
+    { type: "delete", onClick: confirmDeleteServiceAccount },
+  ];
+
+  const filteredRecords = records.filter((elementItem) =>
+    elementItem.toLowerCase().includes(filter.toLowerCase())
+  );
+
+  const beginRecord = page * rowsPerPage;
+  const endRecords = beginRecord + rowsPerPage;
+
+  const paginatedRecords = filteredRecords.slice(beginRecord, endRecords);
+
+  return (
+    <React.Fragment>
+      {addScreenOpen && (
+        <AddServiceAccount
+          open={addScreenOpen}
+          closeModalAndRefresh={(res: NewServiceAccount | null) => {
+            closeAddModalAndRefresh(res);
+          }}
+        />
+      )}
+      {deleteOpen && (
+        <DeleteServiceAccount
+          deleteOpen={deleteOpen}
+          selectedServiceAccount={selectedServiceAccount}
+          closeDeleteModalAndRefresh={(refresh: boolean) => {
+            closeDeleteModalAndRefresh(refresh);
+          }}
+        />
+      )}
+      {showNewCredentials && (
+        <CredentialsPrompt
+          newServiceAccount={newServiceAccount}
+          open={showNewCredentials}
+          closeModal={() => {
+            closeCredentialsModal();
+          }}
+        />
+      )}
+      <Grid container>
+        <Grid item xs={12}>
+          <Typography variant="h6">Service Accounts</Typography>
         </Grid>
-      </React.Fragment>
-    );
-  }
-}
+        <Grid item xs={12}>
+          <br />
+        </Grid>
+        <Grid item xs={12} className={classes.actionsTray}>
+          <TextField
+            placeholder="Search Service Accounts"
+            className={classes.searchField}
+            id="search-resource"
+            label=""
+            InputProps={{
+              disableUnderline: true,
+              startAdornment: (
+                <InputAdornment position="start">
+                  <SearchIcon />
+                </InputAdornment>
+              ),
+            }}
+            onChange={(e) => {
+              setFilter(e.target.value);
+              setPage(0);
+            }}
+          />
+          <Button
+            variant="contained"
+            color="primary"
+            startIcon={<CreateIcon />}
+            onClick={() => {
+              setAddScreenOpen(true);
+              setSelectedServiceAccount(null);
+            }}
+          >
+            Create service account
+          </Button>
+        </Grid>
+        <Grid item xs={12}>
+          <br />
+        </Grid>
+        {error !== "" && (
+          <Grid item xs={12}>
+            <Typography
+              component="p"
+              variant="body1"
+              className={classes.errorBlock}
+            >
+              {error}
+            </Typography>
+          </Grid>
+        )}
+        <Grid item xs={12}>
+          <TableWrapper
+            isLoading={loading}
+            records={paginatedRecords}
+            entityName={"Service Accounts"}
+            idField={""}
+            columns={[{ label: "Service Account", elementKey: "" }]}
+            itemActions={tableActions}
+            paginatorConfig={{
+              rowsPerPageOptions: [5, 10, 25],
+              colSpan: 4,
+              count: records.length,
+              rowsPerPage: rowsPerPage,
+              page,
+              SelectProps: {
+                inputProps: { "aria-label": "rows per page" },
+                native: true,
+              },
+              onChangePage: handleChangePage,
+              onChangeRowsPerPage: handleChangeRowsPerPage,
+              ActionsComponent: MinTablePaginationActions,
+            }}
+          />
+        </Grid>
+      </Grid>
+    </React.Fragment>
+  );
+};
 
 export default withStyles(styles)(ServiceAccounts);

portal-ui/src/screens/Console/ServiceAccounts/types.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -14,27 +14,12 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import {Permission} from "../Permissions/types";
-
-export interface ServiceAccount {
-    id: string;
-    name: string;
-    slug: string;
-    access_key: string;
-    enabled: boolean;
-}
-
 export interface ServiceAccountsList {
-    service_accounts: ServiceAccount[];
-    total:number;
+  service_accounts: string[];
+  total: number;
 }
 
 export interface NewServiceAccount {
-    service_account: ServiceAccount,
-    secret_key:string,
-}
-
-export interface ServiceAccountDetails {
-    service_account: ServiceAccount,
-    permissions: Permission[],
+  accessKey: string;
+  secretKey: string;
 }

portal-ui/src/screens/Console/Trace/Trace.tsx

@@ -31,15 +31,15 @@ const styles = (theme: Theme) =>
       overflow: "auto",
       "& ul": {
         margin: "4px",
-        padding: "0px"
+        padding: "0px",
       },
       "& ul li": {
         listStyle: "none",
         margin: "0px",
         padding: "0px",
-        borderBottom: "1px solid #dedede"
-      }
-    }
+        borderBottom: "1px solid #dedede",
+      },
+    },
   });
 
 interface ITrace {
@@ -53,7 +53,7 @@ const Trace = ({
   classes,
   traceMessageReceived,
   traceResetMessages,
-  messages
+  messages,
 }: ITrace) => {
   useEffect(() => {
     traceResetMessages();
@@ -96,7 +96,7 @@ const Trace = ({
       <h1>Trace</h1>
       <div className={classes.logList}>
         <ul>
-          {messages.map(m => {
+          {messages.map((m) => {
             return (
               <li key={m.key}>
                 {timeFromDate(m.time)} - {m.api}[{m.statusCode} {m.statusMsg}]{" "}
@@ -113,12 +113,12 @@ const Trace = ({
 };
 
 const mapState = (state: AppState) => ({
-  messages: state.trace.messages
+  messages: state.trace.messages,
 });
 
 const connector = connect(mapState, {
   traceMessageReceived: traceMessageReceived,
-  traceResetMessages: traceResetMessages
+  traceResetMessages: traceResetMessages,
 });
 
 export default connector(withStyles(styles)(Trace));

portal-ui/src/screens/Console/Trace/actions.ts

@@ -35,12 +35,12 @@ export type TraceActionTypes =
 export function traceMessageReceived(message: TraceMessage) {
   return {
     type: TRACE_MESSAGE_RECEIVED,
-    message: message
+    message: message,
   };
 }
 
 export function traceResetMessages() {
   return {
-    type: TRACE_RESET_MESSAGES
+    type: TRACE_RESET_MESSAGES,
   };
 }

portal-ui/src/screens/Console/Trace/reducers.ts

@@ -17,7 +17,7 @@
 import {
   TRACE_MESSAGE_RECEIVED,
   TRACE_RESET_MESSAGES,
-  TraceActionTypes
+  TraceActionTypes,
 } from "./actions";
 import { TraceMessage } from "./types";
 
@@ -26,7 +26,7 @@ export interface TraceState {
 }
 
 const initialState: TraceState = {
-  messages: []
+  messages: [],
 };
 
 export function traceReducer(
@@ -37,12 +37,12 @@ export function traceReducer(
     case TRACE_MESSAGE_RECEIVED:
       return {
         ...state,
-        messages: [...state.messages, action.message]
+        messages: [...state.messages, action.message],
       };
     case TRACE_RESET_MESSAGES:
       return {
         ...state,
-        messages: []
+        messages: [],
       };
     default:
       return state;

portal-ui/src/screens/Console/Users/GroupsSelectors.tsx

@@ -24,7 +24,7 @@ import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
 import TextField from "@material-ui/core/TextField";
 import api from "../../../common/api";
-import { groupsSort } from "../../../utils/sortFunctions";
+import { stringSort } from "../../../utils/sortFunctions";
 import { GroupsList } from "../Groups/types";
 import get from "lodash/get";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
@@ -38,43 +38,43 @@ interface IGroupsProps {
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
     addSideBar: {
       width: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     wrapCell: {
       maxWidth: "200px",
       whiteSpace: "normal",
-      wordWrap: "break-word"
+      wordWrap: "break-word",
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     actionsTray: {
       textAlign: "left",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     filterField: {
       background: "#FFFFFF",
@@ -82,24 +82,24 @@ const styles = (theme: Theme) =>
       borderRadius: 5,
       boxShadow: "0px 3px 6px #00000012",
       width: "100%",
-      zIndex: 500
+      zIndex: 500,
     },
     noFound: {
       textAlign: "center",
-      padding: "10px 0"
+      padding: "10px 0",
     },
     tableContainer: {
-      maxHeight: 200
+      maxHeight: 200,
     },
     stickyHeader: {
-      backgroundColor: "#fff"
-    }
+      backgroundColor: "#fff",
+    },
   });
 
 const GroupsSelectors = ({
   classes,
   selectedGroups,
-  setSelectedGroups
+  setSelectedGroups,
 }: IGroupsProps) => {
   // Local State
   const [records, setRecords] = useState<any[]>([]);
@@ -129,11 +129,11 @@ const GroupsSelectors = ({
         if (!groups) {
           groups = [];
         }
-        setRecords(groups.sort(groupsSort));
+        setRecords(groups.sort(stringSort));
         setError("");
         isLoading(false);
       })
-      .catch(err => {
+      .catch((err) => {
         setError(err);
         isLoading(false);
       });
@@ -151,14 +151,14 @@ const GroupsSelectors = ({
       elements.push(value);
     } else {
       // User has unchecked this field, we need to remove it from the list
-      elements = elements.filter(element => element !== value);
+      elements = elements.filter((element) => element !== value);
     }
     setSelectedGroups(elements);
 
     return elements;
   };
 
-  const filteredRecords = records.filter(elementItem =>
+  const filteredRecords = records.filter((elementItem) =>
     elementItem.includes(filter)
   );
 
@@ -183,9 +183,9 @@ const GroupsSelectors = ({
                       <InputAdornment position="start">
                         <SearchIcon />
                       </InputAdornment>
-                    )
+                    ),
                   }}
-                  onChange={e => {
+                  onChange={(e) => {
                     setFilter(e.target.value);
                   }}
                 />

portal-ui/src/screens/Console/Users/Users.tsx

@@ -22,7 +22,7 @@ import {
   Grid,
   Typography,
   TextField,
-  InputAdornment
+  InputAdornment,
 } from "@material-ui/core";
 import SearchIcon from "@material-ui/icons/Search";
 import GroupIcon from "@material-ui/icons/Group";
@@ -38,50 +38,50 @@ import TableWrapper from "../Common/TableWrapper/TableWrapper";
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     paper: {
       // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
-      flexDirection: "column"
+      flexDirection: "column",
     },
     addSideBar: {
       width: "320px",
-      padding: "20px"
+      padding: "20px",
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     tableToolbar: {
       paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0)
+      paddingRight: theme.spacing(0),
     },
     wrapCell: {
       maxWidth: "200px",
       whiteSpace: "normal",
-      wordWrap: "break-word"
+      wordWrap: "break-word",
     },
     minTableHeader: {
       color: "#393939",
       "& tr": {
         "& th": {
-          fontWeight: "bold"
-        }
-      }
+          fontWeight: "bold",
+        },
+      },
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
-        marginLeft: 10
-      }
+        marginLeft: 10,
+      },
     },
     searchField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012"
-    }
+      boxShadow: "0px 3px 6px #00000012",
+    },
   });
 
 interface IUsersProps {
@@ -118,7 +118,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
     selectedUser: null,
     addGroupOpen: false,
     filter: "",
-    checkedUsers: []
+    checkedUsers: [],
   };
 
   fetchRecords() {
@@ -133,7 +133,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
             loading: false,
             records: users.sort(usersSort),
             totalRecords: users.length,
-            error: ""
+            error: "",
           });
           // if we get 0 results, and page > 0 , go down 1 page
           if ((!users || users.length === 0) && page > 0) {
@@ -143,7 +143,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
             });
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.setState({ loading: false, error: err });
         });
     });
@@ -191,7 +191,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
       selectedUser,
       filter,
       checkedUsers,
-      addGroupOpen
+      addGroupOpen,
     } = this.state;
 
     const handleChangePage = (event: unknown, newPage: number) => {
@@ -205,7 +205,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
       this.setState({ page: 0, rowsPerPage: rPP });
     };
 
-    const filteredRecords = records.filter(elementItem =>
+    const filteredRecords = records.filter((elementItem) =>
       elementItem.accessKey.includes(filter)
     );
 
@@ -226,11 +226,11 @@ class Users extends React.Component<IUsersProps, IUsersState> {
         elements.push(value);
       } else {
         // User has unchecked this field, we need to remove it from the list
-        elements = elements.filter(element => element !== value);
+        elements = elements.filter((element) => element !== value);
       }
 
       this.setState({
-        checkedUsers: elements
+        checkedUsers: elements,
       });
 
       return elements;
@@ -239,20 +239,20 @@ class Users extends React.Component<IUsersProps, IUsersState> {
     const viewAction = (selectionElement: any): void => {
       this.setState({
         addScreenOpen: true,
-        selectedUser: selectionElement
+        selectedUser: selectionElement,
       });
     };
 
     const deleteAction = (selectionElement: any): void => {
       this.setState({
         deleteOpen: true,
-        selectedUser: selectionElement
+        selectedUser: selectionElement,
       });
     };
 
     const tableActions = [
       { type: "view", onClick: viewAction },
-      { type: "delete", onClick: deleteAction }
+      { type: "delete", onClick: deleteAction },
     ];
 
     return (
@@ -304,9 +304,9 @@ class Users extends React.Component<IUsersProps, IUsersState> {
                   <InputAdornment position="start">
                     <SearchIcon />
                   </InputAdornment>
-                )
+                ),
               }}
-              onChange={e => {
+              onChange={(e) => {
                 this.setState({ filter: e.target.value, page: 0 });
               }}
             />
@@ -318,7 +318,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
               onClick={() => {
                 if (checkedUsers.length > 0) {
                   this.setState({
-                    addGroupOpen: true
+                    addGroupOpen: true,
                   });
                 }
               }}
@@ -332,7 +332,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
               onClick={() => {
                 this.setState({
                   addScreenOpen: true,
-                  selectedUser: null
+                  selectedUser: null,
                 });
               }}
             >
@@ -361,11 +361,11 @@ class Users extends React.Component<IUsersProps, IUsersState> {
                 page: page,
                 SelectProps: {
                   inputProps: { "aria-label": "rows per page" },
-                  native: true
+                  native: true,
                 },
                 onChangePage: handleChangePage,
                 onChangeRowsPerPage: handleChangeRowsPerPage,
-                ActionsComponent: MinTablePaginationActions
+                ActionsComponent: MinTablePaginationActions,
               }}
             />
           </Grid>

portal-ui/src/screens/Console/Watch/Watch.tsx

@@ -14,12 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React, { useEffect, useState } from "react";
-import {
-  Button,
-  Grid,
-  Typography,
-  TextField
-} from "@material-ui/core";
+import { Button, Grid, Typography, TextField } from "@material-ui/core";
 import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
 import { AppState } from "../../../store";
 import { connect } from "react-redux";
@@ -29,11 +24,7 @@ import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { niceBytes, timeFromDate } from "../../../common/utils";
 import { wsProtocol } from "../../../utils/wsUtils";
 import api from "../../../common/api";
-import {
-  FormControl,
-  MenuItem,
-  Select,
-} from "@material-ui/core";
+import { FormControl, MenuItem, Select } from "@material-ui/core";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -43,27 +34,27 @@ const styles = (theme: Theme) =>
       overflow: "auto",
       "& ul": {
         margin: "4px",
-        padding: "0px"
+        padding: "0px",
       },
       "& ul li": {
         listStyle: "none",
         margin: "0px",
         padding: "0px",
-        borderBottom: "1px solid #dedede"
-      }
+        borderBottom: "1px solid #dedede",
+      },
     },
     actionsTray: {
       textAlign: "right",
       "& button": {
         marginLeft: 10,
-      }
+      },
     },
     inputField: {
       background: "#FFFFFF",
       padding: 12,
       borderRadius: 5,
       marginLeft: 10,
-      boxShadow: "0px 3px 6px #00000012"
+      boxShadow: "0px 3px 6px #00000012",
     },
     fieldContainer: {
       background: "#FFFFFF",
@@ -72,8 +63,8 @@ const styles = (theme: Theme) =>
       marginLeft: 10,
       textAlign: "left",
       minWidth: "206px",
-      boxShadow: "0px 3px 6px #00000012"
-    }
+      boxShadow: "0px 3px 6px #00000012",
+    },
   });
 
 interface IWatch {
@@ -87,7 +78,7 @@ const Watch = ({
   classes,
   watchMessageReceived,
   watchResetMessages,
-  messages
+  messages,
 }: IWatch) => {
   const [start, setStart] = useState(false);
   const [bucketName, setBucketName] = useState("Select Bucket");
@@ -108,7 +99,7 @@ const Watch = ({
       .catch((err: any) => {
         console.log(err);
       });
-  }
+  };
   useEffect(() => {
     fetchBucketList();
   }, []);
@@ -116,13 +107,15 @@ const Watch = ({
   useEffect(() => {
     watchResetMessages();
     // begin watch if bucketName in bucketList and start pressed
-    if (start && bucketList.some(bucket => bucket.name === bucketName)) {
+    if (start && bucketList.some((bucket) => bucket.name === bucketName)) {
       const url = new URL(window.location.toString());
       const isDev = process.env.NODE_ENV === "development";
       const port = isDev ? "9090" : url.port;
 
       const wsProt = wsProtocol(url.protocol);
-      const c = new W3CWebSocket(`${wsProt}://${url.hostname}:${port}/ws/watch/${bucketName}?prefix=${prefix}&suffix=${suffix}`);
+      const c = new W3CWebSocket(
+        `${wsProt}://${url.hostname}:${port}/ws/watch/${bucketName}?prefix=${prefix}&suffix=${suffix}`
+      );
 
       let interval: any | null = null;
       if (c !== null) {
@@ -156,9 +149,9 @@ const Watch = ({
     }
   }, [watchMessageReceived, start]);
 
-  const bucketNames = bucketList.map(bucketName => ({
+  const bucketNames = bucketList.map((bucketName) => ({
     label: bucketName.name,
-    value: bucketName.name
+    value: bucketName.name,
   }));
   return (
     <React.Fragment>
@@ -175,7 +168,9 @@ const Watch = ({
               id="bucket-name"
               name="bucket-name"
               value={bucketName}
-              onChange={(e) => { setBucketName(e.target.value as string) }}
+              onChange={(e) => {
+                setBucketName(e.target.value as string);
+              }}
               className={classes.fieldContainer}
               disabled={start}
             >
@@ -185,8 +180,8 @@ const Watch = ({
                 disabled={true}
               >
                 Select Bucket
-                </MenuItem>
-              {bucketNames.map(option => (
+              </MenuItem>
+              {bucketNames.map((option) => (
                 <MenuItem
                   value={option.value}
                   key={`select-bucket-name-${option.label}`}
@@ -205,7 +200,9 @@ const Watch = ({
             InputProps={{
               disableUnderline: true,
             }}
-            onChange={(e) => { setPrefix(e.target.value) }}
+            onChange={(e) => {
+              setPrefix(e.target.value);
+            }}
           />
           <TextField
             placeholder="Suffix"
@@ -216,7 +213,9 @@ const Watch = ({
             InputProps={{
               disableUnderline: true,
             }}
-            onChange={(e) => { setSuffix(e.target.value) }}
+            onChange={(e) => {
+              setSuffix(e.target.value);
+            }}
           />
           <Button
             type="submit"
@@ -226,7 +225,7 @@ const Watch = ({
             onClick={() => setStart(true)}
           >
             Start
-            </Button>
+          </Button>
         </Grid>
         <Grid item xs={12}>
           <br />
@@ -234,10 +233,11 @@ const Watch = ({
       </Grid>
       <div className={classes.watchList}>
         <ul>
-          {messages.map(m => {
+          {messages.map((m) => {
             return (
               <li key={m.key}>
-                {timeFromDate(m.Time)} - {niceBytes(m.Size + "")} - {m.Type} - {m.Path}
+                {timeFromDate(m.Time)} - {niceBytes(m.Size + "")} - {m.Type} -{" "}
+                {m.Path}
               </li>
             );
           })}
@@ -248,12 +248,12 @@ const Watch = ({
 };
 
 const mapState = (state: AppState) => ({
-  messages: state.watch.messages
+  messages: state.watch.messages,
 });
 
 const connector = connect(mapState, {
   watchMessageReceived: watchMessageReceived,
-  watchResetMessages: watchResetMessages
+  watchResetMessages: watchResetMessages,
 });
 
 export default connector(withStyles(styles)(Watch));

portal-ui/src/screens/Console/Watch/actions.ts

@@ -28,7 +28,6 @@ interface WatchResetMessagesAction {
   type: typeof WATCH_RESET_MESSAGES;
 }
 
-
 export type WatchActionTypes =
   | WatchMessageReceivedAction
   | WatchResetMessagesAction;
@@ -36,12 +35,12 @@ export type WatchActionTypes =
 export function watchMessageReceived(message: EventInfo) {
   return {
     type: WATCH_MESSAGE_RECEIVED,
-    message: message
+    message: message,
   };
 }
 
 export function watchResetMessages() {
   return {
-    type: WATCH_RESET_MESSAGES
+    type: WATCH_RESET_MESSAGES,
   };
 }

portal-ui/src/screens/Console/Watch/reducers.ts

@@ -17,7 +17,7 @@
 import {
   WATCH_MESSAGE_RECEIVED,
   WATCH_RESET_MESSAGES,
-  WatchActionTypes
+  WatchActionTypes,
 } from "./actions";
 import { EventInfo } from "./types";
 
@@ -26,7 +26,7 @@ export interface WatchState {
 }
 
 const initialState: WatchState = {
-  messages: []
+  messages: [],
 };
 
 export function watchReducer(
@@ -37,12 +37,12 @@ export function watchReducer(
     case WATCH_MESSAGE_RECEIVED:
       return {
         ...state,
-        messages: [...state.messages, action.message]
+        messages: [...state.messages, action.message],
       };
     case WATCH_RESET_MESSAGES:
       return {
         ...state,
-        messages: []
+        messages: [],
       };
     default:
       return state;

portal-ui/src/screens/Console/actions.ts

@@ -0,0 +1,32 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import { ISessionResponse } from "./types";
+
+export const SESSION_RESPONSE = "SESSION_RESPONSE";
+
+interface SessionAction {
+  type: typeof SESSION_RESPONSE;
+  message: ISessionResponse;
+}
+export type SessionActionTypes = SessionAction;
+
+export function saveSessionResponse(message: ISessionResponse) {
+  return {
+    type: SESSION_RESPONSE,
+    message: message,
+  };
+}

portal-ui/src/screens/Console/reducer.ts

@@ -0,0 +1,44 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import { ISessionResponse } from "./types";
+import { SessionActionTypes, SESSION_RESPONSE } from "./actions";
+
+export interface ConsoleState {
+  session: ISessionResponse;
+}
+
+const initialState: ConsoleState = {
+  session: {
+    status: "",
+    pages: [],
+  },
+};
+
+export function consoleReducer(
+  state = initialState,
+  action: SessionActionTypes
+): ConsoleState {
+  switch (action.type) {
+    case SESSION_RESPONSE:
+      return {
+        ...state,
+        session: action.message,
+      };
+    default:
+      return state;
+  }
+}

portal-ui/src/screens/Console/types.ts

@@ -0,0 +1,20 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export interface ISessionResponse {
+  status: string;
+  pages: string[];
+}

portal-ui/src/screens/LoginPage/LoginCallback.tsx

@@ -30,7 +30,7 @@ const LoginCallback: FC<RouteComponentProps> = ({ location }) => {
           // store the jwt token
           storage.setItem("token", res.sessionId);
           // We push to history the new URL.
-          window.location.href = "/dashboard";
+          window.location.href = "/";
         }
       })
       .catch((res: any) => {

portal-ui/src/screens/LoginPage/LoginPage.tsx

@@ -35,8 +35,8 @@ const styles = (theme: Theme) =>
   createStyles({
     "@global": {
       body: {
-        backgroundColor: "#F4F4F4"
-      }
+        backgroundColor: "#F4F4F4",
+      },
     },
     paper: {
       marginTop: theme.spacing(16),
@@ -45,48 +45,48 @@ const styles = (theme: Theme) =>
       flexDirection: "column",
       alignItems: "center",
       width: "800px",
-      margin: "auto"
+      margin: "auto",
     },
     avatar: {
       margin: theme.spacing(1),
-      backgroundColor: theme.palette.secondary.main
+      backgroundColor: theme.palette.secondary.main,
     },
     form: {
       width: "100%", // Fix IE 11 issue.
-      marginTop: theme.spacing(3)
+      marginTop: theme.spacing(3),
     },
     submit: {
-      margin: theme.spacing(3, 0, 2)
+      margin: theme.spacing(3, 0, 2),
     },
     errorBlock: {
-      color: "red"
+      color: "red",
     },
     mainContainer: {
-      borderRadius: "3px"
+      borderRadius: "3px",
     },
     theOcean: {
       borderTopLeftRadius: "3px",
       borderBottomLeftRadius: "3px",
       background:
-        "transparent linear-gradient(333deg, #281B6F 1%, #271260 13%, #120D53 83%) 0% 0% no-repeat padding-box;"
+        "transparent linear-gradient(333deg, #281B6F 1%, #271260 13%, #120D53 83%) 0% 0% no-repeat padding-box;",
     },
     oceanBg: {
       backgroundImage: "url(/images/BG_Illustration.svg)",
       backgroundRepeat: "no-repeat",
       backgroundPosition: "bottom left",
       height: "100%",
-      width: "100%"
+      width: "100%",
     },
     theLogin: {
-      padding: "76px 62px 20px 62px"
+      padding: "76px 62px 20px 62px",
     },
     loadingLoginStrategy: {
-      textAlign: "center"
-    }
+      textAlign: "center",
+    },
   });
 
 const mapState = (state: SystemState) => ({
-  loggedIn: state.loggedIn
+  loggedIn: state.loggedIn,
 });
 
 const connector = connect(mapState, { userLoggedIn });
@@ -117,8 +117,8 @@ class Login extends React.Component<ILoginProps, ILoginState> {
     loading: false,
     loginStrategy: {
       loginStrategy: "",
-      redirect: ""
-    }
+      redirect: "",
+    },
   };
 
   fetchConfiguration() {
@@ -127,12 +127,12 @@ class Login extends React.Component<ILoginProps, ILoginState> {
         .invoke("GET", "/api/v1/login")
         .then((loginDetails: ILoginDetails) => {
           this.setState({
-            loading: false
+            loading: false,
           });
           this.setState({
             loading: false,
             loginStrategy: loginDetails,
-            error: ""
+            error: "",
           });
         })
         .catch((err: any) => {
@@ -165,10 +165,11 @@ class Login extends React.Component<ILoginProps, ILoginState> {
       .then(() => {
         // We set the state in redux
         this.props.userLoggedIn(true);
-        // We push to history the new URL.
-        history.push("/dashboard");
+        // There is a browser cache issue if we change the policy associated to an account and then logout and history.push("/") after login
+        // therefore after login we need to use window.location redirect
+        window.location.href = "/";
       })
-      .catch(err => {
+      .catch((err) => {
         this.setState({ error: `${err}` });
       });
   };

portal-ui/src/screens/NotFoundPage.tsx

@@ -23,22 +23,21 @@ import Container from "@material-ui/core/Container";
 import Copyright from "../common/Copyright";
 import history from "../history";
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
   "@global": {
     body: {
-      backgroundColor: theme.palette.common.white
-    }
+      backgroundColor: theme.palette.common.white,
+    },
   },
   paper: {
     marginTop: theme.spacing(8),
     display: "flex",
     flexDirection: "column",
-    alignItems: "center"
-  }
+    alignItems: "center",
+  },
 }));
 const NotFound: React.FC = () => {
   const classes = useStyles();
-  console.log(history);
   return (
     <Container component="main">
       <CssBaseline />

portal-ui/src/store.ts

@@ -20,12 +20,14 @@ import { systemReducer } from "./reducer";
 import { traceReducer } from "./screens/Console/Trace/reducers";
 import { logReducer } from "./screens/Console/Logs/reducers";
 import { watchReducer } from "./screens/Console/Watch/reducers";
+import { consoleReducer } from "./screens/Console/reducer";
 
 const globalReducer = combineReducers({
   system: systemReducer,
   trace: traceReducer,
   logs: logReducer,
   watch: watchReducer,
+  console: consoleReducer,
 });
 
 declare global {

portal-ui/src/utils/sortFunctions.ts

@@ -29,7 +29,7 @@ export const usersSort = (a: userInterface, b: userInterface) => {
   return 0;
 };
 
-export const groupsSort = (a: string, b: string) => {
+export const stringSort = (a: string, b: string) => {
   if (a > b) {
     return 1;
   }

restapi/admin_config_test.go

@@ -28,12 +28,9 @@ import (
 	"github.com/go-openapi/swag"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/minio/minio/pkg/event/target"
-
-	"github.com/minio/minio/cmd/config"
-
 	"github.com/minio/mcs/models"
-
+	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/pkg/event/target"
 	"github.com/minio/minio/pkg/madmin"
 )
 
@@ -532,7 +529,7 @@ func Test_getConfig(t *testing.T) {
 
 				// mock function response from getConfig()
 				minioGetConfigKVMock = func(key string) ([]byte, error) {
-					return nil, errors.New("Invalid config")
+					return nil, errors.New("invalid config")
 				}
 
 				mockConfigList := madmin.Help{}
@@ -553,7 +550,7 @@ func Test_getConfig(t *testing.T) {
 			mock: func() {
 				// mock function response from getConfig()
 				minioGetConfigKVMock = func(key string) ([]byte, error) {
-					return nil, errors.New("Invalid config")
+					return nil, errors.New("invalid config")
 				}
 				// mock function response from listConfig()
 				minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {

restapi/admin_console.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"log"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -32,97 +31,46 @@ import (
 const logTimeFormat string = "15:04:05 MST 01/02/2006"
 
 // startConsoleLog starts log of the servers
-// by first setting a websocket reader that will
-// check for a heartbeat.
-//
-// A WaitGroup is used to handle goroutines and to ensure
-// all finish in the proper order. If any, sendConsoleLogInfo()
-// or wsReadCheck() returns, trace should end.
-func startConsoleLog(conn WSConn, client MinioAdmin) (mError error) {
-	// a WaitGroup waits for a collection of goroutines to finish
-	wg := sync.WaitGroup{}
-	// a cancel context is needed to end all goroutines used
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+func startConsoleLog(ctx context.Context, conn WSConn, client MinioAdmin) error {
+	// TODO: accept parameters as variables
+	// name of node, default = "" (all)
+	node := ""
+	// number of log lines
+	lineCount := 100
+	// type of logs "minio"|"application"|"all" default = "all"
+	logKind := "all"
+	// Start listening on all Console Log activity.
+	logCh := client.getLogs(ctx, node, lineCount, logKind)
 
-	// Set number of goroutines to wait. wg.Wait()
-	// waitsuntil counter is zero (all are done)
-	wg.Add(3)
-	// start go routine for reading websocket heartbeat
-	readErr := wsReadCheck(ctx, &wg, conn)
-	// send Stream of Console Log Info to the ws c.connection
-	logCh := sendConsoleLogInfo(ctx, &wg, conn, client)
-	// If wsReadCheck returns it means that it is not possible to check
-	// ws heartbeat anymore so we stop from doing Console Log, cancel context
-	// for all goroutines.
-	go func(wg *sync.WaitGroup) {
-		defer wg.Done()
-		if err := <-readErr; err != nil {
-			log.Println("error on wsReadCheck:", err)
-			mError = err
-		}
-		// cancel context for all goroutines.
-		cancel()
-	}(&wg)
-
-	// get logCh err on finish
-	if err := <-logCh; err != nil {
-		mError = err
-	}
-
-	// if logCh closes for any reason,
-	// cancel context for all goroutines
-	cancel()
-	// wait all goroutines to finish
-	wg.Wait()
-	return mError
-}
-
-// sendlogInfo sends stream of Console Log Info to the ws connection
-func sendConsoleLogInfo(ctx context.Context, wg *sync.WaitGroup, conn WSConn, client MinioAdmin) <-chan error {
-	// decrements the WaitGroup counter
-	// by one when the function returns
-	defer wg.Done()
-	ch := make(chan error)
-	go func(ch chan<- error) {
-		defer close(ch)
-
-		// TODO: accept parameters as variables
-		// name of node, default = "" (all)
-		node := ""
-		// number of log lines
-		lineCount := 100
-		// type of logs "minio"|"application"|"all" default = "all"
-		logKind := "all"
-		// Start listening on all Console Log activity.
-		logCh := client.getLogs(ctx, node, lineCount, logKind)
-
-		for logInfo := range logCh {
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		case logInfo, ok := <-logCh:
+			// zero value returned because the channel is closed and empty
+			if !ok {
+				return nil
+			}
 			if logInfo.Err != nil {
 				log.Println("error on console logs:", logInfo.Err)
-				ch <- logInfo.Err
-				return
+				return logInfo.Err
 			}
 
 			// Serialize message to be sent
 			bytes, err := json.Marshal(serializeConsoleLogInfo(&logInfo))
 			if err != nil {
 				fmt.Println("error on json.Marshal:", err)
-				ch <- err
-				return
+				return err
 			}
 
 			// Send Message through websocket connection
 			err = conn.writeMessage(websocket.TextMessage, bytes)
 			if err != nil {
 				log.Println("error writeMessage:", err)
-				ch <- err
-				return
+				return err
 			}
 		}
-	}(ch)
-
-	return ch
+	}
 }
 
 func serializeConsoleLogInfo(l *madmin.LogInfo) (logInfo madmin.LogInfo) {

restapi/admin_console_test.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gorilla/websocket"
 	"github.com/minio/minio/pkg/madmin"
 	"github.com/stretchr/testify/assert"
 )
@@ -39,11 +38,13 @@ func TestAdminConsoleLog(t *testing.T) {
 	assert := assert.New(t)
 	adminClient := adminClientMock{}
 	mockWSConn := mockConn{}
-	function := "startConsoleLog()"
+	function := "startConsoleLog(ctx, )"
+	ctx := context.Background()
 
 	testReceiver := make(chan madmin.LogInfo, 5)
 	textToReceive := "test message"
 	testStreamSize := 5
+	isClosed := false // testReceiver is closed?
 
 	// Test-1: Serve Console with no errors until Console finishes sending
 	// define mock function behavior for minio server Console
@@ -63,10 +64,6 @@ func TestAdminConsoleLog(t *testing.T) {
 		}(ch)
 		return ch
 	}
-	// mock function of conn.ReadMessage(), no error on read
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
-	}
 	writesCount := 1
 	// mock connection WriteMessage() no error
 	connWriteMessageMock = func(messageType int, data []byte) error {
@@ -74,15 +71,17 @@ func TestAdminConsoleLog(t *testing.T) {
 		var t madmin.LogInfo
 		_ = json.Unmarshal(data, &t)
 		if writesCount == testStreamSize {
-			// for testing we need to close the receiver channel
-			close(testReceiver)
+			if !isClosed {
+				close(testReceiver)
+				isClosed = true
+			}
 			return nil
 		}
 		testReceiver <- t
 		writesCount++
 		return nil
 	}
-	if err := startConsoleLog(mockWSConn, adminClient); err != nil {
+	if err := startConsoleLog(ctx, mockWSConn, adminClient); err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
 	// check that the TestReceiver got the same number of data from Console.
@@ -94,50 +93,11 @@ func TestAdminConsoleLog(t *testing.T) {
 	connWriteMessageMock = func(messageType int, data []byte) error {
 		return fmt.Errorf("error on write")
 	}
-	if err := startConsoleLog(mockWSConn, adminClient); assert.Error(err) {
+	if err := startConsoleLog(ctx, mockWSConn, adminClient); assert.Error(err) {
 		assert.Equal("error on write", err.Error())
 	}
 
-	// Test-3: error happens while reading, unexpected Close Error should return error.
-	connWriteMessageMock = func(messageType int, data []byte) error {
-		return nil
-	}
-	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseAbnormalClosure, Text: ""}
-	}
-	if err := startConsoleLog(mockWSConn, adminClient); assert.Error(err) {
-		assert.Equal("websocket: close 1006 (abnormal closure)", err.Error())
-	}
-
-	// Test-4: error happens while reading, expected Close Error NormalClosure
-	// 		   expected Close Error should not return an error, just end Console.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseNormalClosure, Text: ""}
-	}
-	if err := startConsoleLog(mockWSConn, adminClient); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-5: error happens while reading, expected Close Error CloseGoingAway
-	// 		   expected Close Error should not return an error, just return.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseGoingAway, Text: ""}
-	}
-	if err := startConsoleLog(mockWSConn, adminClient); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-6: error happens while reading, non Close Error Type should be returned as
-	//         error
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, fmt.Errorf("error on read")
-	}
-	if err := startConsoleLog(mockWSConn, adminClient); assert.Error(err) {
-		assert.Equal("error on read", err.Error())
-	}
-
-	// Test-7: error happens on GetLogs Minio, Console should stop
+	// Test-3: error happens on GetLogs Minio, Console should stop
 	// and error shall be returned.
 	minioGetLogsMock = func(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo {
 		ch := make(chan madmin.LogInfo)
@@ -156,12 +116,10 @@ func TestAdminConsoleLog(t *testing.T) {
 		}(ch)
 		return ch
 	}
-	// mock function of conn.ReadMessage(), no error on read, should stay unless
-	// context is done.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
+	connWriteMessageMock = func(messageType int, data []byte) error {
+		return nil
 	}
-	if err := startConsoleLog(mockWSConn, adminClient); assert.Error(err) {
+	if err := startConsoleLog(ctx, mockWSConn, adminClient); assert.Error(err) {
 		assert.Equal("error on Console", err.Error())
 	}
 }

restapi/admin_trace.go

@@ -23,7 +23,6 @@ import (
 	"log"
 	"net/http"
 	"strings"
-	"sync"
 
 	"github.com/gorilla/websocket"
 	"github.com/minio/minio/pkg/madmin"
@@ -50,93 +49,40 @@ type callStats struct {
 }
 
 // startTraceInfo starts trace of the servers
-// by first setting a websocket reader that will
-// check for a heartbeat.
-//
-// A WaitGroup is used to handle goroutines and to ensure
-// all finish in the proper order. If any, sendTraceInfo()
-// or wsReadCheck() returns, trace should end.
-func startTraceInfo(conn WSConn, client MinioAdmin) (mError error) {
-	// a WaitGroup waits for a collection of goroutines to finish
-	wg := sync.WaitGroup{}
-	// a cancel context is needed to end all goroutines used
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Set number of goroutines to wait. wg.Wait()
-	// waitsuntil counter is zero (all are done)
-	wg.Add(3)
-	// start go routine for reading websocket heartbeat
-	readErr := wsReadCheck(ctx, &wg, conn)
-	// send Stream of Trace Info to the ws c.connection
-	traceCh := sendTraceInfo(ctx, &wg, conn, client)
-	// If wsReadCheck returns it means that it is not possible to check
-	// ws heartbeat anymore so we stop from doing trace, cancel context
-	// for all goroutines.
-	go func(wg *sync.WaitGroup) {
-		defer wg.Done()
-		if err := <-readErr; err != nil {
-			log.Println("error on wsReadCheck:", err)
-			mError = err
-		}
-		// cancel context for all goroutines.
-		cancel()
-	}(&wg)
-
-	// get traceCh error on finish
-	if err := <-traceCh; err != nil {
-		mError = err
-	}
-
-	// if traceCh closes for any reason,
-	// cancel context for all goroutines
-	cancel()
-	// wait all goroutines to finish
-	wg.Wait()
-	return mError
-}
-
-// sendTraceInfo sends stream of Trace Info to the ws connection
-func sendTraceInfo(ctx context.Context, wg *sync.WaitGroup, conn WSConn, client MinioAdmin) <-chan error {
-	// decrements the WaitGroup counter
-	// by one when the function returns
-	defer wg.Done()
-	ch := make(chan error)
-	go func(ch chan<- error) {
-		defer close(ch)
-
-		// trace all traffic
-		allTraffic := true
-		// Trace failed requests only
-		errOnly := false
-		// Start listening on all trace activity.
-		traceCh := client.serviceTrace(ctx, allTraffic, errOnly)
-
-		for traceInfo := range traceCh {
+func startTraceInfo(ctx context.Context, conn WSConn, client MinioAdmin) error {
+	// trace all traffic
+	allTraffic := true
+	// Trace failed requests only
+	errOnly := false
+	// Start listening on all trace activity.
+	traceCh := client.serviceTrace(ctx, allTraffic, errOnly)
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		case traceInfo, ok := <-traceCh:
+			// zero value returned because the channel is closed and empty
+			if !ok {
+				return nil
+			}
 			if traceInfo.Err != nil {
 				log.Println("error on serviceTrace:", traceInfo.Err)
-				ch <- traceInfo.Err
-				return
+				return traceInfo.Err
 			}
 			// Serialize message to be sent
 			traceInfoBytes, err := json.Marshal(shortTrace(&traceInfo))
 			if err != nil {
 				fmt.Println("error on json.Marshal:", err)
-				ch <- err
-				return
+				return err
 			}
 			// Send Message through websocket connection
 			err = conn.writeMessage(websocket.TextMessage, traceInfoBytes)
 			if err != nil {
 				log.Println("error writeMessage:", err)
-				ch <- err
-				return
+				return err
 			}
 		}
-		// TODO: verbose
-	}(ch)
-
-	return ch
+	}
 }
 
 // shortTrace creates a shorter Trace Info message.

restapi/admin_trace_test.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gorilla/websocket"
 	"github.com/minio/minio/pkg/madmin"
 	trace "github.com/minio/minio/pkg/trace"
 	"github.com/stretchr/testify/assert"
@@ -40,11 +39,13 @@ func TestAdminTrace(t *testing.T) {
 	assert := assert.New(t)
 	adminClient := adminClientMock{}
 	mockWSConn := mockConn{}
-	function := "startTraceInfo()"
+	function := "startTraceInfo(ctx, )"
+	ctx := context.Background()
 
 	testReceiver := make(chan shortTraceMsg, 5)
 	textToReceive := "test"
 	testStreamSize := 5
+	isClosed := false // testReceiver is closed?
 
 	// Test-1: Serve Trace with no errors until trace finishes sending
 	// define mock function behavior for minio server Trace
@@ -64,10 +65,6 @@ func TestAdminTrace(t *testing.T) {
 		}(ch)
 		return ch
 	}
-	// mock function of conn.ReadMessage(), no error on read
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
-	}
 	writesCount := 1
 	// mock connection WriteMessage() no error
 	connWriteMessageMock = func(messageType int, data []byte) error {
@@ -76,14 +73,17 @@ func TestAdminTrace(t *testing.T) {
 		_ = json.Unmarshal(data, &t)
 		if writesCount == testStreamSize {
 			// for testing we need to close the receiver channel
-			close(testReceiver)
+			if !isClosed {
+				close(testReceiver)
+				isClosed = true
+			}
 			return nil
 		}
 		testReceiver <- t
 		writesCount++
 		return nil
 	}
-	if err := startTraceInfo(mockWSConn, adminClient); err != nil {
+	if err := startTraceInfo(ctx, mockWSConn, adminClient); err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
 	// check that the TestReceiver got the same number of data from trace.
@@ -95,50 +95,11 @@ func TestAdminTrace(t *testing.T) {
 	connWriteMessageMock = func(messageType int, data []byte) error {
 		return fmt.Errorf("error on write")
 	}
-	if err := startTraceInfo(mockWSConn, adminClient); assert.Error(err) {
+	if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
 		assert.Equal("error on write", err.Error())
 	}
 
-	// Test-3: error happens while reading, unexpected Close Error should return error.
-	connWriteMessageMock = func(messageType int, data []byte) error {
-		return nil
-	}
-	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseAbnormalClosure, Text: ""}
-	}
-	if err := startTraceInfo(mockWSConn, adminClient); assert.Error(err) {
-		assert.Equal("websocket: close 1006 (abnormal closure)", err.Error())
-	}
-
-	// Test-4: error happens while reading, expected Close Error NormalClosure
-	// 		   expected Close Error should not return an error, just end trace.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseNormalClosure, Text: ""}
-	}
-	if err := startTraceInfo(mockWSConn, adminClient); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-5: error happens while reading, expected Close Error CloseGoingAway
-	// 		   expected Close Error should not return an error, just return.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseGoingAway, Text: ""}
-	}
-	if err := startTraceInfo(mockWSConn, adminClient); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-6: error happens while reading, non Close Error Type should be returned as
-	//         error
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, fmt.Errorf("error on read")
-	}
-	if err := startTraceInfo(mockWSConn, adminClient); assert.Error(err) {
-		assert.Equal("error on read", err.Error())
-	}
-
-	// Test-7: error happens on serviceTrace Minio, trace should stop
+	// Test-3: error happens on serviceTrace Minio, trace should stop
 	// and error shall be returned.
 	minioServiceTraceMock = func(ctx context.Context, allTrace, errTrace bool) <-chan madmin.ServiceTraceInfo {
 		ch := make(chan madmin.ServiceTraceInfo)
@@ -157,12 +118,10 @@ func TestAdminTrace(t *testing.T) {
 		}(ch)
 		return ch
 	}
-	// mock function of conn.ReadMessage(), no error on read, should stay unless
-	// context is done.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
+	connWriteMessageMock = func(messageType int, data []byte) error {
+		return nil
 	}
-	if err := startTraceInfo(mockWSConn, adminClient); assert.Error(err) {
+	if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
 		assert.Equal("error on trace", err.Error())
 	}
 }

restapi/client-admin.go

@@ -84,6 +84,7 @@ type MinioAdmin interface {
 	stopProfiling(ctx context.Context) (io.ReadCloser, error)
 	serviceTrace(ctx context.Context, allTrace, errTrace bool) <-chan madmin.ServiceTraceInfo
 	getLogs(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo
+	accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error)
 	// Service Accounts
 	addServiceAccount(ctx context.Context, policy *iampolicy.Policy) (mauth.Credentials, error)
 	listServiceAccounts(ctx context.Context) (madmin.ListServiceAccountsResp, error)
@@ -228,6 +229,11 @@ func (ac adminClient) deleteServiceAccount(ctx context.Context, serviceAccount s
 	return ac.client.DeleteServiceAccount(ctx, serviceAccount)
 }
 
+// implements madmin.AccountingUsageInfo()
+func (ac adminClient) accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error) {
+	return ac.client.AccountUsageInfo(ctx)
+}
+
 func newMAdminClient(jwt string) (*madmin.AdminClient, error) {
 	claims, err := auth.JWTAuthenticate(jwt)
 	if err != nil {

restapi/client.go

@@ -163,10 +163,10 @@ var STSClient = PrepareSTSClient()
 func newMcsCredentials(accessKey, secretKey, location string) (*credentials.Credentials, error) {
 	mcsEndpoint := getMinIOServer()
 	if mcsEndpoint == "" {
-		return nil, errors.New("STS endpoint cannot be empty")
+		return nil, errors.New("endpoint cannot be empty for AssumeRoleSTS")
 	}
 	if accessKey == "" || secretKey == "" {
-		return nil, errors.New("AssumeRole credentials access/secretkey is mandatory")
+		return nil, errors.New("creredentials access/secretkey is mandatory for AssumeRoleSTS")
 	}
 
 	// Future authentication methods can be added under this switch statement
@@ -200,10 +200,19 @@ func newMcsCredentials(accessKey, secretKey, location string) (*credentials.Cred
 	}
 }
 
+// GetClaimsFromJWT decrypt and returns the claims associated to a provided jwt
+func GetClaimsFromJWT(jwt string) (*auth.DecryptedClaims, error) {
+	claims, err := auth.JWTAuthenticate(jwt)
+	if err != nil {
+		return nil, err
+	}
+	return claims, nil
+}
+
 // getMcsCredentialsFromJWT returns the *minioCredentials.Credentials associated to the
 // provided jwt, this is useful for running the Expire() or IsExpired() operations
 func getMcsCredentialsFromJWT(jwt string) (*credentials.Credentials, error) {
-	claims, err := auth.JWTAuthenticate(jwt)
+	claims, err := GetClaimsFromJWT(jwt)
 	if err != nil {
 		return nil, err
 	}

restapi/embedded_spec.go

@@ -1975,6 +1975,12 @@ func init() {
     "sessionResponse": {
       "type": "object",
       "properties": {
+        "pages": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "status": {
           "type": "string",
           "enum": [
@@ -4084,6 +4090,12 @@ func init() {
     "sessionResponse": {
       "type": "object",
       "properties": {
+        "pages": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "status": {
           "type": "string",
           "enum": [

restapi/user_buckets.go

@@ -82,22 +82,17 @@ func registerBucketsHandlers(api *operations.McsAPI) {
 	})
 }
 
-// listBuckets fetches a list of all buckets from MinIO Servers
-func listBuckets(ctx context.Context, client MinioClient) ([]*models.Bucket, error) {
-	// Get list of all buckets owned by an authenticated user.
-	// This call requires explicit authentication, no anonymous requests are
-	// allowed for listing buckets.
-	buckets, err := client.listBucketsWithContext(ctx)
+// getaAcountUsageInfo fetches a list of all buckets allowed to that particular client from MinIO Servers
+func getaAcountUsageInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, error) {
+	info, err := client.accountUsageInfo(ctx)
 	if err != nil {
 		return []*models.Bucket{}, err
 	}
-
 	var bucketInfos []*models.Bucket
-	for _, bucket := range buckets {
-		bucketElem := &models.Bucket{Name: swag.String(bucket.Name), CreationDate: bucket.CreationDate.String()}
+	for _, bucket := range info.Buckets {
+		bucketElem := &models.Bucket{Name: swag.String(bucket.Name), CreationDate: bucket.Created.String(), Size: int64(bucket.Size)}
 		bucketInfos = append(bucketInfos, bucketElem)
 	}
-
 	return bucketInfos, nil
 }
 
@@ -105,20 +100,21 @@ func listBuckets(ctx context.Context, client MinioClient) ([]*models.Bucket, err
 func getListBucketsResponse(sessionID string) (*models.ListBucketsResponse, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
 	defer cancel()
-	mClient, err := newMinioClient(sessionID)
+
+	mAdmin, err := newMAdminClient(sessionID)
 	if err != nil {
-		log.Println("error creating MinIO Client:", err)
+		log.Println("error creating Madmin Client:", err)
 		return nil, err
 	}
 	// create a minioClient interface implementation
 	// defining the client to be used
-	minioClient := minioClient{client: mClient}
-
-	buckets, err := listBuckets(ctx, minioClient)
+	adminClient := adminClient{client: mAdmin}
+	buckets, err := getaAcountUsageInfo(ctx, adminClient)
 	if err != nil {
-		log.Println("error listing buckets:", err)
+		log.Println("error accountingUsageInfo:", err)
 		return nil, err
 	}
+
 	// serialize output
 	listBucketsResponse := &models.ListBucketsResponse{
 		Buckets: buckets,

restapi/user_buckets_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/go-openapi/swag"
 	"github.com/minio/mcs/models"
 	"github.com/minio/minio-go/v6"
+	"github.com/minio/minio/pkg/madmin"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -66,41 +67,50 @@ func (mc minioClientMock) getBucketPolicy(bucketName string) (string, error) {
 	return minioGetBucketPolicyMock(bucketName)
 }
 
+var minioAccountUsageInfoMock func(ctx context.Context) (madmin.AccountUsageInfo, error)
+
+// mock function of dataUsageInfo() needed for list bucket's usage
+func (ac adminClientMock) accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error) {
+	return minioAccountUsageInfoMock(ctx)
+}
+
 func TestListBucket(t *testing.T) {
 	assert := assert.New(t)
-	minClient := minioClientMock{}
+	adminClient := adminClientMock{}
 	ctx := context.Background()
-	// Test-1 : listBuckets() Get response from minio client with two buckets and return the same number on listBuckets()
-	// mock minIO client
-	mockBucketList := []minio.BucketInfo{
-		minio.BucketInfo{Name: "bucket-1", CreationDate: time.Now()},
-		minio.BucketInfo{Name: "bucket-2", CreationDate: time.Now().Add(time.Hour * 1)},
+	// Test-1 : getaAcountUsageInfo() Get response from minio client with two buckets
+	mockBucketList := madmin.AccountUsageInfo{
+		AccountName: "test",
+		Buckets: []madmin.BucketUsageInfo{
+			madmin.BucketUsageInfo{Name: "bucket-1", Created: time.Now(), Size: 1024},
+			madmin.BucketUsageInfo{Name: "bucket-2", Created: time.Now().Add(time.Hour * 1), Size: 0},
+		},
 	}
-
 	// mock function response from listBucketsWithContext(ctx)
-	minioListBucketsWithContextMock = func(ctx context.Context) ([]minio.BucketInfo, error) {
+	minioAccountUsageInfoMock = func(ctx context.Context) (madmin.AccountUsageInfo, error) {
 		return mockBucketList, nil
 	}
 	// get list buckets response this response should have Name, CreationDate, Size and Access
 	// as part of of each bucket
-	function := "listBuckets()"
-	bucketList, err := listBuckets(ctx, minClient)
+	function := "getaAcountUsageInfo()"
+	bucketList, err := getaAcountUsageInfo(ctx, adminClient)
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
 	// verify length of buckets is correct
-	assert.Equal(len(mockBucketList), len(bucketList), fmt.Sprintf("Failed on %s: length of bucket's lists is not the same", function))
-
+	assert.Equal(len(mockBucketList.Buckets), len(bucketList), fmt.Sprintf("Failed on %s: length of bucket's lists is not the same", function))
 	for i, b := range bucketList {
-		assert.Equal(mockBucketList[i].Name, *b.Name)
-		assert.Equal(mockBucketList[i].CreationDate.String(), b.CreationDate)
+		assert.Equal(mockBucketList.Buckets[i].Name, *b.Name)
+		assert.Equal(mockBucketList.Buckets[i].Created.String(), b.CreationDate)
+		assert.Equal(mockBucketList.Buckets[i].Name, *b.Name)
+		assert.Equal(int64(mockBucketList.Buckets[i].Size), b.Size)
 	}
 
-	// Test-2 : listBuckets() Return and see that the error is handled correctly and returned
-	minioListBucketsWithContextMock = func(ctx context.Context) ([]minio.BucketInfo, error) {
-		return nil, errors.New("error")
+	// Test-2 : getaAcountUsageInfo() Return and see that the error is handled correctly and returned
+	minioAccountUsageInfoMock = func(ctx context.Context) (madmin.AccountUsageInfo, error) {
+		return madmin.AccountUsageInfo{}, errors.New("error")
 	}
-	_, err = listBuckets(ctx, minClient)
+	_, err = getaAcountUsageInfo(ctx, adminClient)
 	if assert.Error(err) {
 		assert.Equal("error", err.Error())
 	}

restapi/user_login.go

@@ -24,6 +24,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/swag"
 	"github.com/minio/mcs/models"
+	"github.com/minio/mcs/pkg/acl"
 	"github.com/minio/mcs/pkg/auth"
 	"github.com/minio/mcs/pkg/auth/idp/oauth2"
 	"github.com/minio/mcs/pkg/auth/utils"
@@ -62,8 +63,9 @@ func registerLoginHandlers(api *operations.McsAPI) {
 	})
 }
 
-// login performs a check of minioCredentials against MinIO
-func login(credentials MCSCredentials) (*string, error) {
+// login performs a check of minioCredentials against MinIO, generates some claims and returns the jwt
+// for subsequent authentication
+func login(credentials MCSCredentials, actions []string) (*string, error) {
 	// try to obtain minioCredentials,
 	tokens, err := credentials.Get()
 	if err != nil {
@@ -71,7 +73,7 @@ func login(credentials MCSCredentials) (*string, error) {
 		return nil, errInvalidCredentials
 	}
 	// if we made it here, the minioCredentials work, generate a jwt with claims
-	jwt, err := auth.NewJWTWithClaimsForClient(&tokens, getMinIOServer())
+	jwt, err := auth.NewJWTWithClaimsForClient(&tokens, actions, getMinIOServer())
 	if err != nil {
 		log.Println("error authenticating user", err)
 		return nil, errInvalidCredentials
@@ -95,6 +97,7 @@ func getConfiguredRegionForLogin(client MinioAdmin) (string, error) {
 
 // getLoginResponse performs login() and serializes it to the handler's output
 func getLoginResponse(lr *models.LoginRequest) (*models.LoginResponse, error) {
+	ctx := context.Background()
 	mAdmin, err := newSuperMAdminClient()
 	if err != nil {
 		log.Println("error creating Madmin Client:", err)
@@ -113,7 +116,23 @@ func getLoginResponse(lr *models.LoginRequest) (*models.LoginResponse, error) {
 		return nil, errInvalidCredentials
 	}
 	credentials := mcsCredentials{minioCredentials: creds}
-	sessionID, err := login(credentials)
+	// obtain the current policy assigned to this user
+	// necessary for generating the list of allowed endpoints
+	userInfo, err := adminClient.getUserInfo(ctx, *lr.AccessKey)
+	if err != nil {
+		log.Println("error login:", err)
+		return nil, errInvalidCredentials
+	}
+	policy, _ := adminClient.getPolicy(ctx, userInfo.PolicyName)
+	// by default every user starts with an empty array of available actions
+	// therefore we would have access only to pages that doesn't require any privilege
+	// ie: service-account page
+	actions := []string{}
+	// if a policy is assigned to this user we parse the actions from there
+	if policy != nil {
+		actions = acl.GetActionsStringFromPolicy(policy)
+	}
+	sessionID, err := login(credentials, actions)
 	if err != nil {
 		return nil, err
 	}
@@ -201,10 +220,18 @@ func getLoginOauth2AuthResponse(lr *models.LoginOauth2AuthRequest) (*models.Logi
 			}
 		}()
 		// assign the "mcsAdmin" policy to this user
-		if err := setPolicy(ctx, adminClient, oauth2.GetIDPPolicyForUser(), accessKey, models.PolicyEntityUser); err != nil {
+		policyName := oauth2.GetIDPPolicyForUser()
+		if err := setPolicy(ctx, adminClient, policyName, accessKey, models.PolicyEntityUser); err != nil {
 			log.Println("error setting policy:", err)
 			return nil, errorGeneric
 		}
+		// obtain the current policy details, necessary for generating the list of allowed endpoints
+		policy, err := adminClient.getPolicy(ctx, policyName)
+		if err != nil {
+			log.Println("error reading policy:", err)
+			return nil, errorGeneric
+		}
+		actions := acl.GetActionsStringFromPolicy(policy)
 		// User was created correctly, create a new session/JWT
 		creds, err := newMcsCredentials(accessKey, secretKey, location)
 		if err != nil {
@@ -212,7 +239,7 @@ func getLoginOauth2AuthResponse(lr *models.LoginOauth2AuthRequest) (*models.Logi
 			return nil, errorGeneric
 		}
 		credentials := mcsCredentials{minioCredentials: creds}
-		jwt, err := login(credentials)
+		jwt, err := login(credentials, actions)
 		if err != nil {
 			return nil, err
 		}

restapi/user_login_test.go

@@ -52,7 +52,7 @@ func TestLogin(t *testing.T) {
 			SignerType:      0,
 		}, nil
 	}
-	jwt, err := login(mcsCredentials)
+	jwt, err := login(mcsCredentials, []string{""})
 	funcAssert.NotEmpty(jwt, "JWT was returned empty")
 	funcAssert.Nil(err, "error creating a session")
 
@@ -60,7 +60,7 @@ func TestLogin(t *testing.T) {
 	mcsCredentialsGetMock = func() (credentials.Value, error) {
 		return credentials.Value{}, errors.New("")
 	}
-	_, err = login(mcsCredentials)
+	_, err = login(mcsCredentials, []string{""})
 	funcAssert.NotNil(err, "not error returned creating a session")
 }
 
@@ -126,7 +126,7 @@ func Test_getConfiguredRegion(t *testing.T) {
 			mock: func() {
 				// mock function response from getConfig()
 				minioGetConfigKVMock = func(key string) ([]byte, error) {
-					return nil, errors.New("Invalid config")
+					return nil, errors.New("invalid config")
 				}
 				// mock function response from listConfig()
 				minioHelpConfigKVMock = func(subSys, key string, envOnly bool) (madmin.Help, error) {

restapi/user_session.go

@@ -17,26 +17,45 @@
 package restapi
 
 import (
+	"errors"
+	"log"
+
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/swag"
 	"github.com/minio/mcs/models"
+	"github.com/minio/mcs/pkg/acl"
 	"github.com/minio/mcs/restapi/operations"
 	"github.com/minio/mcs/restapi/operations/user_api"
 )
 
+var (
+	errorGenericInvalidSession = errors.New("invalid session")
+)
+
 func registerSessionHandlers(api *operations.McsAPI) {
 	// session check
 	api.UserAPISessionCheckHandler = user_api.SessionCheckHandlerFunc(func(params user_api.SessionCheckParams, principal *models.Principal) middleware.Responder {
-		sessionResp := getSessionResponse()
+		sessionID := string(*principal)
+		sessionResp, err := getSessionResponse(sessionID)
+		if err != nil {
+			return user_api.NewSessionCheckDefault(401).WithPayload(&models.Error{Code: 401, Message: swag.String(err.Error())})
+		}
 		return user_api.NewSessionCheckOK().WithPayload(sessionResp)
 	})
 
 }
 
-// getSessionResponse returns only if the session is valid
-func getSessionResponse() *models.SessionResponse {
+// getSessionResponse parse the jwt of the current session and returns a list of allowed actions to render in the UI
+func getSessionResponse(sessionID string) (*models.SessionResponse, error) {
 	// serialize output
+	claims, err := GetClaimsFromJWT(sessionID)
+	if err != nil {
+		log.Println("error getting claims from JWT", err)
+		return nil, errorGenericInvalidSession
+	}
 	sessionResp := &models.SessionResponse{
+		Pages:  acl.GetAuthorizedEndpoints(claims.Actions),
 		Status: models.SessionResponseStatusOk,
 	}
-	return sessionResp
+	return sessionResp, nil
 }

restapi/user_watch.go

@@ -24,7 +24,6 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
-	"sync"
 
 	"github.com/gorilla/websocket"
 	mc "github.com/minio/mc/cmd"
@@ -35,106 +34,48 @@ type watchOptions struct {
 	mc.WatchOptions
 }
 
-// startWatch starts by setting a websocket reader that
-// will check for a heartbeat.
-//
-// A WaitGroup is used to handle goroutines and to ensure
-// all finish in the proper order. If any, sendWatchInfo()
-// or wsReadCheck() returns, watch should end.
-func startWatch(conn WSConn, client MCS3Client, options watchOptions) (mError error) {
-	// a WaitGroup waits for a collection of goroutines to finish
-	wg := sync.WaitGroup{}
-	// a cancel context is needed to end all goroutines used
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Set number of goroutines to wait. wg.Wait()
-	// waits until counter is zero (all are done)
-	wg.Add(3)
-	// start go routine for reading websocket heartbeat
-	readErr := wsReadCheck(ctx, &wg, conn)
-	// send Stream of watch events to the ws c.connection
-	ch := sendWatchInfo(ctx, &wg, conn, client, options)
-	// If wsReadCheck returns it means that it is not possible to check
-	// ws heartbeat anymore so we stop from doing Watch, cancel context
-	// for all goroutines.
-	go func(wg *sync.WaitGroup) {
-		defer wg.Done()
-		if err := <-readErr; err != nil {
-			log.Println("error on wsReadCheck:", err)
-			mError = err
-		}
-		// cancel context for all goroutines.
-		cancel()
-	}(&wg)
-
-	if err := <-ch; err != nil {
-		mError = err
+func startWatch(ctx context.Context, conn WSConn, wsc MCS3Client, options watchOptions) error {
+	wo, pErr := wsc.watch(options.WatchOptions)
+	if pErr != nil {
+		fmt.Println("error initializing watch:", pErr.Cause)
+		return pErr.Cause
 	}
-
-	// if ch closes for any reason,
-	// cancel context for all goroutines
-	cancel()
-	// wait all goroutines to finish
-	wg.Wait()
-	return mError
-}
-
-// sendWatchInfo sends stream of Watch Event to the ws connection
-func sendWatchInfo(ctx context.Context, wg *sync.WaitGroup, conn WSConn, wsc MCS3Client, options watchOptions) <-chan error {
-	// decrements the WaitGroup counter
-	// by one when the function returns
-	defer wg.Done()
-	ch := make(chan error)
-	go func(ch chan<- error) {
-		defer close(ch)
-		wo, pErr := wsc.watch(options.WatchOptions)
-		if pErr != nil {
-			fmt.Println("error initializing watch:", pErr.Cause)
-			ch <- pErr.Cause
-			return
-		}
-		for {
-			select {
-			case <-ctx.Done():
-				close(wo.DoneChan)
-				return
-			case events, ok := <-wo.Events():
-				// zero value returned because the channel is closed and empty
-				if !ok {
-					return
+	for {
+		select {
+		case <-ctx.Done():
+			close(wo.DoneChan)
+			return nil
+		case events, ok := <-wo.Events():
+			// zero value returned because the channel is closed and empty
+			if !ok {
+				return nil
+			}
+			for _, event := range events {
+				// Serialize message to be sent
+				bytes, err := json.Marshal(event)
+				if err != nil {
+					log.Println("error on json.Marshal:", err)
+					return err
 				}
-				for _, event := range events {
-					// Serialize message to be sent
-					bytes, err := json.Marshal(event)
-					if err != nil {
-						fmt.Println("error on json.Marshal:", err)
-						ch <- err
-						return
-					}
-					// Send Message through websocket connection
-					err = conn.writeMessage(websocket.TextMessage, bytes)
-					if err != nil {
-						log.Println("error writeMessage:", err)
-						ch <- err
-						return
-					}
-				}
-			case pErr, ok := <-wo.Errors():
-				// zero value returned because the channel is closed and empty
-				if !ok {
-					return
-				}
-				if pErr != nil {
-					log.Println("error on watch:", pErr.Cause)
-					ch <- pErr.Cause
-					return
-
+				// Send Message through websocket connection
+				err = conn.writeMessage(websocket.TextMessage, bytes)
+				if err != nil {
+					log.Println("error writeMessage:", err)
+					return err
 				}
 			}
+		case pErr, ok := <-wo.Errors():
+			// zero value returned because the channel is closed and empty
+			if !ok {
+				return nil
+			}
+			if pErr != nil {
+				log.Println("error on watch:", pErr.Cause)
+				return pErr.Cause
+
+			}
 		}
-	}(ch)
-	return ch
+	}
 }
 
 // getOptionsFromReq gets bucket name, events, prefix, suffix from a websocket

restapi/user_watch_test.go

@@ -17,13 +17,13 @@
 package restapi
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
 
-	"github.com/gorilla/websocket"
 	mc "github.com/minio/mc/cmd"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/stretchr/testify/assert"
@@ -42,11 +42,13 @@ func TestWatch(t *testing.T) {
 
 	client := s3ClientMock{}
 	mockWSConn := mockConn{}
+	ctx := context.Background()
 
-	function := "startWatch()"
+	function := "startWatch(ctx, )"
 
 	testStreamSize := 5
 	testReceiver := make(chan []mc.EventInfo, testStreamSize)
+	isClosed := false // testReceiver is closed?
 	textToReceive := "test message"
 	testOptions := watchOptions{}
 	testOptions.BucketName = "bucktest"
@@ -77,10 +79,6 @@ func TestWatch(t *testing.T) {
 		}(wo)
 		return wo, nil
 	}
-	// mock function of conn.ReadMessage(), no error on read
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
-	}
 	writesCount := 1
 	// mock connection WriteMessage() no error
 	connWriteMessageMock = func(messageType int, data []byte) error {
@@ -89,14 +87,17 @@ func TestWatch(t *testing.T) {
 		_ = json.Unmarshal(data, &t)
 		if writesCount == testStreamSize {
 			// for testing we need to close the receiver channel
-			close(testReceiver)
+			if !isClosed {
+				close(testReceiver)
+				isClosed = true
+			}
 			return nil
 		}
 		testReceiver <- t
 		writesCount++
 		return nil
 	}
-	if err := startWatch(mockWSConn, client, testOptions); err != nil {
+	if err := startWatch(ctx, mockWSConn, client, testOptions); err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
 	// check that the TestReceiver got the same number of data from Console.
@@ -110,50 +111,11 @@ func TestWatch(t *testing.T) {
 	connWriteMessageMock = func(messageType int, data []byte) error {
 		return fmt.Errorf("error on write")
 	}
-	if err := startWatch(mockWSConn, client, testOptions); assert.Error(err) {
+	if err := startWatch(ctx, mockWSConn, client, testOptions); assert.Error(err) {
 		assert.Equal("error on write", err.Error())
 	}
 
-	// Test-3: error happens while reading, unexpected Close Error should return error.
-	connWriteMessageMock = func(messageType int, data []byte) error {
-		return nil
-	}
-	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseAbnormalClosure, Text: ""}
-	}
-	if err := startWatch(mockWSConn, client, testOptions); assert.Error(err) {
-		assert.Equal("websocket: close 1006 (abnormal closure)", err.Error())
-	}
-
-	// Test-4: error happens while reading, expected Close Error NormalClosure
-	// 		   expected Close Error should not return an error, just end Console.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseNormalClosure, Text: ""}
-	}
-	if err := startWatch(mockWSConn, client, testOptions); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-5: error happens while reading, expected Close Error CloseGoingAway
-	// 		   expected Close Error should not return an error, just return.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseGoingAway, Text: ""}
-	}
-	if err := startWatch(mockWSConn, client, testOptions); err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
-	}
-
-	// Test-6: error happens while reading, non Close Error Type should be returned as
-	//         error
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, fmt.Errorf("error on read")
-	}
-	if err := startWatch(mockWSConn, client, testOptions); assert.Error(err) {
-		assert.Equal("error on read", err.Error())
-	}
-
-	// Test-7: error happens on Watch, watch should stop
+	// Test-3: error happens on Watch, watch should stop
 	// and error shall be returned.
 	mcWatchMock = func(params mc.WatchOptions) (*mc.WatchObject, *probe.Error) {
 		wo := &mc.WatchObject{
@@ -178,25 +140,23 @@ func TestWatch(t *testing.T) {
 		}(wo)
 		return wo, nil
 	}
-	// mock function of conn.ReadMessage(), no error on read, should stay unless
-	// context is done.
-	connReadMessageMock = func() (messageType int, p []byte, err error) {
-		return 0, []byte{}, nil
+	connWriteMessageMock = func(messageType int, data []byte) error {
+		return nil
 	}
-	if err := startWatch(mockWSConn, client, testOptions); assert.Error(err) {
+	if err := startWatch(ctx, mockWSConn, client, testOptions); assert.Error(err) {
 		assert.Equal("error on Watch", err.Error())
 	}
 
-	// Test-8: error happens on Watch, watch should stop
+	// Test-4: error happens on Watch, watch should stop
 	// and error shall be returned.
 	mcWatchMock = func(params mc.WatchOptions) (*mc.WatchObject, *probe.Error) {
 		return nil, &probe.Error{Cause: fmt.Errorf("error on Watch")}
 	}
-	if err := startWatch(mockWSConn, client, testOptions); assert.Error(err) {
+	if err := startWatch(ctx, mockWSConn, client, testOptions); assert.Error(err) {
 		assert.Equal("error on Watch", err.Error())
 	}
 
-	// Test-9: return nil on error on Watch
+	// Test-5: return nil on error on Watch
 	mcWatchMock = func(params mc.WatchOptions) (*mc.WatchObject, *probe.Error) {
 		wo := &mc.WatchObject{
 			EventInfoChan: make(chan []mc.EventInfo),
@@ -221,7 +181,7 @@ func TestWatch(t *testing.T) {
 		}(wo)
 		return wo, nil
 	}
-	if err := startWatch(mockWSConn, client, testOptions); err != nil {
+	if err := startWatch(ctx, mockWSConn, client, testOptions); err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
 	// check that the TestReceiver got the same number of data from Console.
@@ -231,7 +191,7 @@ func TestWatch(t *testing.T) {
 		}
 	}
 
-	// Test-9: getOptionsFromReq return parameters from path
+	// Test-6: getOptionsFromReq return parameters from path
 	u, err := url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=put,get")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
@@ -251,7 +211,7 @@ func TestWatch(t *testing.T) {
 	assert.Equal(expectedOptions.Suffix, opts.Suffix)
 	assert.Equal(expectedOptions.Events, opts.Events)
 
-	// Test-9: getOptionsFromReq return default events if not defined
+	// Test-7: getOptionsFromReq return default events if not defined
 	u, err = url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
@@ -271,7 +231,7 @@ func TestWatch(t *testing.T) {
 	assert.Equal(expectedOptions.Suffix, opts.Suffix)
 	assert.Equal(expectedOptions.Events, opts.Events)
 
-	// Test-10: getOptionsFromReq return default events if not defined
+	// Test-8: getOptionsFromReq return default events if not defined
 	u, err = url.Parse("http://localhost/api/v1/watch/bucket2?prefix=&suffix=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())

restapi/ws_handle.go

@@ -22,8 +22,6 @@ import (
 	"net"
 	"net/http"
 	"strings"
-	"sync"
-	"time"
 
 	"github.com/go-openapi/errors"
 	"github.com/gorilla/websocket"
@@ -39,12 +37,6 @@ var upgrader = websocket.Upgrader{
 const (
 	// websocket base path
 	wsBasePath = "/ws"
-
-	// Time allowed to read the next pong message from the peer.
-	pingWait = 15 * time.Second
-
-	// Maximum message size allowed from peer. 0 = unlimited
-	maxMessageSize = 512
 )
 
 // MCSWebsocketAdmin interface of a Websocket Client
@@ -78,9 +70,6 @@ type wsS3Client struct {
 type WSConn interface {
 	writeMessage(messageType int, data []byte) error
 	close() error
-	setReadLimit(limit int64)
-	setReadDeadline(t time.Time) error
-	setPongHandler(h func(appData string) error)
 	readMessage() (messageType int, p []byte, err error)
 }
 
@@ -99,17 +88,6 @@ func (c wsConn) close() error {
 	return c.conn.Close()
 }
 
-func (c wsConn) setReadLimit(limit int64) {
-	c.conn.SetReadLimit(limit)
-}
-
-func (c wsConn) setReadDeadline(t time.Time) error {
-	return c.conn.SetReadDeadline(t)
-}
-
-func (c wsConn) setPongHandler(h func(appData string) error) {
-	c.conn.SetPongHandler(h)
-}
 func (c wsConn) readMessage() (messageType int, p []byte, err error) {
 	return c.conn.ReadMessage()
 }
@@ -218,54 +196,35 @@ func newWebSocketS3Client(conn *websocket.Conn, jwt, bucketName string) (*wsS3Cl
 	return wsS3Client, nil
 }
 
-// wsReadCheck ensures that the client is sending a message
-// every `pingWait` seconds. If deadline exceeded or an error
-// happened this will return, meaning it won't be able to ensure
-// client heartbeat.
-func wsReadCheck(ctx context.Context, wg *sync.WaitGroup, conn WSConn) chan error {
-	// decrements the WaitGroup counter by one when the function returns
-	defer wg.Done()
-	ch := make(chan error)
-	go func(ch chan error) {
-		defer close(ch)
-
-		// set initial Limits and deadlines for the Reader
-		conn.setReadLimit(maxMessageSize)
-		conn.setReadDeadline(time.Now().Add(pingWait))
-		conn.setPongHandler(func(string) error { conn.setReadDeadline(time.Now().Add(pingWait)); return nil })
-
+// wsReadClientCtx reads the messages that come from the client
+// if the client sends a Close Message the context will be
+// canceled. If the connection is closed the goroutine inside
+// will return.
+func wsReadClientCtx(conn WSConn) context.Context {
+	// a cancel context is needed to end all goroutines used
+	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
+		defer cancel()
 		for {
-			select {
-			case <-ctx.Done():
-				log.Println("context done inside wsReadCheck")
-				return
-			default:
-				_, _, err := conn.readMessage()
-				if err != nil {
-					// if error of type websocket.CloseError and is Unexpected
-					if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
-						log.Println("error unexpected CloseError on ReadMessage:", err)
-						ch <- err
-						return
-					}
-					// Not all errors are of type websocket.CloseError.
-					// If not of type websocket.CloseError return error
-					if _, ok := err.(*websocket.CloseError); !ok {
-						log.Println("error on ReadMessage:", err)
-						ch <- err
-						return
-					}
-					// else is an expected Close Error
-					log.Println("closed conn.ReadMessage:", err)
+			_, _, err := conn.readMessage()
+			if err != nil {
+				// if error of type websocket.CloseError and is Unexpected
+				if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
+					log.Println("error unexpected CloseError on ReadMessage:", err)
 					return
 				}
-				// Reset Read Deadline after each Read
-				conn.setReadDeadline(time.Now().Add(pingWait))
-				conn.setPongHandler(func(string) error { conn.setReadDeadline(time.Now().Add(pingWait)); return nil })
+				// Not all errors are of type websocket.CloseError.
+				if _, ok := err.(*websocket.CloseError); !ok {
+					log.Println("error on ReadMessage:", err)
+					return
+				}
+				// else is an expected Close Error
+				log.Println("closed conn.ReadMessage:", err)
+				return
 			}
 		}
-	}(ch)
-	return ch
+	}()
+	return ctx
 }
 
 // trace serves madmin.ServiceTraceInfo
@@ -278,10 +237,13 @@ func (wsc *wsAdminClient) trace() {
 	}()
 	log.Println("trace started")
 
-	err := startTraceInfo(wsc.conn, wsc.client)
+	ctx := wsReadClientCtx(wsc.conn)
+
+	err := startTraceInfo(ctx, wsc.conn, wsc.client)
 	// Send Connection Close Message indicating the Status Code
 	// see https://tools.ietf.org/html/rfc6455#page-45
 	if err != nil {
+		log.Println("err:", err)
 		// If connection exceeded read deadline send Close
 		// Message Policy Violation code since we don't want
 		// to let the receiver figure out the read deadline.
@@ -309,7 +271,9 @@ func (wsc *wsAdminClient) console() {
 	}()
 	log.Println("console logs started")
 
-	err := startConsoleLog(wsc.conn, wsc.client)
+	ctx := wsReadClientCtx(wsc.conn)
+
+	err := startConsoleLog(ctx, wsc.conn, wsc.client)
 	// Send Connection Close Message indicating the Status Code
 	// see https://tools.ietf.org/html/rfc6455#page-45
 	if err != nil {
@@ -338,7 +302,9 @@ func (wsc *wsS3Client) watch(params watchOptions) {
 	}()
 	log.Println("watch started")
 
-	err := startWatch(wsc.conn, wsc.client, params)
+	ctx := wsReadClientCtx(wsc.conn)
+
+	err := startWatch(ctx, wsc.conn, wsc.client, params)
 	// Send Connection Close Message indicating the Status Code
 	// see https://tools.ietf.org/html/rfc6455#page-45
 	if err != nil {

restapi/ws_handle_test.go

@@ -17,7 +17,10 @@
 package restapi
 
 import (
-	"time"
+	"errors"
+	"testing"
+
+	"github.com/gorilla/websocket"
 )
 
 // Common mocks for WSConn interface
@@ -25,12 +28,6 @@ import (
 var connWriteMessageMock func(messageType int, data []byte) error
 var connReadMessageMock func() (messageType int, p []byte, err error)
 
-// Uncomment and implement if needed
-// var connCloseMock func() error
-// var connSetReadLimitMock func(limit int64)
-// var connSetReadDeadlineMock func(t time.Time) error
-// var connSetPongHandlerMock func(h func(appData string) error)
-
 // The Conn type represents a WebSocket connection.
 type mockConn struct{}
 
@@ -44,10 +41,33 @@ func (c mockConn) readMessage() (messageType int, p []byte, err error) {
 func (c mockConn) close() error {
 	return nil
 }
-func (c mockConn) setReadLimit(limit int64) {
-}
-func (c mockConn) setReadDeadline(t time.Time) error {
-	return nil
-}
-func (c mockConn) setPongHandler(h func(appData string) error) {
+
+func TestWSHandle(t *testing.T) {
+	// assert := assert.New(t)
+	mockWSConn := mockConn{}
+
+	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
+	connReadMessageMock = func() (messageType int, p []byte, err error) {
+		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseAbnormalClosure, Text: ""}
+	}
+	ctx := wsReadClientCtx(mockWSConn)
+
+	<-ctx.Done()
+	// closed ctx correctly
+
+	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
+	connReadMessageMock = func() (messageType int, p []byte, err error) {
+		return 0, []byte{}, errors.New("error")
+	}
+	ctx2 := wsReadClientCtx(mockWSConn)
+	<-ctx2.Done()
+	// closed ctx correctly
+
+	// mock function of conn.ReadMessage(), returns unexpected Close Error CloseAbnormalClosure
+	connReadMessageMock = func() (messageType int, p []byte, err error) {
+		return 0, []byte{}, &websocket.CloseError{Code: websocket.CloseGoingAway, Text: ""}
+	}
+	ctx3 := wsReadClientCtx(mockWSConn)
+	<-ctx3.Done()
+	// closed ctx correctly
 }

swagger.yml

@@ -1313,6 +1313,10 @@ definitions:
   sessionResponse:
     type: object
     properties:
+      pages:
+        type: array
+        items:
+          type: string
       status:
         type: string
         enum: [ok]