Skip to content

Commit fa0f10c

Browse files
authored
chore: remove sgid (#2394)
* chore: delete sgid files * chore: remove sgid * chore: update package lock
1 parent c9da75b commit fa0f10c

File tree

14 files changed

+25
-622
lines changed

14 files changed

+25
-622
lines changed

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ services:
2828
- REDIS_SAFE_BROWSING_URI=redis://redis:6379/4
2929
- SESSION_SECRET=thiscouldbeanything
3030
- GA_TRACKING_ID=UA-139330318-1
31-
- SGID_API_HOSTNAME=https://api.id.gov.sg
3231

3332
- OG_URL=https://go.gov.sg
3433
- VALID_EMAIL_GLOB_EXPRESSION=*.gov.sg
@@ -110,7 +109,7 @@ services:
110109
dockerfile: Dockerfile.maildev-logging
111110
command: bin/maildev --web 80 --smtp 25 --verbose
112111
ports:
113-
- "1080:80"
112+
- '1080:80'
114113

115114
volumes:
116115
pgdata:

package-lock.json

Lines changed: 23 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"@hapi/joi": "^17.1.1",
4141
"@material-ui/core": "^4.11.4",
4242
"@material-ui/lab": "^4.0.0-alpha.61",
43-
"@opengovsg/sgid-client": "^2.0.0",
4443
"@sentry/react": "^6.11.0",
4544
"@sentry/tracing": "^6.8.0",
4645
"@sentry/webpack-plugin": "^1.15.1",

src/client/app/components/pages/RootPage/index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { History } from 'history'
1010
import PrivateRoute from '../../PrivateRoute'
1111
import HomePage from '../../../../home'
1212
import LoginPage from '../../../../login'
13-
import SgidLoginPage from '../../../../sgidLogin'
1413
import UserPage from '../../../../user'
1514
import NotFoundPage from '../NotFoundPage'
1615
import DirectoryPage from '../../../../directory'
@@ -31,7 +30,6 @@ import {
3130
HOME_PAGE,
3231
LOGIN_PAGE,
3332
NOT_FOUND_PAGE,
34-
SGID_LOGIN_PAGE,
3533
USER_PAGE,
3634
} from '../../../util/types'
3735
import theme from '../../../theme'
@@ -49,7 +47,6 @@ const Root: FunctionComponent<RootProps> = ({ store, history }: RootProps) => (
4947
<Switch>
5048
<Route exact path={HOME_PAGE} component={HomePage} />
5149
<Route path={LOGIN_PAGE} component={LoginPage} />
52-
<Route path={SGID_LOGIN_PAGE} component={SgidLoginPage} />
5350
<PrivateRoute path={USER_PAGE} component={UserPage} />
5451
<Route path={NOT_FOUND_PAGE} component={NotFoundPage} />
5552
<PrivateRoute path={DIRECTORY_PAGE} component={DirectoryPage} />

src/client/app/util/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export const HOME_PAGE = '/'
22
export const LOGIN_PAGE = '/login'
3-
export const SGID_LOGIN_PAGE = '/ogp-login'
43
export const USER_PAGE = '/user'
54
export const SEARCH_PAGE = '/search'
65
export const NOT_FOUND_PAGE = '/404/:shortUrl'

src/client/sgidLogin/index.tsx

Lines changed: 0 additions & 208 deletions
This file was deleted.

src/server/api/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const router = Express.Router()
1616
/* Public routes that do not need to be protected */
1717
router.use('/logout', require('./logout'))
1818
router.use('/login', require('./login'))
19-
router.use('/sgidLogin', require('./sgidLogin'))
2019
router.use('/stats', require('./statistics'))
2120
router.use('/sentry', require('./sentry'))
2221
router.use('/links', require('./links'))

src/server/api/sgidLogin/index.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/server/config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,6 @@ export const ffExternalApi: boolean = process.env.FF_EXTERNAL_API === 'true'
270270
export const apiAdmins: string[] = process.env.ADMIN_API_EMAILS
271271
? process.env.ADMIN_API_EMAILS.split(',')
272272
: []
273-
export const sgidClientId = process.env.SGID_CLIENT_ID || ''
274-
export const sgidPrivateKey = process.env.SGID_PRIVATE_KEY || ''
275-
export const sgidClientSecret = process.env.SGID_CLIENT_SECRET || ''
276-
export const sgidApiHostname = process.env.SGID_API_HOSTNAME || ''
277273

278274
export const userCount = Number(process.env.USER_COUNT) || 77288
279275
export const clickCount = Number(process.env.CLICK_COUNT) || 666820545

src/server/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export const DependencyIds = {
3434
linksController: Symbol.for('linksController'),
3535
authService: Symbol.for('authService'),
3636
loginController: Symbol.for('loginController'),
37-
sgidLoginController: Symbol.for('sgidLoginController'),
3837
logoutController: Symbol.for('logoutController'),
3938
urlManagementService: Symbol.for('urlManagementService'),
4039
userController: Symbol.for('userController'),

0 commit comments

Comments
 (0)