[MM-40735] Add MattermostAppID to OAuth app (#19214)

store/sqlstore/oauth_store.go

@@ -32,9 +32,9 @@ func (as SqlOAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) {
 	}
 
 	if _, err := as.GetMasterX().NamedExec(`INSERT INTO OAuthApps
-		(Id, CreatorId, CreateAt, UpdateAt, ClientSecret, Name, Description, IconURL, CallbackUrls, Homepage, IsTrusted)
+		(Id, CreatorId, CreateAt, UpdateAt, ClientSecret, Name, Description, IconURL, CallbackUrls, Homepage, IsTrusted, MattermostAppID)
 		VALUES
-		(:Id, :CreatorId, :CreateAt, :UpdateAt, :ClientSecret, :Name, :Description, :IconURL, :CallbackUrls, :Homepage, :IsTrusted)`, app); err != nil {
+		(:Id, :CreatorId, :CreateAt, :UpdateAt, :ClientSecret, :Name, :Description, :IconURL, :CallbackUrls, :Homepage, :IsTrusted, :MattermostAppID)`, app); err != nil {
 		return nil, errors.Wrap(err, "failed to save OAuthApp")
 	}
 	return app, nil
@@ -63,7 +63,7 @@ func (as SqlOAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error)
 	res, err := as.GetMasterX().NamedExec(`UPDATE OAuthApps
 		SET UpdateAt=:UpdateAt, ClientSecret=:ClientSecret, Name=:Name,
 			Description=:Description, IconURL=:IconURL, CallbackUrls=:CallbackUrls,
-			Homepage=:Homepage, IsTrusted=:IsTrusted
+			Homepage=:Homepage, IsTrusted=:IsTrusted, MattermostAppID=:MattermostAppID
 		WHERE Id=:Id`, app)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to update OAuthApp with id=%s", app.Id)

store/storetest/oauth_store.go

@@ -48,9 +48,14 @@ func testOAuthStoreSaveApp(t *testing.T, ss store.Store) {
 	_, err = ss.OAuth().SaveApp(&a1)
 	require.Error(t, err, "Should have failed, app should be invalid cause it doesn' have a name set")
 
+	a1.Name = "TestApp" + model.NewId() // Valid name
+	a1.MattermostAppID = "a very, very, very, very, very, very, very long id"
+	_, err = ss.OAuth().SaveApp(&a1)
+	require.Error(t, err, "Should have failed, app should be invalid cause the MattermostAppID is to long")
+
 	// Save the app
 	a1.Id = ""
-	a1.Name = "TestApp" + model.NewId()
+	a1.MattermostAppID = "some small id" // Valid id
 	_, err = ss.OAuth().SaveApp(&a1)
 	require.NoError(t, err)
 }