Fix little bugs

packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.coffee

@@ -21,8 +21,8 @@ Meteor.methods
 
 		RocketChat.models.OAuthApps.update applicationId,
 			$set:
-				name: integration.name
-				redirectUri: integration.redirectUri
+				name: application.name
+				redirectUri: application.redirectUri
 				_updatedAt: new Date
 				_updatedBy: RocketChat.models.Users.findOne @userId, {fields: {username: 1}}
 

packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.coffee

 oauth2server = new OAuth2Server
-	accessTokensCollectionName: 'rocketchat-oauth-access-tokens'
-	refreshTokensCollectionName: 'rocketchat-oauth-refresh-tokens'
-	clientsCollectionName: 'rocketchat-oauth-clients'
-	authCodesCollectionName: 'rocketchat-oauth-auth-codes'
+	accessTokensCollectionName: 'rocketchat_oauth_access_tokens'
+	refreshTokensCollectionName: 'rocketchat_oauth_refresh_tokens'
+	authCodesCollectionName: 'rocketchat_oauth_auth_codes'
+	clientsCollection: RocketChat.models.OAuthApps.model
 	debug: true
 
-WebApp.rawConnectHandlers.use oauth2server.app
+WebApp.connectHandlers.use oauth2server.app
 # JsonRoutes.Middleware.use oauth2server.app
 
 if not oauth2server.model.Clients.findOne()

packages/rocketchat-oauth2-server-config/package.js

@@ -16,14 +16,24 @@ Package.onUse(function(api) {
 	api.use('templating', 'client');
 	api.use('kadira:flow-router', 'client');
 
+	//// General //
+	// Server
+	api.addFiles('server/models/OAuthApps.coffee', 'server');
+
+	//// OAuth //
+	// Server
 	api.addFiles('oauth/server/oauth2-server.coffee', 'server');
 
+	api.addAssets('oauth/client/stylesheets/oauth2.less', 'server');
+	api.addFiles('oauth/client/stylesheets/load.coffee', 'server');
+
+	// Client
 	api.addFiles('oauth/client/oauth2-client.html', 'client');
 	api.addFiles('oauth/client/oauth2-client.coffee', 'client');
 
-	api.addAssets('oauth/client/stylesheets/oauth2.less', 'server');
-	api.addFiles('oauth/client/stylesheets/load.coffee', 'server');
 
+	//// Admin //
+	// Client
 	api.addFiles('admin/client/startup.coffee', 'client');
 	api.addFiles('admin/client/collection.coffee', 'client');
 	api.addFiles('admin/client/route.coffee', 'client');
@@ -32,7 +42,7 @@ Package.onUse(function(api) {
 	api.addFiles('admin/client/views/oauthApps.html', 'client');
 	api.addFiles('admin/client/views/oauthApps.coffee', 'client');
 
-	api.addFiles('admin/server/models/OAuthApps.coffee', 'server');
+	// Server
 	api.addFiles('admin/server/publications/oauthApps.coffee', 'server');
 	api.addFiles('admin/server/methods/addOAuthApp.coffee', 'server');
 	api.addFiles('admin/server/methods/updateOAuthApp.coffee', 'server');