IM: Terms modal: Make computation of baseUrl more generic

Riot/Modules/Integrations/IntegrationManagerViewController.m

@@ -695,34 +695,13 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
 #pragma mark - Service terms
 - (void)presentTerms
 {
-    // Same comment as https://github.com/matrix-org/matrix-react-sdk/blob/1b0d8510a2ee93beddcd34c2d5770aa9fc76b1d9/src/ScalarAuthClient.js#L108
-    // The terms endpoints are new and so live on standard _matrix prefixes,
-    // but IM rest urls are currently configured with paths, so remove the
-    // path from the base URL before passing it to the js-sdk
+    WidgetManagerConfig *config =  [[WidgetManager sharedManager] configForUser:mxSession.myUser.userId];
 
-    // We continue to use the full URL for the calls done by
-    // Riot-iOS, but the standard terms API called
-    // by the matrix-ios-sdk lives on the standard _matrix path. This means we
-    // don't support running IMs on a non-root path, but it's the only
-    // realistic way of transitioning to _matrix paths since configs in
-    // the wild contain bits of the API path.
+    NSLog(@"[IntegraionManagerVC] presentTerms for %@", config.baseUrl);
 
-    // Once we've fully transitioned to _matrix URLs, we can give people
-    // a grace period to update their configs, then use the rest url as
-    // a regular base url.
-    NSURL *imApiUrl = [NSURL URLWithString:[[WidgetManager sharedManager] configForUser:mxSession.myUser.userId].apiUrl];
-    NSString *baseUrl = [NSURL URLWithString:@"/" relativeToURL:imApiUrl].absoluteString;
-    if ([baseUrl hasSuffix:@"/"])
-    {
-        // SDK doest not like trailing /
-        baseUrl = [baseUrl substringToIndex:baseUrl.length - 1];
-    }
-
-    NSLog(@"[IntegraionManagerVC] presentTerms for %@", baseUrl);
-
-    ServiceTermsModalCoordinatorBridgePresenter *serviceTermsModalCoordinatorBridgePresenter = [[ServiceTermsModalCoordinatorBridgePresenter alloc] initWithSession:mxSession baseUrl:baseUrl
+    ServiceTermsModalCoordinatorBridgePresenter *serviceTermsModalCoordinatorBridgePresenter = [[ServiceTermsModalCoordinatorBridgePresenter alloc] initWithSession:mxSession baseUrl:config.baseUrl
                                                                                                                                                         serviceType:MXServiceTypeIntegrationManager
-                                                                                                                                                        accessToken:scalarToken];
+                                                                                                                                                        accessToken:config.scalarToken];
 
     serviceTermsModalCoordinatorBridgePresenter.delegate = self;