Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove global ServiceConfiguration #12960

Merged
merged 1 commit into from
Dec 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"RocketChat" : true,
"RoomHistoryManager" : false,
"RoomManager" : false,
"ServiceConfiguration" : false,
"Settings" : false,
"SideNav" : false,
"t" : false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Accounts } from 'meteor/accounts-base';
import { Random } from 'meteor/random';
import { ServiceConfiguration } from 'meteor/service-configuration';
import s from 'underscore.string';

// Request custom OAuth credentials for the user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Accounts } from 'meteor/accounts-base';
import { HTTP } from 'meteor/http';
import { ServiceConfiguration } from 'meteor/service-configuration';
import _ from 'underscore';

const logger = new Logger('CustomOAuth');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { ServiceConfiguration } from 'meteor/service-configuration';

Meteor.methods({
refreshOAuthService() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/server/oauth/oauth.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { Accounts } from 'meteor/accounts-base';
import { ServiceConfiguration } from 'meteor/service-configuration';
import _ from 'underscore';

const AccessTokenServices = {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* globals CustomOAuth */
import { Meteor } from 'meteor/meteor';
import { ServiceConfiguration } from 'meteor/service-configuration';
import _ from 'underscore';

const logger = new Logger('rocketchat:lib', {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui/client/lib/iframeCommands.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Session } from 'meteor/session';
import { ServiceConfiguration } from 'meteor/service-configuration';
import s from 'underscore.string';

const commands = {
Expand Down
2 changes: 2 additions & 0 deletions server/startup/migrations/v018.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { ServiceConfiguration } from 'meteor/service-configuration';

RocketChat.Migrations.add({
version: 18,
up() {
Expand Down
2 changes: 2 additions & 0 deletions server/startup/migrations/v075.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { ServiceConfiguration } from 'meteor/service-configuration';

RocketChat.Migrations.add({
version: 71.1,
up() {
Expand Down