From f0867a901c740224b10795df09f72d94757afc8f Mon Sep 17 00:00:00 2001 From: Chetan <63073033+chetan061292@users.noreply.github.com> Date: Mon, 1 Jun 2020 18:13:20 +0530 Subject: [PATCH 1/2] Updated Telesign Credentials --- releases/staging/auth-service.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/releases/staging/auth-service.yaml b/releases/staging/auth-service.yaml index 5797848..9ae5929 100644 --- a/releases/staging/auth-service.yaml +++ b/releases/staging/auth-service.yaml @@ -54,8 +54,10 @@ spec: telesign: host: "rest-ww.telesign.com" restEndpoint: "https://rest-ww.telesign.com/" - customerId: "AgCVtLlhx9E20FXjeFOiVVz/0VBh7yrKY5ieNBmm82HOKcSagCDzIqLy5cMCyoP58xaaD6IjvuVdXMso0/w6ccakxCQQVBN16nFCKasQw/QH71HC1glDCO19jM1UfM+RW7RR5m3Mhb75NpPnBv8hFeDBA6uI9J4UZq1asrdTOKOolQj3lWUmYHwtr6fSI9Pwn+9SdjXkNvXrKuG2AVac+PxT/lHJ7R0g4C0jGYcaOeKwFMpGG0LN8vqXoKLv0GAl2a8m/QS0ONUp6zmagJyUjB/wGG3D0N5R/bz5bsMtgYjJH2u9q+27rmYKfoiQhV76CFombtTEqIBGSnRiUN3F70OTImbG//rio25HImJ+FYAheR98mKXl2Mdb76LEqJHikNejW0z3OUgwAY44jyat0EYUNiUnLQ3mq9Q1YG1DiZvXrS19suX/8WraX3JKO/aMBVza919YStZ7y1OkTyf9xcA67YCEqQPzMEZMkBkzs2psxZvHQ58omKD2n50mL9bSC0LVgpjQkTbIotTINZ628UstgQaoej4V8LbT2EYanWZV1HLwAgK241QXWfsVnR+yu6EN+1az3gbOCsyvjTWJrkcqd4lmWhz+ghqiHENVgBagZlCb8iZTUjbEg3fPV9//XAeFIObNVe7J6Z7Smv7mNuOShpyL6ipoZQ5yM1WdVoxZySqQIaXgmQxkAG50b7A8R3/b14WmiwbWnNXCELgKPkET67wnXwyQqNKQ8NNYLJCJreWLGgU=" - apiKey: "AgA7S5hFhBc31y2PUROshw5nUDMksv7fKSvN1yToI2IojeYRxl1sRGTXVDxWWifXsPOvkQGdb32nR4Zms0ZIWbGqRjnJ/N5BQ2Vi/mVBAR+aFKs8ZYfzjK/7nNPJYgOuo9nqn2XeCYcABLuKPwmMZv2m1e6ZPnv88bJNym53+IdI5D3/LGM0WY/7S+S73TD2SDr5u4REgVaEbNVPnBnEddQ0sKAWjaQ9foQi9J7XfOxZiabN5HmiOf5a6JGUi9gk7sIk2LXglMTwsE3Iq31d42lCKG+wGoYDGoLxV95V7E8PhPB5i/qDAbcW+oRPSkaRebdu8hBv6nEqbS70k3hdOUWBDFSyxpOCVp9xTBRsgl2HwmI5nna66Mge74gRfspumWDgMQ14b6ERgHj20sdWuH4W93ura0wlxywgACWEiTPiZkor+YuI7SJNPE9/ezQltVRQoPVgenXVbjsJBe0obttPNmSiTS6Xa+vSnJfGm9XueyLCa+yaW8rZqpm6zFoai8kkXa40es1wl9Co1kC6a09ah3uE7uoVWNBLhteaBbYDRcB1jino9IZiFVK0I8kkjkxXOP0QCBwkCrSKj/1yDFGdgotNZpgY3dKWVXfP4QfViJkRYhzKGW4GoeLbTeDFVy/5+oGOl63XbfYlEz7vlNH4q/EhzE2oSYA/vmXic/Fb6Ek2SULVRdBBkvm9IXWf+C/trFjhqHvRbOzpRh++qdPOwlx/ILYEHX8DrMTf7kZxfihuYtUNaBjFWYneghkUy3eFyfahFgndVIs/YInhlwjTQ6rdD2wMnGa05227n3cfuvp5BRc7iE4p" + #customerId: "AgCVtLlhx9E20FXjeFOiVVz/0VBh7yrKY5ieNBmm82HOKcSagCDzIqLy5cMCyoP58xaaD6IjvuVdXMso0/w6ccakxCQQVBN16nFCKasQw/QH71HC1glDCO19jM1UfM+RW7RR5m3Mhb75NpPnBv8hFeDBA6uI9J4UZq1asrdTOKOolQj3lWUmYHwtr6fSI9Pwn+9SdjXkNvXrKuG2AVac+PxT/lHJ7R0g4C0jGYcaOeKwFMpGG0LN8vqXoKLv0GAl2a8m/QS0ONUp6zmagJyUjB/wGG3D0N5R/bz5bsMtgYjJH2u9q+27rmYKfoiQhV76CFombtTEqIBGSnRiUN3F70OTImbG//rio25HImJ+FYAheR98mKXl2Mdb76LEqJHikNejW0z3OUgwAY44jyat0EYUNiUnLQ3mq9Q1YG1DiZvXrS19suX/8WraX3JKO/aMBVza919YStZ7y1OkTyf9xcA67YCEqQPzMEZMkBkzs2psxZvHQ58omKD2n50mL9bSC0LVgpjQkTbIotTINZ628UstgQaoej4V8LbT2EYanWZV1HLwAgK241QXWfsVnR+yu6EN+1az3gbOCsyvjTWJrkcqd4lmWhz+ghqiHENVgBagZlCb8iZTUjbEg3fPV9//XAeFIObNVe7J6Z7Smv7mNuOShpyL6ipoZQ5yM1WdVoxZySqQIaXgmQxkAG50b7A8R3/b14WmiwbWnNXCELgKPkET67wnXwyQqNKQ8NNYLJCJreWLGgU=" + #apiKey: "AgA7S5hFhBc31y2PUROshw5nUDMksv7fKSvN1yToI2IojeYRxl1sRGTXVDxWWifXsPOvkQGdb32nR4Zms0ZIWbGqRjnJ/N5BQ2Vi/mVBAR+aFKs8ZYfzjK/7nNPJYgOuo9nqn2XeCYcABLuKPwmMZv2m1e6ZPnv88bJNym53+IdI5D3/LGM0WY/7S+S73TD2SDr5u4REgVaEbNVPnBnEddQ0sKAWjaQ9foQi9J7XfOxZiabN5HmiOf5a6JGUi9gk7sIk2LXglMTwsE3Iq31d42lCKG+wGoYDGoLxV95V7E8PhPB5i/qDAbcW+oRPSkaRebdu8hBv6nEqbS70k3hdOUWBDFSyxpOCVp9xTBRsgl2HwmI5nna66Mge74gRfspumWDgMQ14b6ERgHj20sdWuH4W93ura0wlxywgACWEiTPiZkor+YuI7SJNPE9/ezQltVRQoPVgenXVbjsJBe0obttPNmSiTS6Xa+vSnJfGm9XueyLCa+yaW8rZqpm6zFoai8kkXa40es1wl9Co1kC6a09ah3uE7uoVWNBLhteaBbYDRcB1jino9IZiFVK0I8kkjkxXOP0QCBwkCrSKj/1yDFGdgotNZpgY3dKWVXfP4QfViJkRYhzKGW4GoeLbTeDFVy/5+oGOl63XbfYlEz7vlNH4q/EhzE2oSYA/vmXic/Fb6Ek2SULVRdBBkvm9IXWf+C/trFjhqHvRbOzpRh++qdPOwlx/ILYEHX8DrMTf7kZxfihuYtUNaBjFWYneghkUy3eFyfahFgndVIs/YInhlwjTQ6rdD2wMnGa05227n3cfuvp5BRc7iE4p" + customerId: "AgBvHgW3dIEEGnVvPGaaiZzywvvhRfabNm4fo55ihqXY3zSAgAnhQmILHjtdxPCE1Od3dB54qGg7eF3TUX7SMri+WcmzI5THYkFsahxr1chX3H0G8EZCmbwDih8h40+6Kj2mj78DXZjpR5jGK/XyYgMVaVoFuXvVoAbKDRZTawSvjPznJA7OhH7pICOH7gh80ZVeombIe9t9FxERvRvkcIuUAavm1AmrygiQ8Vu+0X6b4FmAkuHTSGfSsyvuxyp/Ca2U+iYAMbVKkNtUYt6yzVXKpx4/aaXyRx4Z+iI4comkKGVvq2F7Oi85mymB4Lqf4cJjyQl0+Iq/1fNDtQHvTL23TQzJe7Pnx8zbcOLyOuavuKy0xFbZKWKZNq7p2l+eDdZU8Zxojh+IWJfMs8dguq6LMfE8RO87h7legJ1dQ+QNNg2tSHA2BvBcpcBp3WbTBMPLNgJoxuwp1hT0lIsACP/kMrCHoZUeA6zwgNBGylMHgFSRpU3ntj3uz+smLFOJN/bWU8dn2jT2NMgmkB4vkqm5NWvLQ+fxEp8Yo9o6zjD6ICntxJj9RTWslCcEMNeaVh94Z/M112nSy35sEAbLcbewdt2JsyRlsr4LSWroy+ahxgqooSpsQfHb9m4uXrbrRq4LCyKPhzA+rJfVVd0INpK056y4/ToyFMSqKWVJhhUJ9cf3WUHXFCFAkX/npenmluqWapZK/XHLM/b8glRSXtLeY0N3OJfKhdo4rtUJUS55mgAxLMk=" + apiKey: "AgA+L6vIOd0D+0EiGU8oUBRVivfayEc4y1YMqfiJJ1OM8i4jMGI/4Lqtr1ehEKwSGBFqt+IOiYdlhyzf16XRK0vYW2cYqSbeiK0YfKdpdeHK4JwCVpFm+B96N+ugKgilxtjmMbERjS/ChMKCHr2OKiK0VfZ7T4SnNRJhCopHzhSpqjALufSzk/HICGeTh+O9x+5NSkdVES7N57D45bA5DnW776IEOlj3OsPv7jh+9WQcQi/9FS0hMSSlBpYn384zkTH2AjssSjsH7CF2Hv2K+nzA5FBEwLIUcGKpVAp2aZgd9XK3es6Kgp/Qct7kP5pYf4PH4s+N2F7ieuUA8PVoRsMrP4uc15XsEUmh20ByQENVuaWApfhFjxdeS3vmS7v6+NpDOzDfuLEQpzMNvDz7f8pl1KzCITkMCTq4zt9dDUnn1q93LBN8aK4AwIgHTE3n9ddxzaruMfx7n2qCYsFUjnti0TeymZ0lpo1uyH+M/ewsaJTNDDpEkfhloTLkF4HE2WlhNJ8HFRd/SrOBrPufnsQ0y5LC0fHtzu0WPIIyN40V0kO9BbqF8QQemDPGHDHB/f61hi3Cabt/GWv/UrXezlPaXrp+bNe366uf0b5rK/LxvXUnW5zDQf1UTcTTqEbB5DY1q1T0+RsV8eqpR7leSo6UARMkB39diHlM1H7BUW+0z6zRm9RhgMpBGedlpNJkj19Pzfx0FplapVTF3LUXU+815ZxDLd4XSl3RqHgY/dj1PnEVyaPhNpTgk/O3LPZhreWeGwLfMWd9QyFUStdh8A85sNmNjuRMW8cHOboIsX+HzU+EN0KJD8Km" # Token validation token: ## Auth token validity in seconds. -- GitLab From 3e0113c0a94c22bdd1ead91f923b1ce4a356953e Mon Sep 17 00:00:00 2001 From: Jayendra Date: Tue, 2 Jun 2020 12:30:56 +0530 Subject: [PATCH 2/2] Updated grpc interceptor for desktop request electron v5 --- .../AuthenticationServiceInterceptor.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/biz/nynja/auth/grpc/services/interceptors/AuthenticationServiceInterceptor.java b/src/main/java/biz/nynja/auth/grpc/services/interceptors/AuthenticationServiceInterceptor.java index 436959a..97a9716 100644 --- a/src/main/java/biz/nynja/auth/grpc/services/interceptors/AuthenticationServiceInterceptor.java +++ b/src/main/java/biz/nynja/auth/grpc/services/interceptors/AuthenticationServiceInterceptor.java @@ -29,13 +29,27 @@ public class AuthenticationServiceInterceptor implements ServerInterceptor { /** * @Date 27-May-2020 * @UpdatedBy Jayendra - * Checking if the request is made by Desktop application + * Checking if the request is made by Desktop application to update redirect URI for facebook and google + * */ if (metadata.get(Metadata.Key.of("user-agent", ASCII_STRING_MARSHALLER)).contains("Electron") || metadata.get(Metadata.Key.of("user-agent", ASCII_STRING_MARSHALLER)).contains("electron") ) { - ctx = Context.current().withValues(AuthenticationServiceConstants.ACCESS_TOKEN_CTX, tokenParts[1], AuthenticationServiceConstants.DESKTOP_APP_REQUEST_CTX, DesktopAppRequestConstants.YES); + /** + * Special condition If request is from Electron/5.0.... then we will mark DesktopRequest to be No + * Since, we don't want to change redirect URI to desktop redirectURI for google and facebook in this case. + */ + if (metadata.get(Metadata.Key.of("user-agent", ASCII_STRING_MARSHALLER)).contains("Electron/5") || + metadata.get(Metadata.Key.of("user-agent", ASCII_STRING_MARSHALLER)).contains("electron/5") + ) { + + ctx = Context.current().withValues(AuthenticationServiceConstants.ACCESS_TOKEN_CTX, tokenParts[1], AuthenticationServiceConstants.DESKTOP_APP_REQUEST_CTX, DesktopAppRequestConstants.NO); + + } else { + + ctx = Context.current().withValues(AuthenticationServiceConstants.ACCESS_TOKEN_CTX, tokenParts[1], AuthenticationServiceConstants.DESKTOP_APP_REQUEST_CTX, DesktopAppRequestConstants.YES); + } } else { -- GitLab