Skip to content

Commit

Permalink
[MM-36051] Check for license using SKUs (#223)
Browse files Browse the repository at this point in the history 
* Change license check to include new SKUs

* move check from ExecuteCommand to OnActivate

* add more notice in README

* Update README.md

* Use Errorf

Co-authored-by: Justine Geffen <[email protected]>
  • Loading branch information
@mickmister @justinegeffen
mickmister and justinegeffen authored Sep 7, 2021
1 parent 38dbe19 commit 11e1777
Show file tree
Hide file tree
Showing 6 changed files with 750 additions and 300 deletions.
16 changes: 8 additions & 8 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ With regard to the Mattermost Software:

This software and associated documentation files (the "Software") may only be
used in production, if you (and any entity that you represent) have agreed to,
and are in compliance with, the Mattermost Terms of Service, available at
https://mattermost.com/enterprise-edition-terms/ (the “EE Terms”), or other
agreement governing the use of the Software, as agreed by you and Mattermost,
and otherwise have a valid Mattermost Enterprise E20 subscription for the
correct number of user seats. Subject to the foregoing sentence, you are free
and are in compliance with all of the following: (a) the Mattermost Terms of Service, available at
https://mattermost.com/enterprise-edition-terms/ (the “EE Terms”), (b) any other
agreement(s) governing the use of the Software, as agreed upon by you and Mattermost,
and (c) you otherwise have a valid license or Subscription for the
correct number of Registered Authorized Users of the Software. Subject to the foregoing, you are free
to modify this Software and publish patches to the Software. You agree that
Mattermost and/or its licensors (as applicable) retain all right, title and
interest in and to all such modifications and/or patches, and all such
modifications and/or patches may only be used, copied, modified, displayed,
distributed, or otherwise exploited with a valid Mattermost Enterprise E20
Edition subscription for the correct number of user seats. Notwithstanding
distributed, or otherwise exploited with a valid license or Subscription for the correct number of
Registered Authorized Users of the Software. Notwithstanding
the foregoing, you may copy and modify the Software for development and testing
purposes, without requiring a subscription. You agree that Mattermost and/or
purposes, without requiring a valid license or Subscription. You agree that Mattermost and/or
its licensors (as applicable) retain all right, title and interest in and to
all such modifications. You are not granted any other rights beyond what is
expressly stated herein. Subject to the foregoing, it is forbidden to copy,
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

## License

This repository is licensed under the [Mattermost Source Available License](LICENSE) and requires a valid Enterprise E20 license. See [Mattermost Source Available License](https://docs.mattermost.com/overview/faq.html#mattermost-source-available-license) to learn more.
This repository is licensed under the [Mattermost Source Available License](LICENSE), and requires a valid Mattermost E20, Professional, or Enterprise license. See our [documentation](https://docs.mattermost.com/about/frequently-asked-questions.html#mattermost-source-available-license) to learn more. If you are contributing to the project, please enable [ServiceSettings.EnableDeveloper](https://docs.mattermost.com/configure/configuration-settings.html#enable-developer-mode) in your server's config. The plugin will not start and show an error message in your server logs, if you are the missing the Enterprise License.

## Overview

Expand Down Expand Up @@ -77,7 +77,7 @@ Replace `(MM_SITE_URL)` with your Mattermost server's Site URL. Select **Registe

10. Click **Add permissions** to submit the form.

11. Next, add application permissions via **Add a permission > Microsoft Graph > Application permissions**.
11. Next, add application permissions via **Add a permission > Microsoft Graph > Application permissions**.

12. Select the following permissions:

Expand All @@ -89,7 +89,7 @@ Replace `(MM_SITE_URL)` with your Mattermost server's Site URL. Select **Registe

<img width="500" src="https://user-images.githubusercontent.com/6913320/80412303-abb07c80-889b-11ea-9640-7c2f264c790f.png"/>

14. Click **Grant admin consent for...** to grant the permissions for the application.
14. Click **Grant admin consent for...** to grant the permissions for the application.

You're all set for configuration inside of Azure.

Expand Down
16 changes: 9 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ module github.com/mattermost/mattermost-plugin-mscalendar
go 1.13

require (
github.com/golang/mock v1.4.3
github.com/gorilla/mux v1.7.4
github.com/golang/mock v1.4.4
github.com/gorilla/mux v1.8.0
github.com/jarcoal/httpmock v1.0.4
github.com/mattermost/mattermost-plugin-api v0.0.12
github.com/mattermost/mattermost-server/v5 v5.3.2-0.20200731154015-c5c6a5ce5399
github.com/mholt/archiver/v3 v3.3.2
github.com/mattermost/mattermost-plugin-api v0.0.16
github.com/mattermost/mattermost-server/v5 v5.3.2-0.20210621071817-df224571d8a1
github.com/mholt/archiver/v3 v3.5.0
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pkg/errors v0.9.1
github.com/rudderlabs/analytics-go v3.2.1+incompatible
github.com/rudderlabs/analytics-go v3.3.1+incompatible
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
github.com/yaegashi/msgraph.go v0.0.0-20191104022859-3f9096c750b2
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
)
Loading

0 comments on commit 11e1777

Please sign in to comment.